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

loose objects at game end

Browse Source 
Some post-3.4.3 code to clean up thrown or kicked objects which were
in transit at the end of a game didn't work correctly for kicked objects,
leading to an "obj not free" panic if you kicked an object at some point
and didn't kick anything else before the game was over.  Unlike thrownobj,
kickobj wasn't being cleared after use.
This commit is contained in:
nethack.rankin
2008-09-04 20:47:04 +00:00
parent 1179bb964c
commit 426894d813
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/end.c
View File

@@ -710,10 +710,10 @@ die:
/* might have been killed while using a disposable item, so make sure
it's gone prior to inventory disclosure and creation of bones data */
inven_inuse(TRUE);
/* not on object lists; if an active light source, would cause big
trouble (`obj_is_local' panic) for savebones() -> savelev() */
if (thrownobj) dealloc_obj(thrownobj);
if (kickobj) dealloc_obj(kickobj);
/* maybe not on object lists; if an active light source, would cause
big trouble (`obj_is_local' panic) for savebones() -> savelev() */
if (thrownobj && thrownobj->where == OBJ_FREE) dealloc_obj(thrownobj);
if (kickobj && kickobj->where == OBJ_FREE) dealloc_obj(kickobj);
/* Sometimes you die on the first move. Life's not fair.
* On those rare occasions you get hosed immediately, go out