Supply missing implementation of nodwarf bit in travel rules.

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index dd68f8e0016f1fc77440189708d25a6d0b6a5eb4..33c445cc0c13f7cfd92d33c717257b68bb60ee0f 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -170,8 +170,8 @@ static int bigwords(token_t foo)
         } else {
             /*  Bring back troll if we steal the eggs back from him before
              *  crossing. */
-            if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == 0)
-                game.prop[TROLL] = 1;
+            if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
+                game.prop[TROLL] = TROLL_PAIDONCE;
             k = 2;
             if (HERE(EGGS))
                 k = 1;
@@ -224,23 +224,24 @@ 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 = actions[verb].message;
-    if (obj == MIRROR)
-        spk = TOO_FAR;
-    if (obj == VASE && game.prop[VASE] == 0) {
-        if (TOTING(VASE))
-            drop(VASE, game.loc);
-        game.prop[VASE] = 2;
-        game.fixed[VASE] = -1;
-        spk = BREAK_VASE;
-    } else {
-        if (obj == MIRROR && game.closed) {
+    if (obj == MIRROR) {
+        if (game.closed) {
             rspeak(BREAK_MIRROR);
             return GO_DWARFWAKE;
+        } else {
+            rspeak(TOO_FAR);
+            return GO_CLEAROBJ;
         }
     }
-    rspeak(spk);
-    return GO_CLEAROBJ;
+    if (obj == VASE && game.prop[VASE] == VASE_WHOLE) {
+        if (TOTING(VASE))
+            drop(VASE, game.loc);
+        state_change(VASE, VASE_BROKEN);
+        game.fixed[VASE] = -1;
+        return GO_CLEAROBJ;
+    }
+    rspeak(actions[verb].message);
+    return (GO_CLEAROBJ);
 }
 
 static int brief(void)
@@ -354,21 +355,21 @@ static int chain(token_t verb)
         spk = CHAIN_UNLOCKED;
         if (game.prop[BEAR] == UNTAMED_BEAR)
             spk = BEAR_BLOCKS;
-        if (game.prop[CHAIN] == 0)
+        if (game.prop[CHAIN] == CHAIN_HEAP)
             spk = ALREADY_UNLOCKED;
         if (spk != CHAIN_UNLOCKED) {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
-        game.prop[CHAIN] = 0;
-        game.fixed[CHAIN] = 0;
+        game.prop[CHAIN] = CHAIN_HEAP;
+        game.fixed[CHAIN] = CHAIN_HEAP;
         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)
+        if (game.prop[CHAIN] != CHAIN_HEAP)
             spk = ALREADY_LOCKED;
         if (game.loc != objects[CHAIN].plac)
             spk = NO_LOCKSITE;
@@ -376,7 +377,7 @@ static int chain(token_t verb)
             rspeak(spk);
             return GO_CLEAROBJ;
         }
-        game.prop[CHAIN] = 2;
+        game.prop[CHAIN] = CHAIN_FIXED;
         if (TOTING(CHAIN))
             drop(CHAIN, game.loc);
         game.fixed[CHAIN] = -1;