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/mkobj.c
+++ b/src/mkobj.c
@@ -113,7 +113,7 @@ struct obj *otmp;
    if (!OMONST(otmp)) {
        struct monst *m = newmonst();

-        *m = g.zeromonst;
+        *m = cg.zeromonst;
        OMONST(otmp) = m;
    }
 }
@@ -779,7 +779,7 @@ boolean artif;
    char let = objects[otyp].oc_class;

    otmp = newobj();
-    *otmp = g.zeroobj;
+    *otmp = cg.zeroobj;
    otmp->age = g.monstermoves;
    otmp->o_id = g.context.ident++;
    if (!otmp->o_id)