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

thrownobj, kick[ed]obj (trunk only)

Browse Source 
Rename ``kickobj'' to ``kickedobj'' so that the tense matches that
of ``thrownobj''.  Also, move their declarations to decl.h and their
definitions to decl.c since usage has spread from dokick.c/dothrow.c to
various files and is about to expand to another one.
This commit is contained in:
nethack.rankin
2011-01-16 01:29:18 +00:00
parent 3e28b6a164
commit 363163b0c3
8 changed files with 81 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/end.c
View File

@@ -21,9 +21,6 @@
#define FIRST_AMULET AMULET_OF_ESP
#define LAST_AMULET AMULET_OF_YENDOR
extern struct obj *thrownobj; /* dothrow.c */
extern struct obj *kickobj; /* dokick.c */
struct valuable_data { long count; int typ; };
static struct valuable_data
@@ -893,7 +890,7 @@ die:
/* 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);
if (kickedobj && kickedobj->where == OBJ_FREE) dealloc_obj(kickedobj);
/* Sometimes you die on the first move. Life's not fair.
* On those rare occasions you get hosed immediately, go out