Capture clock variables into the game-state block.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index 3e5dc9a39e918f9dd653dd5aab4104157ec9b774..0f82f372df016d8333a9dc6e62d7cd284347aa4e 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -10,10 +10,12 @@ typedef struct lcg_state
   unsigned long a, c, m, x;
 } lcg_state;
 
   unsigned long a, c, m, x;
 } lcg_state;
 

-typedef long token_t;  /* word token - someday this will be a character array */
+typedef long token_t;  /* word token - someday this will be char[TOKLEN+1] */

 typedef long vocab_t;  /* index into a vocabulary array */
 
 struct game_t {
 typedef long vocab_t;  /* index into a vocabulary array */
 
 struct game_t {

+    long clock1;
+    long clock2;

     long oldloc;
     long oldlc2;
     long zzword;
     long oldloc;
     long oldlc2;
     long zzword;


@@ -91,7 +93,7 @@ extern void score(long);
 extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BONUS,
    BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
 extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BONUS,
    BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,

-   CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT,
+   CLAM, CLOSED, CLOSNG, CLSHNT,

    COINS, CONDS, DALTLC, DETAIL,
    DKILL, DOOR, DPRSSN, DRAGON, DTOTAL, DWARF, EGGS,
    EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
    COINS, CONDS, DALTLC, DETAIL,
    DKILL, DOOR, DPRSSN, DRAGON, DTOTAL, DWARF, EGGS,
    EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,