X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=f746dee1edfe8003c719d45b22aafb16dfba121f;hp=c79a66680da59b391e06b7967eb1a7defb15f6c1;hb=83fb64b5a817de3f1023c79ab2319d01d9dce9ae;hpb=1ed812691287700b4bdf804d782f09f4a0eee0de

diff --git a/actions.c b/actions.c
index c79a666..f746dee 100644
--- a/actions.c
+++ b/actions.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include "advent.h"
-#include "database.h"
 #include "newdb.h"
 
 static int fill(token_t, token_t);
@@ -12,7 +11,7 @@ static void state_change(long obj, long state)
     pspeak(obj, change, state);
 }
 
-static int attack(FILE *input, struct command_t *command)
+static int attack(struct command_t *command)
 /*  Attack.  Assume target if unambiguous.  "Throw" also links here.
  *  Attackable objects fall into two categories: enemies (snake,
  *  dwarf, etc.)  and others (bird, clam, machine).  Ambiguous if 2
@@ -28,7 +27,8 @@ static int attack(FILE *input, struct command_t *command)
         if (AT(DRAGON) && game.prop[DRAGON] == 0)obj = obj * NOBJECTS + DRAGON;
         if (AT(TROLL))obj = obj * NOBJECTS + TROLL;
         if (AT(OGRE))obj = obj * NOBJECTS + OGRE;
-        if (HERE(BEAR) && game.prop[BEAR] == 0)obj = obj * NOBJECTS + BEAR;
+        if (HERE(BEAR) && game.prop[BEAR] == UNTAMED_BEAR)
+	    obj = obj * NOBJECTS + BEAR;
         if (obj > NOBJECTS) return GO_UNKNOWN;
         if (obj == 0) {
             /* Can't attack bird or machine by throwing axe. */
@@ -50,9 +50,8 @@ static int attack(FILE *input, struct command_t *command)
         DESTROY(BIRD);
         spk = BIRD_DEAD;
     } else if (obj == VEND) {
-	bool blocking = (game.prop[VEND] == VEND_BLOCKS);
-        game.prop[VEND] = blocking ? VEND_UNBLOCKS : VEND_BLOCKS;
-        rspeak(blocking ? MACHINE_SWINGOUT : MACHINE_SWINGBACK);
+	state_change(VEND,
+		     game.prop[VEND]==VEND_BLOCKS ? VEND_UNBLOCKS : VEND_BLOCKS);
         return GO_CLEAROBJ;
     }
 
@@ -86,9 +85,17 @@ static int attack(FILE *input, struct command_t *command)
          *  fixed), move rug there (not fixed), and move him there,
          *  too.  Then do a null motion to get new description. */
         rspeak(BARE_HANDS_QUERY);
-        GETIN(input, &command->wd1, &command->wd1x, &command->wd2, &command->wd2x);
-        if (command->wd1 != MAKEWD(WORD_YINIT) && command->wd1 != MAKEWD(WORD_YES))
-            return GO_CHECKFOO;
+	if(silent_yes())
+	  {
+	    // FIXME: setting wd1 is a workaround for broken logic
+	    command->wd1 = token_to_packed("Y");
+	  }
+	else
+	  {
+	    // FIXME: setting wd1 is a workaround for broken logic
+	    command->wd1 = token_to_packed("N");
+	    return GO_CHECKFOO;
+	  }
         pspeak(DRAGON, look, 3);
         game.prop[DRAGON] = 1;
         game.prop[RUG] = 0;
@@ -115,7 +122,10 @@ 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);
+    char word[6];
+    packed_to_token(foo, word);
+    int k = (int) get_special_vocab_id(word);
     int spk = NOTHING_HAPPENS;
     if (game.foobar != 1 - k) {
         if (game.foobar != 0 && game.loc == LOC_GIANTROOM)spk = START_OVER;
@@ -230,8 +240,10 @@ static int vcarry(token_t verb, token_t obj)
     }
     spk = YOU_JOKING;
     if (obj == PLANT && game.prop[PLANT] <= 0)spk = DEEP_ROOTS;
-    if (obj == BEAR && game.prop[BEAR] == 1)spk = BEAR_CHAINED;
-    if (obj == CHAIN && game.prop[BEAR] != 0)spk = STILL_LOCKED;
+    if (obj == BEAR && game.prop[BEAR] == SITTING_BEAR)
+	spk = BEAR_CHAINED;
+    if (obj == CHAIN && game.prop[BEAR] != UNTAMED_BEAR)
+	spk = STILL_LOCKED;
     if (obj == URN)spk = URN_NOBUDGE;
     if (obj == CAVITY)spk = DOUGHNUT_HOLES;
     if (obj == BLOOD)spk = FEW_DROPS;
@@ -286,7 +298,7 @@ static int vcarry(token_t verb, token_t obj)
         game.place[LIQUID()] = CARRIED;
     if (GSTONE(obj) && game.prop[obj] != 0) {
         game.prop[obj] = 0;
-        game.prop[CAVITY] = 1;
+        game.prop[CAVITY] = CAVITY_EMPTY;
     }
     rspeak(OK_MAN);
     return GO_CLEAROBJ;
@@ -298,26 +310,33 @@ static int chain(token_t verb)
     int spk;
     if (verb != LOCK) {
         spk = CHAIN_UNLOCKED;
-        if (game.prop[BEAR] == 0)spk = BEAR_BLOCKS;
-        if (game.prop[CHAIN] == 0)spk = ALREADY_UNLOCKED;
+        if (game.prop[BEAR] == UNTAMED_BEAR)
+	    spk = BEAR_BLOCKS;
+        if (game.prop[CHAIN] == 0)
+	    spk = ALREADY_UNLOCKED;
         if (spk != CHAIN_UNLOCKED) {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
         game.prop[CHAIN] = 0;
         game.fixed[CHAIN] = 0;
-        if (game.prop[BEAR] != 3)game.prop[BEAR] = 2;
+        if (game.prop[BEAR] != BEAR_DEAD)
+	    game.prop[BEAR] = CONTENTED_BEAR;
+	/* FIXME: Arithmetic on state numbers */
         game.fixed[BEAR] = 2 - game.prop[BEAR];
     } else {
         spk = CHAIN_LOCKED;
-        if (game.prop[CHAIN] != 0)spk = ALREADY_LOCKED;
-        if (game.loc != objects[CHAIN].plac)spk = NO_LOCKSITE;
+        if (game.prop[CHAIN] != 0)
+	    spk = ALREADY_LOCKED;
+        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);
@@ -341,12 +360,12 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             if (game.closed) return GO_DWARFWAKE;
             DESTROY(SNAKE);
             /* Set game.prop for use by travel options */
-            game.prop[SNAKE] = 1;
+            game.prop[SNAKE] = SNAKE_CHASED;
 
-        } else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != 0)) {
+        } else if ((GSTONE(obj) && AT(CAVITY) && game.prop[CAVITY] != CAVITY_FULL)) {
             rspeak(GEM_FITS);
             game.prop[obj] = 1;
-            game.prop[CAVITY] = 0;
+            game.prop[CAVITY] = CAVITY_FULL;
             if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != 2) || (obj == RUBY &&
                               game.prop[RUG] == 2))) {
                 spk = RUG_RISES;
@@ -492,11 +511,13 @@ static int feed(token_t verb, token_t obj)
             spk = REALLY_MAD;
         }
     } else if (obj == BEAR) {
-        if (game.prop[BEAR] == 0)spk = NOTHING_EDIBLE;
-        if (game.prop[BEAR] == 3)spk = RIDICULOUS_ATTEMPT;
+        if (game.prop[BEAR] == UNTAMED_BEAR)
+	    spk = NOTHING_EDIBLE;
+        if (game.prop[BEAR] == BEAR_DEAD)
+	    spk = RIDICULOUS_ATTEMPT;
         if (HERE(FOOD)) {
             DESTROY(FOOD);
-            game.prop[BEAR] = 1;
+            game.prop[BEAR] = SITTING_BEAR;
             game.fixed[AXE] = 0;
             game.prop[AXE] = 0;
             spk = BEAR_TAMED;
@@ -695,7 +716,8 @@ static int listen(void)
 	int mi =  game.prop[i];
 	if (i == BIRD)
 	    mi += 3 * game.blooded;
-        pspeak(i, hear, mi, game.zzword);
+	long packed_zzword = token_to_packed(game.zzword);
+        pspeak(i, hear, mi, packed_zzword);
         spk = NO_MESSAGE;
 	/* FIXME: Magic number, sensitive to bird state logic */
 	if (i == BIRD && game.prop[i] == 5)
@@ -873,7 +895,10 @@ 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);
+    char word1[6];
+    packed_to_token(command->wd1, word1);
+    int wd = (int) get_vocab_id(word1);
     /* FIXME: Magic numbers */
     if (wd == 62 || wd == 65 || wd == 71 || wd == 2025 || wd == 2034) {
         /* FIXME: scribbles on the interpreter's command block */
@@ -891,7 +916,7 @@ static int throw_support(long spk)
     return GO_MOVE;
 }
 
-static int throw (FILE *cmdin, struct command_t *command)
+static int throw (struct command_t *command)
 /*  Throw.  Same as discard unless axe.  Then same as attack except
  *  ignore bird, and if dwarf is present then one might be killed.
  *  (Only way to do so!)  Axe also special for dragon, bear, and
@@ -931,7 +956,7 @@ static int throw (FILE *cmdin, struct command_t *command)
                 return throw_support(TROLL_RETURNS);
             else if (AT(OGRE))
                 return throw_support(OGRE_DODGE);
-            else if (HERE(BEAR) && game.prop[BEAR] == 0) {
+            else if (HERE(BEAR) && game.prop[BEAR] == UNTAMED_BEAR) {
                 /* This'll teach him to throw the axe at the bear! */
                 drop(AXE, game.loc);
                 game.fixed[AXE] = -1;
@@ -941,7 +966,7 @@ static int throw (FILE *cmdin, struct command_t *command)
                 return GO_CLEAROBJ;
             }
             command->obj = 0;
-            return (attack(cmdin, command));
+            return (attack(command));
         }
 
         if (randrange(NDWARVES + 1) < game.dflag) {
@@ -1004,7 +1029,7 @@ static int wave(token_t verb, token_t obj)
     }
 }
 
-int action(FILE *input, struct command_t *command)
+int action(struct command_t *command)
 /*  Analyse a verb.  Remember what it was, go back for object if second word
  *  unless verb is "say", which snarfs arbitrary second word.
  */
@@ -1093,7 +1118,7 @@ int action(FILE *input, struct command_t *command)
                 return GO_CLEAROBJ;
             }
             case ATTACK:
-                return attack(input, command);
+                return attack(command);
             case POUR:
                 return pour(command->verb, command->obj);
             case EAT:
@@ -1178,7 +1203,7 @@ int action(FILE *input, struct command_t *command)
             return GO_CLEAROBJ;
         }
         case ATTACK:
-            return attack(input, command);
+            return attack(command);
         case POUR:
             return pour(command->verb, command->obj);
         case EAT:
@@ -1188,7 +1213,7 @@ int action(FILE *input, struct command_t *command)
         case RUB:
             return rub(command->verb, command->obj);
         case THROW:
-            return throw(input, command);
+            return throw(command);
         case QUIT: {
             rspeak(spk);
             return GO_CLEAROBJ;