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

use gi.invalid_obj instead of cg.zeroobj

Browse Source 
cg.zeroobj was originally added (under its previous unprefixed name)
for providing a one-line way to zero out the fields of a struct obj.

    struct obj tempobj;
    tempobj = cg.zeroobj;

    initfn(struct obj *otmp)
    {
        if (otmp)
            *otmp = cg.zeroobj;
    }

More recently, the address of cg.zeroobj began to be used as a return
flag to indicate some things, but the 'const struct obj zeroobj' wasn't
an ideal fit for the purpose and required a number of casts, including
casting away const.

Provide a better fitting variable (gi.invalid_obj) and eliminate a
number of casts.
This commit is contained in:
nhmall
2023-11-10 11:07:49 -05:00
parent 17dd51d922
commit 314a2a9489
14 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/files.c
View File

@@ -3880,7 +3880,7 @@ fopen_wizkit_file(void)
static void
wizkit_addinv(struct obj *obj)
{
if (!obj || obj == &cg.zeroobj)
if (!obj || obj == &gi.invalid_obj)
return;
/* subset of starting inventory pre-ID */
@@ -3912,7 +3912,7 @@ proc_wizkit_line(char *buf)
otmp = readobjnam(buf, (struct obj *) 0);
if (otmp) {
if (otmp != &cg.zeroobj)
if (otmp != &gi.invalid_obj)
wizkit_addinv(otmp);
} else {
/* .60 limits output line width to 79 chars */