Make Astral shared, and remove guardian angels in multi

Ignore-this: 2d68029be8ecaf1dd073d5f9f3390a6

darcs-hash:20120126133742-ee7df-3cce7d99f2f267e3fa577c3d79bb09015f5b0146

Author: espadolini

src/do.c

@@ -2034,7 +2034,7 @@ final_level()
 	create_mplayers(rn1(4, 3), TRUE);
 
 	/* create a guardian angel next to player, if worthy */
-	if (Conflict) {
+	if (!iflags.multiplayer && Conflict) {
 	    pline(
 	     "A voice booms: \"Thy desire for conflict shall be fulfilled!\"");
 	    for (i = rnd(4); i > 0; --i) {
@@ -2045,7 +2045,7 @@ final_level()
 				     mm.x, mm.y, FALSE);
 	    }
 
-	} else if (u.ualign.record > 8) {	/* fervent */
+	} else if (!iflags.multiplayer && u.ualign.record > 8) { /* fervent */
 	    pline("A voice whispers: \"Thou hast been worthy of me!\"");
 	    mm.x = u.ux;
 	    mm.y = u.uy;

src/dungeon.c

@@ -1060,7 +1060,8 @@ xchar   ledgerno;
   if (!ledgerno) return TRUE;
   if (ledgerno == (xchar)-1) return FALSE;
   if (ledgerno == ledger_no(&(waitingroom->dlevel))) return TRUE;
-  if (ledger_to_dnum(ledgerno) == dname_to_dnum("The Elemental Planes"))
+  if (ledger_to_dnum(ledgerno) == dname_to_dnum("The Elemental Planes") &&
+      ledgerno != ledger_no(&(find_level("astral")->dlevel)))
     return TRUE;
   return ledger_to_dnum(ledgerno) == quest_dnum;
 }