From: nethack.rankin <nethack.rankin>
Date: Tue, 27 Dec 2005 03:45:27 +0000 (+0000)
Subject: you summoned it!
X-Git-Tag: MOVE2GIT~1175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd3a5466dd4fafa050e8a6d109b13491a132ea4a;p=nethack

you summoned it!

     From a bug report, "You have summoned it!" (when human
sacrifice brings a demon which you can't see) is poorly worded, to put it
mildly.  I'm sure there are plenty of other places where "it" seems odd,
but this one is now fixed....
---

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 533169d52..ceccd9be4 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -173,6 +173,7 @@ stop multi-turn running, searching, or resting early if levitation ends
 Call command could be used to remotely identify which high priest is which
 large amorphous, whirly, noncorporeal, or slithy creatures can fit through
 	tight diagonal gaps despite their size
+avoid "You summoned it!" for unseen monster produced by same-race offering
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/pray.c b/src/pray.c
index 05d544d79..48d5bff92 100644
--- a/src/pray.c
+++ b/src/pray.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)pray.c	3.5	2005/08/31	*/
+/*	SCCS Id: @(#)pray.c	3.5	2005/12/26	*/
 /* Copyright (c) Benson I. Margulies, Mike Stephenson, Steve Linhart, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1242,8 +1242,13 @@ dosacrifice()
 		    demonless_msg = "blood coagulates";
 		}
 		if ((pm = dlord(altaralign)) != NON_PM &&
-		    (dmon = makemon(&mons[pm], u.ux, u.uy, NO_MM_FLAGS))) {
-		    You("have summoned %s!", a_monnam(dmon));
+		  (dmon = makemon(&mons[pm], u.ux, u.uy, NO_MM_FLAGS)) != 0) {
+		    char dbuf[BUFSZ];
+
+		    Strcpy(dbuf, a_monnam(dmon));
+		    if (!strcmpi(dbuf, "it"))
+			Strcpy(dbuf, "something dreadful");
+		    You("have summoned %s!", dbuf);
 		    if (sgn(u.ualign.type) == sgn(dmon->data->maligntyp))
 			dmon->mpeaceful = TRUE;
 		    You("are terrified, and unable to move.");