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

trap creation sanity check

Browse Source 
Noticed while testing the look-at vs vibrating square patch:  I was
able to cover stairs with a trap via wizard mode wish.  That wish can
achieve a lot of irregular things, but prevent this particular one.
This commit is contained in:
PatR
2015-11-25 14:56:58 -08:00
parent 6f8ab3d9b2
commit a7f64606d7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/trap.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 trap.c $NHDT-Date: 1448094344 2015/11/21 08:25:44 $ $NHDT-Branch: master $:$NHDT-Revision: 1.248 $ */ /* NetHack 3.6 trap.c $NHDT-Date: 1448492213 2015/11/25 22:56:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.249 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -336,6 +336,10 @@ register int x, y, typ;
&& typ != SPIKED_PIT))) && typ != SPIKED_PIT)))
u.utrap = 0; u.utrap = 0;
/* old <tx,ty> remain valid */ /* old <tx,ty> remain valid */
} else if (IS_FURNITURE(levl[x][y].typ)) {
/* no trap on top of furniture (caller usually screens the
location to inhibit this, but wizard mode wishing doesn't) */
return (struct trap *) 0;
} else { } else {
oldplace = FALSE; oldplace = FALSE;
ttmp = newtrap(); ttmp = newtrap();