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

fix #M132 - Sunsword glows after its wielder dies

Browse Source 
When lit due to being wielded by a monster, Sunsword continued to emit
light after that monster was killed.  This was fixed by <Someone> in 3.4.1 but a
change I made for 3.4.3 broke that fix.  When mdrop_obj() was split out of
relobj(), relevant unwielding code ended up only being executed for monsters
who were still alive.
This commit is contained in:
nethack.rankin
2005-07-15 02:57:21 +00:00
parent 5243a5137d
commit a1b4bce87c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.4
+2
View File
@@ -134,6 +134,8 @@ recognize if hero has already entered Gehennom by means other than usual route
so that prompt can be skipped if Valley's stairs are subsequently used so that prompt can be skipped if Valley's stairs are subsequently used
once you've passed the Valley, drawbridge tune is no longer a prayer reward once you've passed the Valley, drawbridge tune is no longer a prayer reward
fix up grammar and punctuation in variants of shopkeeper's price message fix up grammar and punctuation in variants of shopkeeper's price message
regression, bug fixed in 3.4.1 reintroduced in 3.4.3: Sunsword continued to
emit light after monster who was wielding got killed
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/steal.c
+4 -3
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)steal.c 3.5 2005/02/09 */ /* SCCS Id: @(#)steal.c 3.5 2005/07/14 */
/* 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. */
@@ -531,8 +531,6 @@ boolean verbosely;
if (mon->mhp > 0) { if (mon->mhp > 0) {
mon->misc_worn_check &= ~obj->owornmask; mon->misc_worn_check &= ~obj->owornmask;
update_mon_intrinsics(mon, obj, FALSE, TRUE); update_mon_intrinsics(mon, obj, FALSE, TRUE);
/* obj_no_longer_held(obj); -- done by place_object */
if (obj->owornmask & W_WEP) setmnotwielded(mon, obj);
#ifdef STEED #ifdef STEED
/* don't charge for an owned saddle on dead steed */ /* don't charge for an owned saddle on dead steed */
} else if (mon->mtame && (obj->owornmask & W_SADDLE) && } else if (mon->mtame && (obj->owornmask & W_SADDLE) &&
@@ -540,8 +538,11 @@ boolean verbosely;
obj->no_charge = 1; obj->no_charge = 1;
#endif #endif
} }
/* this should be done even if the monster has died */
if (obj->owornmask & W_WEP) setmnotwielded(mon, obj);
obj->owornmask = 0L; obj->owornmask = 0L;
} }
/* obj_no_longer_held(obj); -- done by place_object */
if (verbosely && cansee(omx, omy)) if (verbosely && cansee(omx, omy))
pline("%s drops %s.", Monnam(mon), distant_name(obj, doname)); pline("%s drops %s.", Monnam(mon), distant_name(obj, doname));
if (!flooreffects(obj, omx, omy, "fall")) { if (!flooreffects(obj, omx, omy, "fall")) {