Merge branch 'master' into win32-x64-working

* master: (354 commits)
  Add missing protos
  a warning bout lc_error
  Add S_poisoncloud to Guidebooks
  ...

Conflicts:
	.gitattributes
	dat/.gitattributes
	doc/.gitattributes
	doc/Guidebook.mn
	include/config.h
	include/decl.h
	include/extern.h
	include/flag.h
	include/hack.h
	include/ntconf.h
	include/sys.h
	include/wceconf.h
	src/apply.c
	src/attrib.c
	src/bones.c
	src/botl.c
	src/dbridge.c
	src/dig.c
	src/do.c
	src/do_name.c
	src/dog.c
	src/dungeon.c
	src/eat.c
	src/end.c
	src/files.c
	src/fountain.c
	src/hack.c
	src/invent.c
	src/light.c
	src/makemon.c
	src/mhitu.c
	src/mklev.c
	src/mkmaze.c
	src/mkobj.c
	src/mkroom.c
	src/mon.c
	src/objnam.c
	src/options.c
	src/pager.c
	src/pickup.c
	src/potion.c
	src/pray.c
	src/questpgr.c
	src/read.c
	src/restore.c
	src/rnd.c
	src/role.c
	src/rumors.c
	src/save.c
	src/shk.c
	src/sit.c
	src/sp_lev.c
	src/sys.c
	src/teleport.c
	src/trap.c
	src/u_init.c
	src/uhitm.c
	src/wield.c
	src/worn.c
	src/zap.c
	sys/amiga/.gitattributes
	sys/mac/.gitattributes
	sys/msdos/.gitattributes
	sys/msdos/pctiles.c
	sys/msdos/vidvga.c
	sys/os2/.gitattributes
	sys/share/.gitattributes
	sys/share/pcmain.c
	sys/unix/.gitattributes
	sys/unix/hints/.gitattributes
	sys/unix/sysconf
	sys/unix/unixmain.c
	sys/vms/.gitattributes
	sys/wince/.gitattributes
	sys/wince/mhstatus.c
	sys/winnt/.gitattributes
	sys/winnt/Makefile.msc
	sys/winnt/nhsetup.bat
	util/lev_comp.l
	util/makedefs.c
	win/X11/winmenu.c
	win/X11/winstat.c
	win/gnome/gnstatus.c
	win/share/tilemap.c
	win/tty/termcap.c
	win/tty/topl.c
	win/tty/wintty.c

src/pray.c

@@ -1,5 +1,4 @@
-/* NetHack 3.5	pray.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
-/* NetHack 3.5	pray.c	$Date: 2012/05/07 01:44:38 $  $Revision: 1.62 $ */
+/* NetHack 3.5	pray.c	$NHDT-Date: 1427670643 2015/03/29 23:10:43 $  $NHDT-Branch: master $:$NHDT-Revision: 1.69 $ */
 /* Copyright (c) Benson I. Margulies, Mike Stephenson, Steve Linhart, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1269,6 +1268,7 @@ dosacrifice()
 			dmon->mpeaceful = TRUE;
 		    You("are terrified, and unable to move.");
 		    nomul(-3);
+		    multi_reason = "being terrified of a demon";
 		    nomovemsg = 0;
 		} else pline_The("%s.", demonless_msg);
 	    }
@@ -1373,6 +1373,7 @@ dosacrifice()
 		done(ESCAPED);
 	    } else { /* super big win */
 		adjalign(10);
+		u.uachieve.ascended = 1;
 pline("An invisible choir sings, and you are bathed in radiance...");
 		godvoice(altaralign, "Congratulations, mortal!");
 		display_nhwindow(WIN_MESSAGE, FALSE);
@@ -1386,8 +1387,7 @@ verbalize("In return for thy service, I grant thee the gift of Immortality!");
 
     if (otmp->otyp == FAKE_AMULET_OF_YENDOR) {
 	    if (!highaltar && !otmp->known) goto too_soon;
-	    if (!Deaf)
-		You_hear("a nearby thunderclap.");
+	    You_hear("a nearby thunderclap.");
 	    if (!otmp->known) {
 		You("realize you have made a %s.",
 		    Hallucination ? "boo-boo" : "mistake");
@@ -1655,6 +1655,7 @@ dopray()
 	}
     }
     nomul(-3);
+    multi_reason = "praying";
     nomovemsg = "You finish your prayer.";
     afternmv = prayer_done;
 
@@ -1817,6 +1818,7 @@ doturn()
 	    }
 	}
 	nomul(-5);
+	multi_reason = "trying to turn the monsters";
 	nomovemsg = You_can_move_again;
 	return(1);
 }
@@ -1860,26 +1862,70 @@ aligntyp alignment;
     return gnam;
 }
 
+static const char *hallu_gods[] = {
+    "the Flying Spaghetti Monster",     /* Church of the FSM */
+    "Eris",     /* Discordianism */
+    "the Martians",     /* every science fiction ever */
+    "Xom",      /* Crawl */
+    "AnDoR dRaKoN",     /* ADOM */
+    "the Central Bank of Yendor",       /* economics */
+    "Tooth Fairy",      /* real world(?) */
+    "Om",       /* Discworld */
+    "Yawgmoth", /* Magic: the Gathering */
+    "Morgoth", /* LoTR */
+    "Cthulhu", /* Lovecraft */
+    "the Ori", /* Stargate */
+    "destiny", /* why not? */
+    "your Friend the Computer", /* Paranoia */
+};
+
 /* hallucination handling for priest/minion names: select a random god
    iff character is hallucinating */
 const char *
 halu_gname(alignment)
 aligntyp alignment;
 {
-    const char *gnam;
+    const char *gnam = NULL;
     int which;
 
-    if (!Hallucination) return align_gname(alignment);
+    if (!Hallucination)
+        return align_gname(alignment);
 
-    which = randrole();
-    switch (rn2(3)) {
-     case 0:	gnam = roles[which].lgod; break;
-     case 1:	gnam = roles[which].ngod; break;
-     case 2:	gnam = roles[which].cgod; break;
-     default:	gnam = 0; break;		/* lint suppression */
+    /* The priest may not have initialized god names. If this is the
+     * case, and we roll priest, we need to try again. */
+    do
+        which = randrole();
+    while (!roles[which].lgod);
+
+    switch (rn2(9)) {
+    case 0:
+    case 1:
+        gnam = roles[which].lgod;
+        break;
+    case 2:
+    case 3:
+        gnam = roles[which].ngod;
+        break;
+    case 4:
+    case 5:
+        gnam = roles[which].cgod;
+        break;
+    case 6:
+    case 7:
+        gnam = hallu_gods[rn2(sizeof hallu_gods / sizeof *hallu_gods)];
+        break;
+    case 8:
+        gnam = Moloch;
+        break;
+    default:
+        impossible("rn2 broken in halu_gname?!?");
     }
-    if (!gnam) gnam = Moloch;
-    if (*gnam == '_') ++gnam;
+    if (!gnam) {
+        impossible("No random god name?");
+        gnam = "your Friend the Computer"; /* Paranoia */
+    }
+    if (*gnam == '_')
+        ++gnam;
     return gnam;
 }