Abolish VOCWRD().

Action word mnemonics are now enums from adventure.yaml.

diff --git a/advent.h b/advent.h
index 4c314651b977f374db1e91492a301fb6e10ce5eb..cf529caf2d4db3161ebb2b44f2e916e5404e9651 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -160,19 +160,11 @@ extern int restore(FILE *);
 #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 VOCWRD(LETTRS,SECT)    (vocab(MAKEWD(LETTRS),SECT))
 #define SPECIAL(LOC)   ((LOC) > SPECIALBASE)
 #define OUTSID(LOC)    (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
 
 #define INDEEP(LOC)    ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
 
-/* vocabulary items */
-extern long FIND;
-extern long INVENT;
-extern long SAY;
-extern long LOCK;
-extern long THROW;
-
 enum speechpart {unknown, intransitive, transitive};
 
 struct command_t {

diff --git a/adventure.yaml b/adventure.yaml
index a8af6318fdc50ebedf3e1db7e5c1f57aa7c445f5..53cb86c5041f16354081429477459df88a198105 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -506,7 +506,7 @@ actions: !!omap
 - ACT_2:
     message: ARENT_CARRYING
     words: ['drop', 'relea', 'free', 'disca', 'dump']
-- ACT_3:
+- SAY:
     message: NO_MESSAGE
     words: ['say', 'chant', 'sing', 'utter', 'mumbl']
 - ACT_4:
@@ -515,7 +515,7 @@ actions: !!omap
 - ACT_5:
     message: NO_MESSAGE
     words: ['nothi']
-- ACT_6:
+- LOCK:
     message: NOT_LOCKABLE
     words: ['lock', 'close']
 - ACT_7:
@@ -548,16 +548,16 @@ actions: !!omap
 - ACT_16:
     message: RUB_NOGO
     words: ['rub']
-- ACT_17:
+- THROW:
     message: ARENT_CARRYING
     words: ['throw', 'toss']
 - ACT_18:
     message: HUH_MAN
     words: ['quit']
-- ACT_19:
+- FIND:
     message: NEARBY
     words: ['find', 'where']
-- ACT_20:
+- INVENT:
     message: NEARBY
     words: ['inven']
 - ACT_21:

diff --git a/cheat.c b/cheat.c
index 89b920104da25c8f7f11d24ca379a75655ffea59..844b66f50ac82753785d3ca6450f4f22a0f124c5 100644 (file)
--- a/cheat.c
+++ b/cheat.c
@@ -13,12 +13,6 @@ struct game_t game;
 long LNLENG, LNPOSN;
 char rawbuf[LINESIZE], INLINE[LINESIZE + 1];
 
-long FIND;
-long INVENT;
-long SAY;
-long LOCK;
-long THROW;
-
 FILE  *logfp = NULL, *rfp = NULL;
 bool oldstyle = false;
 bool editline = true;

diff --git a/init.c b/init.c
index 0ac3c4d6a8abb4ecc84408644d34cc929b6cc44a..d3823db5c33e63e03fb80b61fe53509e70f38065 100644 (file)
--- a/init.c
+++ b/init.c
@@ -72,15 +72,6 @@ void initialise(void)
         game.hintlc[i] = 0;
     }
 
-    /* Define some handy mnemonics. */
-
-    /* Some action verbs. */
-    FIND = VOCWRD(WORD_FIND, 2);
-    INVENT = VOCWRD(WORD_INVENT, 2);
-    LOCK = VOCWRD(WORD_LOCK, 2);
-    SAY = VOCWRD(WORD_SAY, 2);
-    THROW = VOCWRD(WORD_THROW, 2);
-
     /*  Initialise the dwarves.  game.dloc is loc of dwarves,
      *  hard-wired in.  game.odloc is prior loc of each dwarf,
      *  initially garbage.  DALTLC is alternate initial loc for dwarf,

diff --git a/main.c b/main.c
index c02bd3cf3f759239486781a460c59e268c37e2a5..f6209d47ae2478f42d785a8bb4432b4fb63cca0a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -43,12 +43,6 @@ struct game_t game;
 long LNLENG, LNPOSN;
 char rawbuf[LINESIZE], INLINE[LINESIZE + 1];
 
-long FIND;
-long INVENT;
-long SAY;
-long LOCK;
-long THROW;
-
 FILE  *logfp = NULL, *rfp = NULL;
 bool oldstyle = false;
 bool editline = true;