Merge branch 'NetHack-3.6'

2019-10-01 20:44:57 -04:00
parent c26914bb55 e520071f52
commit 642f698a7a
10 changed files with 68 additions and 90 deletions
--- a/include/decl.h
+++ b/include/decl.h
@@ -891,6 +891,7 @@ struct instance_globals {
    char preferred_pet; /* '\0', 'c', 'd', 'n' (none) */    
    struct monst *mydogs; /* monsters that went down/up together with @ */
    struct monst *migrating_mons; /* monsters moving to another level */
+    struct autopickup_exception *apelist;
    struct mvitals mvitals[NUMMONS];

    /* dokick.c */