X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=init.c;h=46e825b14e8331412a2a8171cfd6e39746d502bc;hp=5ae974f5dc10ae17e05c729f40c551528d4a64fd;hb=3a93b2b5f08351c3e87d4f41c5c61273c42e9420;hpb=7f7f49b7396135f53e31c03d28ecc4d69b8b4584

diff --git a/init.c b/init.c
index 5ae974f..46e825b 100644
--- a/init.c
+++ b/init.c
@@ -14,15 +14,13 @@
  *     12600 words of message text (LINES, LINSIZ).
  *	885 travel options (TRAVEL, TRVSIZ).
  *	330 vocabulary words (KTAB, ATAB, TABSIZ).
- *	185 locations (LTEXT, STEXT, KEY, COND, game.abbrev, game.atloc,
- *                   LOCSND, LOCSIZ).
+ *	185 locations (KEY, COND, game.abbrev, game.atloc, LOCSIZ).
  *	100 objects (PLAC, game.place, FIXD, game.fixed, game.link (twice),
- *                   PTEXT, game.prop, OBJSND, OBJTXT).
+ *                   ogame.prop).
  *	 35 "action" verbs (ACTSPK, VRBSIZ).
- *	277 random messages (RTEXT, RTXSIZ).
  *	 12 different player classifications (CTEXT, CVAL, CLSMAX).
  *	 20 hints (game.hintlc, game.hinted, HINTS, HNTSIZ).
- *        5 "# of turns" threshholds (TTEXT, TRNVAL, TRNSIZ).
+ *        5 "# of turns" threshholds (TRNSIZ).
  *  There are also limits which cannot be exceeded due to the structure of
  *  the database.  (E.G., The vocabulary uses n/1000 to determine word type,
  *  so there can't be more than 1000 words.)  These upper limits are:
@@ -134,8 +132,7 @@
  *	bit; see section 9), the number of turns he must be at the right loc(s)
  *	before triggering the hint, the points deducted for taking the hint,
  *	the message number (section 6) of the question, and the message number
- *	of the hint.  These values are stashed in the "hints" array.  HNTMAX is
- *	set to the max hint number (<= HNTSIZ).
+ *	of the hint.  These values are stashed in the "hints" array.
  *  Section 12: Unused in this version.
  *  Section 13: Sounds and text.  Each line contains either 2 or 3 numbers.  If
  *	2 (call them N and S), N is a location and message ABS(S) from section
@@ -185,7 +182,7 @@ void initialise(void)
         if (!(locations[i].description.big == 0 || KEY[i] == 0)) {
             int k = KEY[i];
             if (MOD(labs(TRAVEL[k]), 1000) == 1)
-		conditions[i] = 2;
+		conditions[i] |= (1 << COND_FORCED);
         }
         game.atloc[i] = 0;
     }
@@ -377,17 +374,4 @@ void initialise(void)
     game.clshnt = false;
     game.novice = false;
     game.blklin = true;
-
-#ifdef ODEBUG
-# define NEWFLAGS	((1<<COND_ABOVE)|(1<<COND_FOREST)|(1<<COND_DEEP));
-    int mismatches = 0;
-    for (int i = 0; i < LOCSIZ; i++) {
-	long condbits = conditions[i] & ~NEWFLAGS;
-	if (condbits == COND[i] || COND[i] == 2 && condbits == 0)
-	    continue;
-	++mismatches;
-	printf("Mismatch at %ld: COND=%x consitions=%x\n", COND[i], condbits);
-    }
-    printf("%d condbit mismatches\n", mismatches);
-#endif
 }