Replace macros with condition bits.

[open-adventure.git] / init.c

diff --git a/init.c b/init.c
index 5ae974f5dc10ae17e05c729f40c551528d4a64fd..03c93f12a2a0c68eb5f2ca05a6eecfe8287b6f2b 100644 (file)
--- a/init.c
+++ b/init.c
@@ -185,7 +185,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 +377,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
 }