Revert "restore.c globals moved to instance_globals."

This reverts commit 865c4d5a7d64250ad97db4267b4b46282ec31b27.

diff --git a/include/decl.h b/include/decl.h
index 18d30daeacbbbe3f6f650079d385f2e0c2ee03d9..f13efca214398a75deab4df7a80308ba429c99e1 100644 (file)
--- a/include/decl.h
+++ b/include/decl.h
@@ -454,23 +454,12 @@ struct instance_globals {
                               messages in artifact_hit() */
     /* botl.c */
     int mrank_sz; /* loaded by max_rank_sz */
-
     /* dog.c */
     int petname_used; /* user preferred pet name has been used */
-
     /* muse.c */
     boolean m_using; /* kludge to use mondided instead of killed */
-
     /* pickup.c */
     int oldcap; /* last encumberance */
-
-    /* restore.c */
-    int n_ids_mapped;
-    struct bucket *id_map;
-    boolean restoring;
-    struct fruit *oldfruit;
-    long omoves;
-
     /* rumors.c */
     long true_rumor_size; /* rumor size variables are signed so that value -1
                             can be used as a flag */
@@ -484,7 +473,6 @@ struct instance_globals {
     int oracle_flg; /* -1=>don't use, 0=>need init, 1=>init done */
     unsigned oracle_cnt; /* oracles are handled differently from rumors... */
     unsigned long *oracle_loc;
-
     /* save.c */
     boolean havestate;
     unsigned ustuck_id; /* need to preserve during save */

diff --git a/src/artifact.c b/src/artifact.c
index 698913edef6e6f409ec21da1051c8839675ecfee..455856601f7b740b5913376fdefec8360188bf91 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -536,7 +536,7 @@ long wp_mask;
          * that can print a message--need to guard against being printed
          * when restoring a game
          */
-        (void) make_hallucinated((long) !on, g.restoring ? FALSE : TRUE,
+        (void) make_hallucinated((long) !on, restoring ? FALSE : TRUE,
                                  wp_mask);
     }
     if (spfx & SPFX_ESP) {

diff --git a/src/decl.c b/src/decl.c
index c006cc71588db112cd40a00d67d3e17aa25aef88..3214faab106ef607fbdca9c6f3d2a2350e84aa24 100644 (file)
--- a/src/decl.c
+++ b/src/decl.c
@@ -332,29 +332,16 @@ const struct instance_globals g_init = {
     0,  /* jumping_is_magic */
     -1, /* polearm_range_min */
     -1, /* polearm_range_max  */
-
     /* artifact.c */
     0,  /* spec_dbon_applies */
-
     /* botl.c */
     0,  /* mrank_sz */
-
     /* dog.c */
     0,  /* petname_used */
-
     /* mused.c */
     FALSE, /* m_using */
-
     /* pickup.c */
     0,  /* oldcap */
-
-    /* restore.c */
-    0, /* n_ids_mapped */
-    0, /* id_map */
-    FALSE, /* restoring */
-    UNDEFINED_PTR, /* oldfruit */
-    UNDEFINED_VALUE, /* omoves */
-
     /* rumors.c */
     0, /* true_rumor_size */
     0, /* false_rumor_size */
@@ -365,27 +352,21 @@ const struct instance_globals g_init = {
     0, /* oracle_flag */
     0, /* oracle_cnt */
     NULL, /* oracle_loc */
-
     /* save.c */
     TRUE, /* havestate*/
     0, /* ustuck_id */
     0, /* usteed_id */
-
     /* trap.c */
     0, /* force_mintrap */
-
     /* u_init.c */
     STRANGE_OBJECT, /* nocreate */
     STRANGE_OBJECT, /* nocreate2 */
     STRANGE_OBJECT, /* nocreate3 */
     STRANGE_OBJECT, /* nocreate4 */
-
     /* uhitm.c */
     UNDEFINED_VALUE, /* override_confirmation */
-
     /* weapon.c */
     UNDEFINED_PTR, /* propellor */
-
     /* zap.c */
     UNDEFINED_VALUE, /* poly_zap */
     UNDEFINED_VALUE,  /* obj_zapped */

diff --git a/src/objnam.c b/src/objnam.c
index 66e09d74684426aa4a530765e86c908d317f3950..3fc3e01d2b3689fac07d7d8536fec487cb4cae93 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -1200,7 +1200,7 @@ unsigned doname_flags;
     }
     /* treat 'restoring' like suppress_price because shopkeeper and
        bill might not be available yet while restore is in progress */
-    if (!iflags.suppress_price && !g.restoring && is_unpaid(obj)) {
+    if (!iflags.suppress_price && !restoring && is_unpaid(obj)) {
         long quotedprice = unpaid_cost(obj, TRUE);
 
         Sprintf(eos(bp), " (%s, %ld %s)",

diff --git a/src/restore.c b/src/restore.c
index ff14135f0cc673958cdd6472a53ab6d4e9f46859..99b74d36d70c17d1497933ea4f3a2259fac64649 100644 (file)
--- a/src/restore.c
+++ b/src/restore.c
@@ -58,7 +58,7 @@ static struct restore_procs {
 
 /*
  * Save a mapping of IDs from ghost levels to the current level.  This
- * map is used by the timer routines when g.restoring ghost levels.
+ * map is used by the timer routines when restoring ghost levels.
  */
 #define N_PER_BUCKET 64
 struct bucket {
@@ -72,6 +72,9 @@ struct bucket {
 STATIC_DCL void NDECL(clear_id_mapping);
 STATIC_DCL void FDECL(add_id_mapping, (unsigned, unsigned));
 
+static int n_ids_mapped = 0;
+static struct bucket *id_map = 0;
+
 #ifdef AMII_GRAPHICS
 void FDECL(amii_setpens, (int)); /* use colors from save file */
 extern int amii_numcolors;
@@ -79,6 +82,10 @@ extern int amii_numcolors;
 
 #include "display.h"
 
+boolean restoring = FALSE;
+static NEARDATA struct fruit *oldfruit;
+static NEARDATA long omoves;
+
 #define Is_IceBox(o) ((o)->otyp == ICE_BOX ? TRUE : FALSE)
 
 /* Recalculate level.objects[x][y], since this info was not saved. */
@@ -172,11 +179,11 @@ boolean ghostly;
 
         mread(fd, (genericptr_t) tmp_dam, sizeof(*tmp_dam));
         if (ghostly)
-            tmp_dam->when += (monstermoves - g.omoves);
+            tmp_dam->when += (monstermoves - omoves);
         Strcpy(damaged_shops,
                in_rooms(tmp_dam->place.x, tmp_dam->place.y, SHOPBASE));
         if (u.uz.dlevel) {
-            /* when g.restoring, there are two passes over the current
+            /* when restoring, there are two passes over the current
              * level.  the first time, u.uz isn't set, so neither is
              * shop_keeper().  just wait and process the damage on
              * the second pass.
@@ -209,7 +216,7 @@ struct obj *otmp;
     mread(fd, (genericptr_t) otmp, sizeof(struct obj));
 
     /* next object pointers are invalid; otmp->cobj needs to be left
-       as is--being non-null is key to g.restoring container contents */
+       as is--being non-null is key to restoring container contents */
     otmp->nobj = otmp->nexthere = (struct obj *) 0;
     /* non-null oextra needs to be reconstructed */
     if (otmp->oextra) {
@@ -286,7 +293,7 @@ boolean ghostly, frozen;
          * immediately after old player died.
          */
         if (ghostly && !frozen && !age_is_relative(otmp))
-            otmp->age = monstermoves - g.omoves + otmp->age;
+            otmp->age = monstermoves - omoves + otmp->age;
 
         /* get contents of a container or statue */
         if (Has_contents(otmp)) {
@@ -506,7 +513,7 @@ register struct obj *otmp;
 {
     register struct fruit *oldf;
 
-    for (oldf = g.oldfruit; oldf; oldf = oldf->nextf)
+    for (oldf = oldfruit; oldf; oldf = oldf->nextf)
         if (oldf->fid == otmp->spe)
             break;
 
@@ -790,7 +797,7 @@ register int fd;
     int rtmp;
     struct obj *otmp;
 
-    g.restoring = TRUE;
+    restoring = TRUE;
     get_plname_from_file(fd, plname);
     getlev(fd, 0, (xchar) 0, FALSE);
     if (!restgamestate(fd, &stuckid, &steedid)) {
@@ -798,7 +805,7 @@ register int fd;
         savelev(-1, 0, FREE_SAVE); /* discard current level */
         (void) nhclose(fd);
         (void) delete_savefile();
-        g.restoring = FALSE;
+        restoring = FALSE;
         return 0;
     }
     restlevelstate(stuckid, steedid);
@@ -914,7 +921,7 @@ register int fd;
 
     run_timers(); /* expire all timers that have gone off while away */
     docrt();
-    g.restoring = FALSE;
+    restoring = FALSE;
     clear_nhwindow(WIN_MESSAGE);
 
     /* Success! */
@@ -1018,10 +1025,10 @@ boolean ghostly;
     setmode(fd, O_BINARY);
 #endif
     /* Load the old fruit info.  We have to do it first, so the
-     * information is available when g.restoring the objects.
+     * information is available when restoring the objects.
      */
     if (ghostly)
-        g.oldfruit = loadfruitchn(fd);
+        oldfruit = loadfruitchn(fd);
 
     /* First some sanity checks */
     mread(fd, (genericptr_t) &hpid, sizeof(hpid));
@@ -1048,8 +1055,8 @@ boolean ghostly;
     rest_levl(fd,
               (boolean) ((sfrestinfo.sfi1 & SFI1_RLECOMP) == SFI1_RLECOMP));
     mread(fd, (genericptr_t) lastseentyp, sizeof(lastseentyp));
-    mread(fd, (genericptr_t) &g.omoves, sizeof(g.omoves));
-    elapsed = monstermoves - g.omoves;
+    mread(fd, (genericptr_t) &omoves, sizeof(omoves));
+    elapsed = monstermoves - omoves;
     mread(fd, (genericptr_t) &upstair, sizeof(stairway));
     mread(fd, (genericptr_t) &dnstair, sizeof(stairway));
     mread(fd, (genericptr_t) &upladder, sizeof(stairway));
@@ -1125,7 +1132,7 @@ boolean ghostly;
     rest_regions(fd, ghostly);
     if (ghostly) {
         /* Now get rid of all the temp fruits... */
-        freefruitchn(g.oldfruit), g.oldfruit = 0;
+        freefruitchn(oldfruit), oldfruit = 0;
 
         if (lev > ledger_no(&medusa_level)
             && lev < ledger_no(&stronghold_level) && xdnstair == 0) {
@@ -1222,11 +1229,11 @@ clear_id_mapping()
 {
     struct bucket *curr;
 
-    while ((curr = g.id_map) != 0) {
-        g.id_map = curr->next;
+    while ((curr = id_map) != 0) {
+        id_map = curr->next;
         free((genericptr_t) curr);
     }
-    g.n_ids_mapped = 0;
+    n_ids_mapped = 0;
 }
 
 /* Add a mapping to the ID map. */
@@ -1236,18 +1243,18 @@ unsigned gid, nid;
 {
     int idx;
 
-    idx = g.n_ids_mapped % N_PER_BUCKET;
+    idx = n_ids_mapped % N_PER_BUCKET;
     /* idx is zero on first time through, as well as when a new bucket is */
     /* needed */
     if (idx == 0) {
         struct bucket *gnu = (struct bucket *) alloc(sizeof(struct bucket));
-        gnu->next = g.id_map;
-        g.id_map = gnu;
+        gnu->next = id_map;
+        id_map = gnu;
     }
 
-    g.id_map->map[idx].gid = gid;
-    g.id_map->map[idx].nid = nid;
-    g.n_ids_mapped++;
+    id_map->map[idx].gid = gid;
+    id_map->map[idx].nid = nid;
+    n_ids_mapped++;
 }
 
 /*
@@ -1262,11 +1269,11 @@ unsigned gid, *nidp;
     int i;
     struct bucket *curr;
 
-    if (g.n_ids_mapped)
-        for (curr = g.id_map; curr; curr = curr->next) {
+    if (n_ids_mapped)
+        for (curr = id_map; curr; curr = curr->next) {
             /* first bucket might not be totally full */
-            if (curr == g.id_map) {
-                i = g.n_ids_mapped % N_PER_BUCKET;
+            if (curr == id_map) {
+                i = n_ids_mapped % N_PER_BUCKET;
                 if (i == 0)
                     i = N_PER_BUCKET;
             } else
@@ -1616,10 +1623,10 @@ register unsigned int len;
             return;
         } else {
             pline("Read %d instead of %u bytes.", rlen, len);
-            if (g.restoring) {
+            if (restoring) {
                 (void) nhclose(fd);
                 (void) delete_savefile();
-                error("Error g.restoring old game.");
+                error("Error restoring old game.");
             }
             panic("Error reading level file.");
         }

diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 523b731ee595e6461cb72a9046cd016eedf7fab1..d5cac96c387b4a5a5aa651f52e88b9f4440bba3d 100644 (file)
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -3171,6 +3171,7 @@ void
 tty_cliparound(x, y)
 int x, y;
 {
+    extern boolean restoring;
     int oldx = clipx, oldy = clipy;
 
     if (!clipping)
@@ -3190,7 +3191,7 @@ int x, y;
         clipy = clipymax - (LI - 3);
     }
     if (clipx != oldx || clipy != oldy) {
-        if (on_level(&u.uz0, &u.uz) && !g.restoring)
+        if (on_level(&u.uz0, &u.uz) && !restoring)
             (void) doredraw();
     }
 }