X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=5bb95553bc21937c348c5088ef32e143dca58558;hp=b059e8228622e506c9a36b51a013cb9c5aaafd63;hb=1e643da216737e148839f463c10594bbb8ac246b;hpb=07207420a20cc92ccb03dcb9c032114fdc22c4f2

diff --git a/actions.c b/actions.c
index b059e82..5bb9555 100644
--- a/actions.c
+++ b/actions.c
@@ -14,9 +14,9 @@ static int attack(FILE *input, struct command_t *command)
 {
     vocab_t verb = command->verb;
     vocab_t obj = command->obj;
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == 0 || obj == INTRANSITIVE) {
-        if (ATDWRF(game.loc) > 0)
+        if (atdwrf(game.loc) > 0)
             obj = DWARF;
         if (HERE(SNAKE))obj = obj * NOBJECTS + SNAKE;
         if (AT(DRAGON) && game.prop[DRAGON] == 0)obj = obj * NOBJECTS + DRAGON;
@@ -58,7 +58,7 @@ static int attack(FILE *input, struct command_t *command)
     if (obj == DRAGON)spk = ALREADY_DEAD;
     if (obj == TROLL)spk = ROCKY_TROLL;
     if (obj == OGRE)spk = OGRE_DODGE;
-    if (obj == OGRE && ATDWRF(game.loc) > 0) {
+    if (obj == OGRE && atdwrf(game.loc) > 0) {
         rspeak(spk);
         rspeak(KNIFE_THROWN);
         DESTROY(OGRE);
@@ -86,15 +86,15 @@ static int attack(FILE *input, struct command_t *command)
         pspeak(DRAGON, look, 3);
         game.prop[DRAGON] = 1;
         game.prop[RUG] = 0;
-        int k = (PLAC[DRAGON] + FIXD[DRAGON]) / 2;
-        MOVE(DRAGON + NOBJECTS, -1);
-        MOVE(RUG + NOBJECTS, 0);
-        MOVE(DRAGON, k);
-        MOVE(RUG, k);
-        DROP(BLOOD, k);
+        int k = (objects[DRAGON].plac + objects[DRAGON].fixd) / 2;
+        move(DRAGON + NOBJECTS, -1);
+        move(RUG + NOBJECTS, 0);
+        move(DRAGON, k);
+        move(RUG, k);
+        drop(BLOOD, k);
         for (obj = 1; obj <= NOBJECTS; obj++) {
-            if (game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])
-                MOVE(obj, k);
+            if (game.place[obj] == objects[DRAGON].plac || game.place[obj] == objects[DRAGON].fixd)
+                move(obj, k);
         }
         game.loc = k;
         return GO_MOVE;
@@ -109,7 +109,7 @@ static int bigwords(token_t foo)
  *  Look up foo in section 3 of vocab to determine which word we've got.  Last
  *  word zips the eggs back to the giant room (unless already there). */
 {
-    int k = VOCAB(foo, 3);
+    int k = vocab(foo, 3);
     int spk = NOTHING_HAPPENS;
     if (game.foobar != 1 - k) {
         if (game.foobar != 0 && game.loc == LOC_GIANTROOM)spk = START_OVER;
@@ -122,7 +122,7 @@ static int bigwords(token_t foo)
             return GO_CLEAROBJ;
         }
         game.foobar = 0;
-        if (game.place[EGGS] == PLAC[EGGS] || (TOTING(EGGS) && game.loc == PLAC[EGGS])) {
+        if (game.place[EGGS] == objects[EGGS].plac || (TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
             rspeak(spk);
             return GO_CLEAROBJ;
         } else {
@@ -132,8 +132,8 @@ static int bigwords(token_t foo)
                 game.prop[TROLL] = 1;
             k = 2;
             if (HERE(EGGS))k = 1;
-            if (game.loc == PLAC[EGGS])k = 0;
-            MOVE(EGGS, PLAC[EGGS]);
+            if (game.loc == objects[EGGS].plac)k = 0;
+            move(EGGS, objects[EGGS].plac);
             pspeak(EGGS, look, k);
             return GO_CLEAROBJ;
         }
@@ -151,8 +151,8 @@ static int bivalve(token_t verb, token_t obj)
     if (verb == LOCK)spk = HUH_MAN;
     if (spk == PEARL_FALLS) {
         DESTROY(CLAM);
-        DROP(OYSTER, game.loc);
-        DROP(PEARL, LOC_CULDESAC);
+        drop(OYSTER, game.loc);
+        drop(PEARL, LOC_CULDESAC);
     }
     rspeak(spk);
     return GO_CLEAROBJ;
@@ -177,10 +177,10 @@ static void blast(void)
 static int vbreak(token_t verb, token_t obj)
 /*  Break.  Only works for mirror in repository and, of course, the vase. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == MIRROR)spk = TOO_FAR;
     if (obj == VASE && game.prop[VASE] == 0) {
-        if (TOTING(VASE))DROP(VASE, game.loc);
+        if (TOTING(VASE))drop(VASE, game.loc);
         game.prop[VASE] = 2;
         game.fixed[VASE] = -1;
         spk = BREAK_VASE;
@@ -203,7 +203,7 @@ static int brief(void)
     return GO_CLEAROBJ;
 }
 
-static int carry(token_t verb, token_t obj)
+static int vcarry(token_t verb, token_t obj)
 /*  Carry an object.  Special cases for bird and cage (if bird in cage, can't
  *  take one without the other).  Liquids also special, since they depend on
  *  status of bottle.  Also various side effects, etc. */
@@ -213,7 +213,7 @@ static int carry(token_t verb, token_t obj)
         /*  Carry, no object given yet.  OK if only one object present. */
         if (game.atloc[game.loc] == 0 ||
             game.link[game.atloc[game.loc]] != 0 ||
-            ATDWRF(game.loc) > 0)
+            atdwrf(game.loc) > 0)
             return GO_UNKNOWN;
         obj = game.atloc[game.loc];
     }
@@ -274,8 +274,8 @@ static int carry(token_t verb, token_t obj)
         game.prop[BIRD] = BIRD_CAGED;
     }
     if ((obj == BIRD || obj == CAGE) && (game.prop[BIRD] == BIRD_CAGED || -1 - game.prop[BIRD] == 1))
-        CARRY(BIRD + CAGE - obj, game.loc);
-    CARRY(obj, game.loc);
+        carry(BIRD + CAGE - obj, game.loc);
+    carry(obj, game.loc);
     if (obj == BOTTLE && LIQUID() != 0)
         game.place[LIQUID()] = CARRIED;
     if (GSTONE(obj) && game.prop[obj] != 0) {
@@ -305,13 +305,13 @@ static int chain(token_t verb)
     } else {
         spk = CHAIN_LOCKED;
         if (game.prop[CHAIN] != 0)spk = ALREADY_LOCKED;
-        if (game.loc != PLAC[CHAIN])spk = NO_LOCKSITE;
+        if (game.loc != objects[CHAIN].plac)spk = NO_LOCKSITE;
         if (spk != CHAIN_LOCKED) {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
         game.prop[CHAIN] = 2;
-        if (TOTING(CHAIN))DROP(CHAIN, game.loc);
+        if (TOTING(CHAIN))drop(CHAIN, game.loc);
         game.fixed[CHAIN] = -1;
     }
     rspeak(spk);
@@ -323,7 +323,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
  *  bird (might attack snake or dragon) and cage (might contain bird) and vase.
  *  Drop coins at vending machine for extra batteries. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (!just_do_it) {
         if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj = ROD2;
         if (!TOTING(obj)) {
@@ -350,13 +350,13 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
                 if (spk != RUG_WIGGLES) {
                     int k = 2 - game.prop[RUG];
                     game.prop[RUG] = k;
-                    if (k == 2) k = PLAC[SAPPH];
-                    MOVE(RUG + NOBJECTS, k);
+                    if (k == 2) k = objects[SAPPH].plac;
+                    move(RUG + NOBJECTS, k);
                 }
             }
         } else if (obj == COINS && HERE(VEND)) {
             DESTROY(COINS);
-            DROP(BATTERY, game.loc);
+            drop(BATTERY, game.loc);
             pspeak(BATTERY, look, FRESH_BATTERIES);
             return GO_CLEAROBJ;
         } else if (obj == BIRD && AT(DRAGON) && game.prop[DRAGON] == 0) {
@@ -365,13 +365,13 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             return GO_CLEAROBJ;
         } else if (obj == BEAR && AT(TROLL)) {
             rspeak(TROLL_SCAMPERS);
-            MOVE(TROLL, 0);
-            MOVE(TROLL + NOBJECTS, 0);
-            MOVE(TROLL2, PLAC[TROLL]);
-            MOVE(TROLL2 + NOBJECTS, FIXD[TROLL]);
-            JUGGLE(CHASM);
+            move(TROLL, 0);
+            move(TROLL + NOBJECTS, 0);
+            move(TROLL2, objects[TROLL].plac);
+            move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
+            juggle(CHASM);
             game.prop[TROLL] = 2;
-        } else if (obj != VASE || game.loc == PLAC[PILLOW]) {
+        } else if (obj != VASE || game.loc == objects[PILLOW].plac) {
             rspeak(OK_MAN);
         } else {
             game.prop[VASE] = 2;
@@ -385,8 +385,8 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
     if (obj == BOTTLE && k != 0)
         game.place[k] = LOC_NOWHERE;
     if (obj == CAGE && game.prop[BIRD] == BIRD_CAGED)
-	DROP(BIRD, game.loc);
-    DROP(obj, game.loc);
+	drop(BIRD, game.loc);
+    drop(obj, game.loc);
     if (obj != BIRD) return GO_CLEAROBJ;
     game.prop[BIRD] = BIRD_UNCAGED;
     if (FOREST(game.loc))
@@ -398,7 +398,7 @@ static int drink(token_t verb, token_t obj)
 /*  Drink.  If no object, assume water and look for it here.  If water is in
  *  the bottle, drink that, else must be at a water loc, so drink stream. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == 0 && LIQLOC(game.loc) != WATER && (LIQUID() != WATER || !HERE(BOTTLE)))
         return GO_UNKNOWN;
     if (obj != BLOOD) {
@@ -422,7 +422,7 @@ static int eat(token_t verb, token_t obj)
 /*  Eat.  Intransitive: assume food if present, else ask what.  Transitive: food
  *  ok, some things lose appetite, rest are ridiculous. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (!HERE(FOOD))
             return GO_UNKNOWN;
@@ -444,7 +444,7 @@ static int eat(token_t verb, token_t obj)
 static int extinguish(token_t verb, int obj)
 /* Extinguish.  Lamp, urn, dragon/volcano (nice try). */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (HERE(LAMP) && game.prop[LAMP] == LAMP_BRIGHT)
 	    obj = LAMP;
@@ -469,7 +469,7 @@ static int feed(token_t verb, token_t obj)
 /*  Feed.  If bird, no seed.  Snake, dragon, troll: quip.  If dwarf, make him
  *  mad.  Bear, special. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == BIRD) {
         rspeak(BIRD_PINING);
         return GO_CLEAROBJ;
@@ -511,7 +511,7 @@ int fill(token_t verb, token_t obj)
  *  is nasty.) */
 {
     int k;
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == VASE) {
         spk = ARENT_CARRYING;
         if (LIQLOC(game.loc) == 0)spk = FILL_INVALID;
@@ -569,11 +569,11 @@ int fill(token_t verb, token_t obj)
 static int find(token_t verb, token_t obj)
 /* Find.  Might be carrying it, or it might be here.  Else give caveat. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (AT(obj) ||
         (LIQUID() == obj && AT(BOTTLE)) ||
         obj == LIQLOC(game.loc) ||
-        (obj == DWARF && ATDWRF(game.loc) > 0))
+        (obj == DWARF && atdwrf(game.loc) > 0))
         spk = YOU_HAVEIT;
     if (game.closed)spk = NEEDED_NEARBY;
     if (TOTING(obj))spk = ALREADY_CARRYING;
@@ -584,7 +584,7 @@ static int find(token_t verb, token_t obj)
 static int fly(token_t verb, token_t obj)
 /* Fly.  Snide remarks unless hovering rug is here. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (game.prop[RUG] != 2)spk = RUG_NOTHING2;
         if (!HERE(RUG))spk = FLAP_ARMS;
@@ -637,7 +637,7 @@ static int inven(void)
 static int light(token_t verb, token_t obj)
 /*  Light.  Applicable only to lamp and urn. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (HERE(LAMP) && game.prop[LAMP] == LAMP_DARK && game.limit >= 0)
 	    obj = LAMP;
@@ -686,7 +686,7 @@ static int listen(void)
 	    spk = NO_MESSAGE;
     }
     for (int i = 1; i <= NOBJECTS; i++) {
-        if (!HERE(i) || object_descriptions[i].sounds[0] == NULL || game.prop[i] < 0)
+        if (!HERE(i) || objects[i].sounds[0] == NULL || game.prop[i] < 0)
             continue;
 	int mi =  game.prop[i];
 	if (i == BIRD)
@@ -704,7 +704,7 @@ static int listen(void)
 static int lock(token_t verb, token_t obj)
 /* Lock, unlock, no object given.  Assume various things if present. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         spk = NOTHING_LOCKED;
         if (HERE(CLAM))obj = CLAM;
@@ -750,7 +750,7 @@ static int pour(token_t verb, token_t obj)
 /*  Pour.  If no object, or object is bottle, assume contents of bottle.
  *  special tests for pouring water or oil on plant or rusty door. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj == BOTTLE || obj == 0)obj = LIQUID();
     if (obj == 0) return GO_UNKNOWN;
     if (!TOTING(obj)) {
@@ -793,7 +793,7 @@ static int pour(token_t verb, token_t obj)
 static int quit(void)
 /*  Quit.  Intransitive only.  Verify intent and exit if that's what he wants. */
 {
-    if (YES(arbitrary_messages[REALLY_QUIT], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+    if (yes(arbitrary_messages[REALLY_QUIT], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
         terminate(quitgame);
     return GO_CLEAROBJ;
 }
@@ -804,7 +804,7 @@ static int read(struct command_t command)
     if (command.obj == INTRANSITIVE) {
         command.obj = 0;
         for (int i = 1; i <= NOBJECTS; i++) {
-            if (HERE(i) && object_descriptions[i].texts[0] != NULL && game.prop[i] >= 0)
+            if (HERE(i) && objects[i].texts[0] != NULL && game.prop[i] >= 0)
                 command.obj = command.obj * NOBJECTS + i;
         }
         if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc))
@@ -814,9 +814,9 @@ static int read(struct command_t command)
     if (DARK(game.loc)) {
         rspeak(NO_SEE, command.wd1, command.wd1x);
     } else if (command.obj == OYSTER && !game.clshnt && game.closed) {
-        game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
-    } else if (object_descriptions[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) {
-        rspeak(ACTSPK[command.verb]);
+        game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
+    } else if (objects[command.obj].texts[0] == NULL || game.prop[command.obj] < 0) {
+        rspeak(actions[command.verb].message);
     } else
         pspeak(command.obj, study, game.prop[command.obj]);
     return GO_CLEAROBJ;
@@ -845,15 +845,15 @@ static int reservoir(void)
 static int rub(token_t verb, token_t obj)
 /* Rub.  Yields various snide remarks except for lit urn. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if (obj != LAMP)
         spk = PECULIAR_NOTHING;
     if (obj == URN && game.prop[URN] == 2) {
         DESTROY(URN);
-        DROP(AMBER, game.loc);
+        drop(AMBER, game.loc);
         game.prop[AMBER] = 1;
         --game.tally;
-        DROP(CAVITY, game.loc);
+        drop(CAVITY, game.loc);
         spk = URN_GENIES;
     }
     rspeak(spk);
@@ -869,7 +869,7 @@ static int say(struct command_t *command)
         b = command->wd2x;
         command->wd1 = command->wd2;
     }
-    int wd = VOCAB(command->wd1, -1);
+    int wd = vocab(command->wd1, -1);
     /* FIXME: Magic numbers */
     if (wd == 62 || wd == 65 || wd == 71 || wd == 2025 || wd == 2034) {
         /* FIXME: scribbles on the interpreter's command block */
@@ -883,7 +883,7 @@ static int say(struct command_t *command)
 static int throw_support(long spk)
 {
     rspeak(spk);
-    DROP(AXE, game.loc);
+    drop(AXE, game.loc);
     return GO_MOVE;
 }
 
@@ -893,21 +893,21 @@ static int throw (FILE *cmdin, struct command_t *command)
  *  (Only way to do so!)  Axe also special for dragon, bear, and
  *  troll.  Treasures special for troll. */
 {
-    int spk = ACTSPK[command->verb];
+    int spk = actions[command->verb].message;
     if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))command->obj = ROD2;
     if (!TOTING(command->obj)) {
         rspeak(spk);
         return GO_CLEAROBJ;
     }
-    if (command->obj >= MINTRS && command->obj <= MAXTRS && AT(TROLL)) {
+    if (objects[command->obj].is_treasure && AT(TROLL)) {
         spk = TROLL_SATISFIED;
         /*  Snarf a treasure for the troll. */
-        DROP(command->obj, 0);
-        MOVE(TROLL, 0);
-        MOVE(TROLL + NOBJECTS, 0);
-        DROP(TROLL2, PLAC[TROLL]);
-        DROP(TROLL2 + NOBJECTS, FIXD[TROLL]);
-        JUGGLE(CHASM);
+        drop(command->obj, 0);
+        move(TROLL, 0);
+        move(TROLL + NOBJECTS, 0);
+        drop(TROLL2, objects[TROLL].plac);
+        drop(TROLL2 + NOBJECTS, objects[TROLL].fixd);
+        juggle(CHASM);
         rspeak(spk);
         return GO_CLEAROBJ;
     }
@@ -919,7 +919,7 @@ static int throw (FILE *cmdin, struct command_t *command)
     if (command->obj != AXE)
         return (discard(command->verb, command->obj, false));
     else {
-        int i = ATDWRF(game.loc);
+        int i = atdwrf(game.loc);
         if (i <= 0) {
             if (AT(DRAGON) && game.prop[DRAGON] == 0)
                 return throw_support(DRAGON_SCALES);
@@ -929,10 +929,10 @@ static int throw (FILE *cmdin, struct command_t *command)
                 return throw_support(OGRE_DODGE);
             else if (HERE(BEAR) && game.prop[BEAR] == 0) {
                 /* This'll teach him to throw the axe at the bear! */
-                DROP(AXE, game.loc);
+                drop(AXE, game.loc);
                 game.fixed[AXE] = -1;
                 game.prop[AXE] = 1;
-                JUGGLE(BEAR);
+                juggle(BEAR);
                 rspeak(AXE_LOST);
                 return GO_CLEAROBJ;
             }
@@ -955,7 +955,7 @@ static int wake(token_t verb, token_t obj)
 /* Wake.  Only use is to disturb the dwarves. */
 {
     if (obj != DWARF || !game.closed) {
-        rspeak(ACTSPK[verb]);
+        rspeak(actions[verb].message);
         return GO_CLEAROBJ;
     } else {
         rspeak(PROD_DWARF);
@@ -966,7 +966,7 @@ static int wake(token_t verb, token_t obj)
 static int wave(token_t verb, token_t obj)
 /* Wave.  No effect unless waving rod at fissure or at bird. */
 {
-    int spk = ACTSPK[verb];
+    int spk = actions[verb].message;
     if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))spk = ARENT_CARRYING;
     if (obj != ROD ||
         !TOTING(obj) ||
@@ -978,7 +978,7 @@ static int wave(token_t verb, token_t obj)
     if (HERE(BIRD))
 	spk = FREE_FLY + MOD(game.prop[BIRD], 2);
     if (spk == FREE_FLY && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
-        DROP(JADE, game.loc);
+        drop(JADE, game.loc);
         game.prop[JADE] = 0;
         --game.tally;
         spk = NECKLACE_FLY;
@@ -1005,7 +1005,7 @@ int action(FILE *input, struct command_t *command)
  *  unless verb is "say", which snarfs arbitrary second word.
  */
 {
-    token_t spk = ACTSPK[command->verb];
+    token_t spk = actions[command->verb].message;
 
     if (command->part == unknown) {
         /*  Analyse an object word.  See if the thing is here, whether
@@ -1023,7 +1023,7 @@ int action(FILE *input, struct command_t *command)
             if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD ||
                 game.loc == LOC_BIRD || game.loc == LOC_PITTOP)
                 command->obj = ENTRNC;
-        } else if (command->obj == DWARF && ATDWRF(game.loc) > 0)
+        } else if (command->obj == DWARF && atdwrf(game.loc) > 0)
             /* FALL THROUGH */;
         else if ((LIQUID() == command->obj && HERE(BOTTLE)) || command->obj == LIQLOC(game.loc))
             /* FALL THROUGH */;
@@ -1063,7 +1063,7 @@ int action(FILE *input, struct command_t *command)
             /*  Analyse an intransitive verb (ie, no object given yet). */
             switch (command->verb - 1) {
             case  0: /* CARRY */
-                return carry(command->verb, INTRANSITIVE);
+                return vcarry(command->verb, INTRANSITIVE);
             case  1: /* DROP  */
                 return GO_UNKNOWN;
             case  2: /* SAY   */
@@ -1145,7 +1145,7 @@ int action(FILE *input, struct command_t *command)
         /*  Analyse a transitive verb. */
         switch (command->verb - 1) {
         case  0: /* CARRY */
-            return carry(command->verb, command->obj);
+            return vcarry(command->verb, command->obj);
         case  1: /* DROP  */
             return discard(command->verb, command->obj, false);
         case  2: /* SAY   */