X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=7754923f5913c2f299df667ff0b59323d21e625b;hb=2bdf9e2803c83d19f375d97dd8147e8d221ec057;hp=470e79ff5879d1a369dd30e308cf6f06a9d29789;hpb=40ff648431dc1f2cb1e330d1f9a665c5f0a7cb68;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 470e79f..7754923 100644
--- a/advent.h
+++ b/advent.h
@@ -114,8 +114,11 @@ 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 */
 
 struct game_t {
     unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
@@ -167,11 +170,11 @@ struct game_t {
     long abbrev[NLOCATIONS + 1];
     long atloc[NLOCATIONS + 1];
     long dseen[NDWARVES + 1];    // true if dwarf has seen him
-    long dloc[NDWARVES + 1];     // location of dwarves, initially hard-wired in
-    long odloc[NDWARVES + 1];    // prior loc of each dwarf, initially garbage
-    long fixed[NOBJECTS + 1];
+    loc_t dloc[NDWARVES + 1];     // location of dwarves, initially hard-wired in
+    loc_t odloc[NDWARVES + 1];    // prior loc of each dwarf, initially garbage
+    loc_t fixed[NOBJECTS + 1];
     long link[NOBJECTS * 2 + 1];
-    long place[NOBJECTS + 1];
+    loc_t place[NOBJECTS + 1];
     long hinted[NHINTS];         // hintlc[i] is how long he's been at LOC with cond bit i
     long hintlc[NHINTS];         // hinted[i] is true iff hint i has been used.
     long prop[NOBJECTS + 1];
@@ -189,8 +192,8 @@ struct settings_t {
 
 struct command_t {
     enum speechpart part;
-    vocab_t verb;
-    vocab_t obj;
+    verb_t verb;
+    obj_t   obj;
     token_t wd1;
     token_t wd2;
     long id1;
@@ -222,12 +225,12 @@ extern int get_object_vocab_id(const char*);
 extern int get_action_vocab_id(const char*);
 extern int get_special_vocab_id(const char*);
 extern long get_vocab_id(const char*);
-extern void juggle(long);
-extern void move(long, long);
-extern long put(long, long, long);
-extern void carry(long, long);
-extern void drop(long, long);
-extern long atdwrf(long);
+extern void juggle(obj_t);
+extern void move(obj_t, loc_t);
+extern long put(obj_t, long, long);
+extern void carry(obj_t, loc_t);
+extern void drop(obj_t, loc_t);
+extern long atdwrf(loc_t);
 extern long setbit(long);
 extern bool tstbit(long, int);
 extern void make_zzword(char*);
@@ -242,7 +245,7 @@ extern int resume(void);
 extern int restore(FILE *);
 extern long initialise(void);
 extern int action(struct command_t *command);
-extern void state_change(long obj, long state);
+extern void state_change(obj_t, long);
 
 
 void bug(enum bugtype, const char *) __attribute__((__noreturn__));