Revert "Moved read.c globals to instance_globals."

This reverts commit d37a91a6b8bdbead0f64187b54167e3a430fcb19.

diff --git a/include/decl.h b/include/decl.h
index 97ded9560dafde911fa330c9cc0eef7cf74a17d5..18d30daeacbbbe3f6f650079d385f2e0c2ee03d9 100644 (file)
--- a/include/decl.h
+++ b/include/decl.h
@@ -464,9 +464,6 @@ struct instance_globals {
     /* pickup.c */
     int oldcap; /* last encumberance */
 
-    /* read.c */
-    boolean known;
-
     /* restore.c */
     int n_ids_mapped;
     struct bucket *id_map;

diff --git a/src/decl.c b/src/decl.c
index f9dceec88664f43e171c77971b8d717fe61facb1..c006cc71588db112cd40a00d67d3e17aa25aef88 100644 (file)
--- a/src/decl.c
+++ b/src/decl.c
@@ -348,9 +348,6 @@ const struct instance_globals g_init = {
     /* pickup.c */
     0,  /* oldcap */
 
-    /* read.c */
-    UNDEFINED_VALUE, /* known */
-
     /* restore.c */
     0, /* n_ids_mapped */
     0, /* id_map */

diff --git a/src/detect.c b/src/detect.c
index 79161aea751a1957df8f50f882842a378e0e5f1b..416c2611fff4f90fc976fea58bfe3678f18c40ad 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -11,6 +11,8 @@
 #include "hack.h"
 #include "artifact.h"
 
+extern boolean known; /* from read.c */
+
 STATIC_DCL boolean NDECL(unconstrain_map);
 STATIC_DCL void NDECL(reconstrain_map);
 STATIC_DCL void FDECL(browse_map, (int, const char *));
@@ -305,7 +307,7 @@ register struct obj *sobj;
     boolean stale, ugold = FALSE, steedgold = FALSE;
     int ter_typ = TER_DETECT | TER_OBJ;
 
-    g.known = stale = clear_stale_map(COIN_CLASS,
+    known = stale = clear_stale_map(COIN_CLASS,
                                     (unsigned) (sobj->blessed ? GOLD : 0));
 
     /* look for gold carried by monsters (might be in a container) */
@@ -316,7 +318,7 @@ register struct obj *sobj;
             if (mtmp == u.usteed) {
                 steedgold = TRUE;
             } else {
-                g.known = TRUE;
+                known = TRUE;
                 goto outgoldmap; /* skip further searching */
             }
         } else {
@@ -326,7 +328,7 @@ register struct obj *sobj;
                     if (mtmp == u.usteed) {
                         steedgold = TRUE;
                     } else {
-                        g.known = TRUE;
+                        known = TRUE;
                         goto outgoldmap; /* skip further searching */
                     }
                 }
@@ -336,17 +338,17 @@ register struct obj *sobj;
     /* look for gold objects */
     for (obj = fobj; obj; obj = obj->nobj) {
         if (sobj->blessed && o_material(obj, GOLD)) {
-            g.known = TRUE;
+            known = TRUE;
             if (obj->ox != u.ux || obj->oy != u.uy)
                 goto outgoldmap;
         } else if (o_in(obj, COIN_CLASS)) {
-            g.known = TRUE;
+            known = TRUE;
             if (obj->ox != u.ux || obj->oy != u.uy)
                 goto outgoldmap;
         }
     }
 
-    if (!g.known) {
+    if (!known) {
         /* no gold found on floor or monster's inventory.
            adjust message if you have gold in your inventory */
         if (sobj) {
@@ -482,7 +484,7 @@ register struct obj *sobj;
     }
 
     if (!ct && !ctu) {
-        g.known = stale && !confused;
+        known = stale && !confused;
         if (stale) {
             docrt();
             You("sense a lack of %s nearby.", what);
@@ -510,7 +512,7 @@ register struct obj *sobj;
         }
         return !stale;
     } else if (!ct) {
-        g.known = TRUE;
+        known = TRUE;
         You("%s %s nearby.", sobj ? "smell" : "sense", what);
         if (sobj && sobj->blessed) {
             if (!u.uedibility)
@@ -521,7 +523,7 @@ register struct obj *sobj;
         struct obj *temp;
         int ter_typ = TER_DETECT | TER_OBJ;
 
-        g.known = TRUE;
+        known = TRUE;
         cls();
         (void) unconstrain_map();
         for (obj = fobj; obj; obj = obj->nobj)

diff --git a/src/read.c b/src/read.c
index 8db74ba52660c002c22f012b919255d9fe64a277..f6b2c3092047facbe27d28f5b1cc147224f83a54 100644 (file)
--- a/src/read.c
+++ b/src/read.c
@@ -12,6 +12,8 @@
     ((mndx) == urace.malenum \
      || (urace.femalenum != NON_PM && (mndx) == urace.femalenum))
 
+boolean known;
+
 static NEARDATA const char readable[] = { ALL_CLASSES, SCROLL_CLASS,
                                           SPBOOK_CLASS, 0 };
 static const char all_count[] = { ALLOW_COUNT, ALL_CLASSES, 0 };
@@ -187,7 +189,7 @@ doread()
     register struct obj *scroll;
     boolean confused, nodisappear;
 
-    g.known = FALSE;
+    known = FALSE;
     if (check_capacity((char *) 0))
         return 0;
     scroll = getobj(readable, "read");
@@ -394,7 +396,7 @@ doread()
     }
     if (!seffects(scroll)) {
         if (!objects[scroll->otyp].oc_name_known) {
-            if (g.known)
+            if (known)
                 learnscroll(scroll);
             else if (!objects[scroll->otyp].oc_uname)
                 docall(scroll);
@@ -799,7 +801,7 @@ int howmuch;
     if (Sokoban)
         return;
 
-    g.known = TRUE;
+    known = TRUE;
     for (zx = 0; zx < COLNO; zx++)
         for (zy = 0; zy < ROWNO; zy++)
             if (howmuch & ALL_MAP || rn2(7)) {
@@ -1011,7 +1013,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
     switch (otyp) {
 #ifdef MAIL
     case SCR_MAIL:
-        g.known = TRUE;
+        known = TRUE;
         if (sobj->spe == 2)
             /* "stamped scroll" created via magic marker--without a stamp */
             pline("This scroll is marked \"postage due\".");
@@ -1140,7 +1142,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
         if (s) {
             otmp->spe += s;
             adj_abon(otmp, s);
-            g.known = otmp->known;
+            known = otmp->known;
             /* update shop bill to reflect new higher price */
             if (s > 0 && otmp->unpaid)
                 alter_cost(otmp, 0L);
@@ -1182,7 +1184,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
                 exercise(A_CON, FALSE);
                 break;
             } else
-                g.known = TRUE;
+                known = TRUE;
         } else { /* armor and scroll both cursed */
             pline("%s.", Yobjnam2(otmp, "vibrate"));
             if (otmp->spe >= -6) {
@@ -1262,7 +1264,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
             You("don't remember there being any magic words on this scroll.");
         else
             pline("This scroll seems to be blank.");
-        g.known = TRUE;
+        known = TRUE;
         break;
     case SCR_REMOVE_CURSE:
     case SPE_REMOVE_CURSE: {
@@ -1348,7 +1350,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
                             confused ? &mons[PM_ACID_BLOB]
                                      : (struct permonst *) 0,
                             FALSE))
-            g.known = TRUE;
+            known = TRUE;
         /* no need to flush monsters; we ask for identification only if the
          * monsters are not visible
          */
@@ -1428,14 +1430,14 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
                       vis_results ? "is" : "seems",
                       (results < 0) ? "un" : "");
             if (vis_results > 0)
-                g.known = TRUE;
+                known = TRUE;
         }
         break;
     }
     case SCR_GENOCIDE:
         if (!already_known)
             You("have found a scroll of genocide!");
-        g.known = TRUE;
+        known = TRUE;
         if (sblessed)
             do_class_genocide();
         else
@@ -1444,11 +1446,11 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
     case SCR_LIGHT:
         if (!confused || rn2(5)) {
             if (!Blind)
-                g.known = TRUE;
+                known = TRUE;
             litroom(!confused && !scursed, sobj);
             if (!confused && !scursed) {
                 if (lightdamage(sobj, TRUE, 5))
-                    g.known = TRUE;
+                    known = TRUE;
             }
         } else {
             /* could be scroll of create monster, don't set known ...*/
@@ -1461,7 +1463,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
         if (confused || scursed) {
             level_tele();
         } else {
-            g.known = scrolltele(sobj);
+            known = scrolltele(sobj);
         }
         break;
     case SCR_GOLD_DETECTION:
@@ -1554,7 +1556,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
                         cvt_sdoor_to_door(&levl[x][y]);
             /* do_mapping() already reveals secret passages */
         }
-        g.known = TRUE;
+        known = TRUE;
         /*FALLTHRU*/
     case SPE_MAGIC_MAPPING:
         if (level.flags.nommap) {
@@ -1574,7 +1576,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
         }
         break;
     case SCR_AMNESIA:
-        g.known = TRUE;
+        known = TRUE;
         forget((!sblessed ? ALL_SPELLS : 0)
                | (!confused || scursed ? ALL_MAP : 0));
         if (Hallucination) /* Ommmmmm! */
@@ -1655,7 +1657,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
             else
                 pline_The("%s rumbles %s you!", ceiling(u.ux, u.uy),
                           sblessed ? "around" : "above");
-            g.known = 1;
+            known = 1;
             sokoban_guilt();
 
             /* Loop through the surrounding squares */
@@ -1680,7 +1682,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
         }
         break;
     case SCR_PUNISHMENT:
-        g.known = TRUE;
+        known = TRUE;
         if (confused || sblessed) {
             You_feel("guilty.");
             break;
@@ -1692,7 +1694,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
 
         if (!already_known)
             You("have found a scroll of stinking cloud!");
-        g.known = TRUE;
+        known = TRUE;
         pline("Where do you want to center the %scloud?",
               already_known ? "stinking " : "");
         cc.x = u.ux;