From: PatR Date: Sat, 27 May 2017 01:51:37 +0000 (-0700) Subject: simplify vampshift message X-Git-Tag: NetHack-3.6.1_RC01~488 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75c7af025c789dea050ebb69a56272aa286435a6;p=nethack simplify vampshift message Simlify the earlier revision for "the seemingly dead creature suddenly transforms and turns into a vampire". x_monnam() already handles "the" the way we want here: it's suppressed when the monster has a name assigned and the "seemingly dead" phrase is omitted. --- diff --git a/src/mon.c b/src/mon.c index 25a2a1322..ddd8e3a8a 100644 --- a/src/mon.c +++ b/src/mon.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mon.c $NHDT-Date: 1495836090 2017/05/26 22:01:30 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.238 $ */ +/* NetHack 3.6 mon.c $NHDT-Date: 1495849874 2017/05/27 01:51:14 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.239 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1834,8 +1834,7 @@ register struct monst *mtmp; /* construct a format string before transformation; will be capitalized when used, expects one %s arg */ Sprintf(buf, "%s suddenly %s and rises as %%s!", - x_monnam(mtmp, - has_mname(mtmp) ? ARTICLE_NONE : ARTICLE_THE, + x_monnam(mtmp, ARTICLE_THE, spec_mon ? (char *) 0 : "seemingly dead", SUPPRESS_SADDLE | SUPPRESS_HALLUCINATION | SUPPRESS_INVISIBLE | SUPPRESS_IT,