X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=0193f68fce9e192374d56ddfdcf13b35081e298b;hp=289b8f6a12b7afa70ef36228b744db3396bddc62;hb=2935e07bc9b01751bfcb2972f84f5df1bc82d75c;hpb=de2b1894f22d885a43768a569118c47e1a39fb80

diff --git a/advent.h b/advent.h
index 289b8f6..0193f68 100644
--- a/advent.h
+++ b/advent.h
@@ -12,7 +12,6 @@
 #define DALTLC         LOC_NUGGET // alternate dwarf location
 #define INVLIMIT       7          // inverntory limit (# of objects)
 #define INTRANSITIVE   -1         // illegal object number
-#define SPECIALBASE    300        // base number of special rooms
 #define GAMELIMIT      330        // base limit of turns
 #define NOVICELIMIT    1000       // limit of turns for novice
 #define WARNTIME       30         // late game starts at game.limit-this
@@ -65,7 +64,6 @@
 #define PCT(N)       (randrange(100) < (N))
 #define GSTONE(OBJ)  ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
 #define FOREST(LOC)  CNDBIT(LOC, COND_FOREST)
-#define SPECIAL(LOC) ((LOC) > SPECIALBASE)
 #define OUTSID(LOC)  (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
 #define INDEEP(LOC)  ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
 #define BUG(x)       bug(x, #x)
@@ -114,8 +112,9 @@ enum phase_codes {
     GO_DWARFWAKE,
 };
 
-typedef long token_t;  // word token - someday this will be char[TOKLEN+1]
+typedef long token_t;  // word token - someday this will be char[TOKLEN+1] */
 typedef long vocab_t;  // index into a vocabulary array */
+typedef long verb_t;   // index into an actions array */
 typedef long obj_t;    // index into the object array */
 typedef long loc_t;    // index into the locations array */
 
@@ -191,7 +190,7 @@ struct settings_t {
 
 struct command_t {
     enum speechpart part;
-    vocab_t verb;
+    verb_t verb;
     obj_t   obj;
     token_t wd1;
     token_t wd2;