Moved pickup globals to instance_globals.

2018-11-23 13:30:51 -08:00
parent ad725c0f0f
commit 01596f1660
3 changed files with 80 additions and 78 deletions
--- a/include/decl.h
+++ b/include/decl.h
@@ -463,6 +463,11 @@ struct instance_globals {

    /* pickup.c */
    int oldcap; /* last encumberance */
+    /* current_container is set in use_container(), to be used by the
+       callback routines in_container() and out_container() from askchain()
+       and use_container(). Also used by menu_loot() and container_gone(). */
+    struct obj *current_container;
+    boolean abort_looting;

    /* pline.c */
    unsigned pline_flags;