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

atttempting to close a blocked door

Browse Source 
Simplify the message handling for trying to close a door when there's
a monster in the doorway.
This commit is contained in:
PatR
2022-06-05 14:37:00 -07:00
parent d98d76a88e
commit 1791dda512
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lock.c
+10 -12
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 lock.c $NHDT-Date: 1602355548 2020/10/10 18:45:48 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.100 $ */ /* NetHack 3.7 lock.c $NHDT-Date: 1654464994 2022/06/05 21:36:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.114 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -877,23 +877,21 @@ doopen_indir(int x, int y)
} }
static boolean static boolean
obstructed(register int x, register int y, boolean quietly) obstructed(int x, int y, boolean quietly)
{ {
register struct monst *mtmp = m_at(x, y); struct monst *mtmp = m_at(x, y);
if (mtmp && M_AP_TYPE(mtmp) != M_AP_FURNITURE) { if (mtmp && M_AP_TYPE(mtmp) != M_AP_FURNITURE) {
if (M_AP_TYPE(mtmp) == M_AP_OBJECT) if (M_AP_TYPE(mtmp) == M_AP_OBJECT)
goto objhere; goto objhere;
if (!quietly) { if (!quietly) {
if ((mtmp->mx != x) || (mtmp->my != y)) { char *Mn = Some_Monnam(mtmp); /* Monnam, Someone or Something */
/* worm tail */
pline("%s%s blocks the way!", if ((mtmp->mx != x || mtmp->my != y) && canspotmon(mtmp))
!canspotmon(mtmp) ? Something : s_suffix(Monnam(mtmp)), /* s_suffix() returns a modifiable buffer */
!canspotmon(mtmp) ? "" : " tail"); Mn = strcat(s_suffix(Mn), " tail");
} else {
pline("%s blocks the way!", pline("%s blocks the way!", Mn);
!canspotmon(mtmp) ? "Some creature" : Monnam(mtmp));
}
} }
if (!canspotmon(mtmp)) if (!canspotmon(mtmp))
map_invisible(x, y); map_invisible(x, y);