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/trap.c
+++ b/src/trap.c
@@ -3260,8 +3260,8 @@ domagictrap()
            struct obj pseudo;
            long save_conf = HConfusion;

-            pseudo = g.zeroobj; /* neither cursed nor blessed,
-                                 and zero out oextra */
+            pseudo = cg.zeroobj; /* neither cursed nor blessed,
+                                    and zero out oextra */
            pseudo.otyp = SCR_REMOVE_CURSE;
            HConfusion = 0L;
            (void) seffects(&pseudo);