shk.c and priest.c vs 'onefile'

2024-06-28 08:31:49 -07:00
parent 2674a9904d
commit 17e0385f0e
2 changed files with 18 additions and 0 deletions
--- a/src/shk.c
+++ b/src/shk.c
@@ -4727,6 +4727,7 @@ shk_move(struct monst *shkp)
                    appr = gtx = gty = 0;
            }
        }
+#undef GDIST
    }

    z = move_special(shkp, inhishop(shkp), appr, uondoor, avoid, omx, omy,
@@ -5856,4 +5857,17 @@ use_unpaid_trapobj(struct obj *otmp, coordxy x, coordxy y)
    }
 }

+#ifdef CONTAINED_BUYING
+#undef CONTAINED_BUYING
+#endif
+#undef PAY_SOME
+#undef PAY_BUY
+#undef PAY_CANT
+#undef PAY_SKIP
+#undef PAY_BROKE
+#undef NOTANGRY
+#undef ANGRY
+#undef IS_SHOP
+#undef muteshk
+
 /*shk.c*/