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

no hiding under nothing

Browse Source 
On 3/23/2015 6:41 PM, a bug reporter wrote:
> When you're hiding under an item (e.g. via garter snake polyform), and
> that item gets polyshuddered into nonexistence, you continue hiding
> (under nothing).

This addresses the "hiding under nothing" bug, but does not
address this flavor comment also included in the report:
> (Incidentally, it's a bit weird that you use > to aim at items that are
> flavorwise above you at the time.)
This commit is contained in:
nhmall
2015-03-24 22:07:16 -04:00
parent dde4f6322c
commit a355911c2c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes35.0
+2
View File
@@ -881,6 +881,8 @@ message inconsistency: death message "swallowed <mon> whole" was preceded
improve the messaging when a monster you can't see is causing an obstruction improve the messaging when a monster you can't see is causing an obstruction
add option mention_walls, which gives feedback when bumping against a wall add option mention_walls, which gives feedback when bumping against a wall
fix invalid pointer dereference in morguemon if ndemon returns NON_PM fix invalid pointer dereference in morguemon if ndemon returns NON_PM
after object loss through polyshudder don't get left hiding under nothing
if you're polymorphed into a hider
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/zap.c
+7 -1
View File
@@ -1,4 +1,4 @@
/* NetHack 3.5 zap.c $NHDT-Date: 1426465444 2015/03/16 00:24:04 $ $NHDT-Branch: debug $:$NHDT-Revision: 1.195 $ */ /* NetHack 3.5 zap.c $NHDT-Date: 1427249230 2015/03/25 02:07:10 $ $NHDT-Branch: master $:$NHDT-Revision: 1.197 $ */
/* NetHack 3.5 zap.c $Date: 2013/11/05 00:57:56 $ $Revision: 1.183 $ */ /* NetHack 3.5 zap.c $Date: 2013/11/05 00:57:56 $ $Revision: 1.183 $ */
/* 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. */
@@ -1750,8 +1750,14 @@ struct obj *obj, *otmp;
if (Is_box(obj)) (void) boxlock(obj, otmp); if (Is_box(obj)) (void) boxlock(obj, otmp);
if (obj_shudders(obj)) { if (obj_shudders(obj)) {
boolean cover = ((obj->ox == u.ux && obj->oy == u.uy) &&
u.uundetected &&
hides_under(youmonst.data));
if (cansee(obj->ox, obj->oy)) learn_it = TRUE; if (cansee(obj->ox, obj->oy)) learn_it = TRUE;
do_osshock(obj); do_osshock(obj);
/* eek - your cover might have been blown */
if (cover) (void) hideunder(&youmonst);
break; break;
} }
obj = poly_obj(obj, STRANGE_OBJECT); obj = poly_obj(obj, STRANGE_OBJECT);