Merge branch 'NetHack-3.6.2'

2019-01-09 07:24:18 -05:00
parent 7eee5f3a1d 624aee7749
commit 58f2218c4e
39 changed files with 239 additions and 230 deletions
--- a/src/files.c
+++ b/src/files.c
@@ -2883,7 +2883,7 @@ STATIC_DCL void
 wizkit_addinv(obj)
 struct obj *obj;
 {
-    if (!obj || obj == &g.zeroobj)
+    if (!obj || obj == &cg.zeroobj)
        return;

    /* subset of starting inventory pre-ID */
@@ -2913,7 +2913,7 @@ char *buf;
    struct obj *otmp = readobjnam(buf, (struct obj *) 0);

    if (otmp) {
-        if (otmp != &g.zeroobj)
+        if (otmp != &cg.zeroobj)
            wizkit_addinv(otmp);
    } else {
        /* .60 limits output line width to 79 chars */