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

glob update

Browse Source 
Initialize glob weight sooner in mksobj() and have weight() skip the
fix up it had been doing when it was passed a glob with weight 0.
This allows shrink_glob() to be simplified slightly in the situation
where a glob inside a container shrinks away to nothing.

weight(glob) with glob->owt==0 now yields 0 instead of 20.  That was
only needed for 'obj->owt=weight(obj)' during object creation and
the new earlier weight init makes the 0 to 20 fixup obsolete.  In
turn, that allows a glob which has shrunk to 0 while in a container
to not have to be removed before updating the container's weight.
This commit is contained in:
PatR
2021-12-13 07:04:30 -08:00
parent 9b150b0249
commit 1fd379a980
1 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/mkobj.c
View File

@@ -875,8 +875,15 @@ mksobj(int otyp, boolean init, boolean artif)
break;
}
if (Is_pudding(otmp)) {
otmp->quan = 1L; /* for emphasis; glob quantity is always 1 */
otmp->globby = 1;
/* for emphasis; glob quantity is always 1 and weight varies
when other globs coallesce with it or this one shrinks */
otmp->quan = 1L;
/* 3.7: globs in 3.6.x left owt as 0 and let weight() fix
that up during 'obj->owt = weight(obj)' below, but now
we initialize glob->owt explicitly so weight() doesn't
need to perform any fix up and returns glob->owt as-is */
otmp->owt = objects[otmp->otyp].oc_weight;
otmp->known = otmp->dknown = 1;
otmp->corpsenm = PM_GRAY_OOZE
+ (otmp->otyp - GLOB_OF_GRAY_OOZE);
@@ -1373,12 +1380,15 @@ shrink_glob(
if (delta >= (long) obj->owt) {
/* gone; no newsym() or message here--forthcoming map update for
level arrival is all that's needed */
obj->owt = 0; /* not required; accurately reflect's obj's state */
shrinking_glob_gone(obj);
} else {
/* shrank but not gone; reduce remaining weight */
obj->owt -= (unsigned) delta;
/* won't be in container carried by hero but might be in floor one
or one carried by monster; if so, update container's weight */
/* when contained, update container's weight (recursively if
nested); won't be in a container carried by hero (since
catching up for lost time never applies in that situation)
but might be in one on floor or one carried by a monster */
if (contnr)
container_weight(contnr);
/* resume regular shrinking */
@@ -1449,15 +1459,8 @@ shrink_glob(
/* obj's weight has been reduced, but weight(s) of enclosing
container(s) haven't been adjusted for that yet */
old_top_owt = topcontnr->owt;
/* update those weights now; recursively updates nested containers
(extracting from a container does that automatically); if obj->owt
has dropped to 0, weight() will assume that this is a brand new
glob and use 20 instead; that would yield an incorrect total
weight for enclosing container(s), so take 'gone' glob out now */
if (gone)
obj_extract_self(obj);
else
container_weight(contnr);
/* update those weights now; recursively updates nested containers */
container_weight(contnr);
if (topcontnr->where == OBJ_INVENT) {
/* for regular containers, the weight will always be reduced
@@ -1529,11 +1532,10 @@ shrinking_glob_gone(struct obj *obj)
if (obj->owornmask && obj == MON_WEP(obj->ocarry))
setmnotwielded(obj->ocarry, obj); /* clears owornmask */
}
/* glob might already be free if shrink_glob() has removed it from
a container; otherwise, free it now */
if (obj->where != OBJ_FREE)
obj_extract_self(obj);
/* delete it */
/* remove the glob from whatever list it's on and then delete it;
if it's contained, obj_extract_self() will update the container's
weight and if nested, the enclosing containers' weights too */
obj_extract_self(obj);
obfree(obj, (struct obj *) 0);
}
}
@@ -1717,22 +1719,35 @@ set_bknown(
* Note: It is possible to end up with an incorrect weight if some part
* of the code messes with a contained object and doesn't update the
* container's weight.
*
* Note too: obj->owt is an unsigned int and objects[].oc_weight an
* unsigned short int, so weight() should probably be changed to
* use and return unsigned int instead of signed int.
*/
int
weight(struct obj *obj)
{
int wt = (int) objects[obj->otyp].oc_weight;
int wt = (int) objects[obj->otyp].oc_weight; /* weight of 1 'otyp' */
if (obj->quan < 1L) {
impossible("Calculating weight of %ld %s?",
obj->quan, simpleonames(obj));
return 0;
}
/* glob absorpsion means that merging globs accumulates weight while
quantity stays 1, so update 'wt' to reflect that, unless owt is 0,
when we assume this is a brand new glob so use objects[].oc_weight */
if (obj->globby && obj->owt > 0)
wt = obj->owt;
/* glob absorpsion means that merging globs combines their weight
while quantity stays 1; mksobj(), obj_absorb(), and shrink_glob()
manage glob->owt and there is nothing for weight() to do except
return the current value as-is */
if (obj->globby) {
/* 3.7: in 3.6.x this checked for owt==0 and then used
owt as-is when non-zero or objects[].oc_weight if zero;
we don't do that anymore because it confused calculating
the weight of a container when a glob inside shrank down
to 0 and was about to be deleted [mksobj() now initializes
owt for globs sooner and the subsequent o->owt = weight(o)
general initialization is benignly redundant for globs] */
return (int) obj->owt;
}
if (Is_container(obj) || obj->otyp == STATUE) {
struct obj *contents;
register int cwt = 0;