nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

openholdingtrap() message sequencing

Browse Source 
If a trap is blocking levitation or flight and you use wand of opening
or spell of knock to get out, you'd get things like
|You start to float in the air!
|You are released from the bear trap.

Give the release message before the actual untrapping.
This commit is contained in:
PatR
2024-02-18 11:18:48 -08:00
parent a0c28e97da
commit d688309012
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trap.c
+12 -6
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 trap.c $NHDT-Date: 1703070192 2023/12/20 11:03:12 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.562 $ */ /* NetHack 3.7 trap.c $NHDT-Date: 1708283914 2024/02/18 19:18:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.577 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -5909,13 +5909,19 @@ openholdingtrap(
if (!u.utrap) if (!u.utrap)
return FALSE; return FALSE;
*noticed = TRUE; *noticed = TRUE;
if (u.usteed) if (!u.usteed)
Sprintf(buf, "%s is", noit_Monnam(u.usteed));
else
Strcpy(buf, "You are"); Strcpy(buf, "You are");
reset_utrap(TRUE); else if (u.utraptype == TT_BURIEDBALL)
gv.vision_full_recalc = 1; /* vision limits can change (pit escape) */ Sprintf(buf, "You and %s are", y_monnam(u.usteed));
else
Sprintf(buf, "%s is", noit_Monnam(u.usteed));
/* give release message before untrap in case it triggers a message */
pline("%s released from %s%s.", buf, which, trapdescr); pline("%s released from %s%s.", buf, which, trapdescr);
/* might float up if Levitation is being unblocked */
gv.vision_full_recalc = 1; /* vision limits can change (pit escape) */
reset_utrap(TRUE);
if (gv.vision_full_recalc)
vision_recalc(0);
} else { } else {
if (!mon->mtrapped) if (!mon->mtrapped)
return FALSE; return FALSE;