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

fix #H4317 - grave diggin'

Browse Source 
Digging a grave witha a pick-axe converted the grave to floor but
did not dig a pit and unearth the grave's contents.  [Caused by a
change to maketrap() intended to prevent wizard-mode wishing for
traps on top of furniture.]  Digging a second time succeeded in
creating a pit since the location was no longer furniture.
This commit is contained in:
PatR
2016-04-25 00:14:48 -07:00
parent 4750c0a303
commit 6a3d82ced6
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/fixes36.1
View File

@@ -220,6 +220,8 @@ automatic annotation for Ft.Ludios level got applied when a drawbridge became
mapped, but entry there is a secret door rather than a drawbridge mapped, but entry there is a secret door rather than a drawbridge
sortloot changed to group holy water and unholy water with water instead of sortloot changed to group holy water and unholy water with water instead of
placing them among the h- and u-named items placing them among the h- and u-named items
digging down on a grave converted the terrain to floor but did not create a
pit and uncover the grave's contents; digging again--on floor--did
post-3.6.0: fix "object lost" panic during pickup caused by sortloot revamp post-3.6.0: fix "object lost" panic during pickup caused by sortloot revamp
post-3.6.0: more sortloot revisions post-3.6.0: more sortloot revisions

12
src/trap.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 trap.c $NHDT-Date: 1461090580 2016/04/19 18:29:40 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.266 $ */ /* NetHack 3.6 trap.c $NHDT-Date: 1461568321 2016/04/25 07:12:01 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.268 $ */
/* 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. */
@@ -311,12 +311,12 @@ struct monst *victim;
struct trap * struct trap *
maketrap(x, y, typ) maketrap(x, y, typ)
register int x, y, typ; int x, y, typ;
{ {
static union vlaunchinfo zero_vl; static union vlaunchinfo zero_vl;
register struct trap *ttmp;
register struct rm *lev;
boolean oldplace; boolean oldplace;
struct trap *ttmp;
struct rm *lev = &levl[x][y];
if ((ttmp = t_at(x, y)) != 0) { if ((ttmp = t_at(x, y)) != 0) {
if (ttmp->ttyp == MAGIC_PORTAL || ttmp->ttyp == VIBRATING_SQUARE) if (ttmp->ttyp == MAGIC_PORTAL || ttmp->ttyp == VIBRATING_SQUARE)
@@ -329,7 +329,8 @@ 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)) { } else if (IS_FURNITURE(lev->typ)
&& (!IS_GRAVE(lev->typ) || (typ != PIT && typ != HOLE))) {
/* no trap on top of furniture (caller usually screens the /* no trap on top of furniture (caller usually screens the
location to inhibit this, but wizard mode wishing doesn't) */ location to inhibit this, but wizard mode wishing doesn't) */
return (struct trap *) 0; return (struct trap *) 0;
@@ -401,7 +402,6 @@ register int x, y, typ;
/*FALLTHRU*/ /*FALLTHRU*/
case HOLE: case HOLE:
case TRAPDOOR: case TRAPDOOR:
lev = &levl[x][y];
if (*in_rooms(x, y, SHOPBASE) if (*in_rooms(x, y, SHOPBASE)
&& (typ == HOLE || typ == TRAPDOOR && (typ == HOLE || typ == TRAPDOOR
|| IS_DOOR(lev->typ) || IS_WALL(lev->typ))) || IS_DOOR(lev->typ) || IS_WALL(lev->typ)))