mthrowu, nhlan, options, regions, rip and role globals moved to g.

include/decl.h

@@ -592,7 +592,21 @@ struct repo { /* repossession context */
     coord location;
 };
 
+/* from options.c */
+#define MAX_MENU_MAPPED_CMDS 32 /* some number */
 
+/* player selection constants */
+#define BP_ALIGN 0
+#define BP_GEND 1
+#define BP_RACE 2
+#define BP_ROLE 3
+#define NUM_BP 4
+
+#define NUM_ROLES (13)
+struct role_filter {
+    boolean roles[NUM_ROLES+1];
+    short mask;
+};
 
 /* instance_globals holds engine state that does not need to be
  * persisted upon game exit.  The initialization state is well defined
@@ -924,6 +938,11 @@ struct instance_globals {
     short *animal_list; /* list of PM values for animal monsters */
     int animal_list_count;
 
+    /* mthrowu.c */
+    int mesg_given; /* for m_throw()/thitu() 'miss' message */
+    struct monst *mtarget;  /* monster being shot by another monster */
+    struct monst *marcher; /* monster that is shooting */
+
     /* muse.c */
     boolean m_using; /* kludge to use mondided instead of killed */
     int trapx;
@@ -936,6 +955,10 @@ struct instance_globals {
                         * remember who zapped the wand. */
     struct musable m;
 
+    /* nhlan.c */
+    char lusername[MAX_LAN_USERNAME];
+    int lusername_size;
+
     /* o_init.c */
     short disco[NUM_OBJECTS];
 
@@ -949,6 +972,16 @@ struct instance_globals {
     /* options.c */
     struct symsetentry *symset_list; /* files.c will populate this with
                                         list of available sets */
+    /*
+        * Allow the user to map incoming characters to various menu commands.
+        * The accelerator list must be a valid C string.
+        */
+    char mapped_menu_cmds[MAX_MENU_MAPPED_CMDS + 1]; /* exported */
+    char mapped_menu_op[MAX_MENU_MAPPED_CMDS + 1];
+    short n_menu_mapped;
+    boolean opt_initial;
+    boolean opt_from_file;
+    boolean opt_need_redraw; /* for doset() */
 
     /* pickup.c */
     int oldcap; /* last encumberance */
@@ -1006,6 +1039,11 @@ struct instance_globals {
     /* read.c */
     boolean known;
 
+    /* region.c */
+    NhRegion **regions;
+    int n_regions;
+    int max_regions;
+
     /* restore.c */
     int n_ids_mapped;
     struct bucket *id_map;
@@ -1013,6 +1051,16 @@ struct instance_globals {
     struct fruit *oldfruit;
     long omoves;
 
+    /* rip.c */
+    char **rip;
+
+    /* role.c */
+    struct Role urole; /* player's role. May be munged in role_init() */
+    struct Race urace; /* player's race. May be munged in role_init() */
+    char role_pa[NUM_BP];
+    char role_post_attribs;
+    struct role_filter rfilter;
+
     /* rumors.c */
     long true_rumor_size; /* rumor size variables are signed so that value -1
                             can be used as a flag */