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

corpses on ice use of obj recharged field

Browse Source 
A while back, I noticed that there was a custom use of the obj->recharged
flag in mkobj.c for tracking corpses on ice.  It's much more obvious for
those of us that don't have the entire source base memorized to follow the
usual convention of adding a #define to obj.h.  That's what this change does.
This commit is contained in:
cohrs
2003-06-12 04:49:09 +00:00
parent 2a3e8c9fc4
commit 90c03c2f0a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/obj.h
View File

@@ -78,6 +78,7 @@ struct obj {
#define opoisoned otrapped /* object (weapon) is coated with poison */ #define opoisoned otrapped /* object (weapon) is coated with poison */
Bitfield(recharged,3); /* number of times it's been recharged */ Bitfield(recharged,3); /* number of times it's been recharged */
#define on_ice recharged /* corpse on ice */
Bitfield(lamplit,1); /* a light-source -- can be lit */ Bitfield(lamplit,1); /* a light-source -- can be lit */
#ifdef INVISIBLE_OBJECTS #ifdef INVISIBLE_OBJECTS
Bitfield(oinvis,1); /* invisible */ Bitfield(oinvis,1); /* invisible */

10
src/mkobj.c
View File

@@ -1119,7 +1119,6 @@ int x, y;
if (otmp->timed) obj_timer_checks(otmp, x, y, 0); if (otmp->timed) obj_timer_checks(otmp, x, y, 0);
} }
#define ON_ICE(a) ((a)->recharged)
#define ROT_ICE_ADJUSTMENT 2 /* rotting on ice takes 2 times as long */ #define ROT_ICE_ADJUSTMENT 2 /* rotting on ice takes 2 times as long */
/* If ice was affecting any objects correct that now /* If ice was affecting any objects correct that now
@@ -1157,7 +1156,7 @@ struct obj *otmp;
{ {
long age, retval = otmp->age; long age, retval = otmp->age;
if (otmp->otyp == CORPSE && ON_ICE(otmp)) { if (otmp->otyp == CORPSE && otmp->on_ice) {
/* Adjust the age; must be same as obj_timer_checks() for off ice*/ /* Adjust the age; must be same as obj_timer_checks() for off ice*/
age = monstermoves - otmp->age; age = monstermoves - otmp->age;
retval = otmp->age + (age / ROT_ICE_ADJUSTMENT); retval = otmp->age + (age / ROT_ICE_ADJUSTMENT);
@@ -1195,7 +1194,7 @@ int force; /* 0 = no force so do checks, <0 = force off, >0 force on */
tleft = tleft - monstermoves; tleft = tleft - monstermoves;
/* mark the corpse as being on ice */ /* mark the corpse as being on ice */
ON_ICE(otmp) = 1; otmp->on_ice = 1;
#ifdef DEBUG_EFFECTS #ifdef DEBUG_EFFECTS
pline("%s is now on ice at %d,%d.", The(xname(otmp)),x,y); pline("%s is now on ice at %d,%d.", The(xname(otmp)),x,y);
#endif #endif
@@ -1209,7 +1208,7 @@ int force; /* 0 = no force so do checks, <0 = force off, >0 force on */
} }
/* Check for corpses coming off ice */ /* Check for corpses coming off ice */
else if ((force < 0) || else if ((force < 0) ||
(otmp->otyp == CORPSE && ON_ICE(otmp) && (otmp->otyp == CORPSE && otmp->on_ice &&
((on_floor && !is_ice(x,y)) || !on_floor))) { ((on_floor && !is_ice(x,y)) || !on_floor))) {
tleft = stop_timer(action, (genericptr_t)otmp); tleft = stop_timer(action, (genericptr_t)otmp);
if (tleft == 0L) { if (tleft == 0L) {
@@ -1220,7 +1219,7 @@ int force; /* 0 = no force so do checks, <0 = force off, >0 force on */
long age; long age;
tleft = tleft - monstermoves; tleft = tleft - monstermoves;
ON_ICE(otmp) = 0; otmp->on_ice = 0;
#ifdef DEBUG_EFFECTS #ifdef DEBUG_EFFECTS
pline("%s is no longer on ice at %d,%d.", The(xname(otmp)),x,y); pline("%s is no longer on ice at %d,%d.", The(xname(otmp)),x,y);
#endif #endif
@@ -1237,7 +1236,6 @@ int force; /* 0 = no force so do checks, <0 = force off, >0 force on */
(void) start_timer(tleft, TIMER_OBJECT, action, (genericptr_t)otmp); (void) start_timer(tleft, TIMER_OBJECT, action, (genericptr_t)otmp);
} }
#undef ON_ICE
#undef ROT_ICE_ADJUSTMENT #undef ROT_ICE_ADJUSTMENT
void void