Eliminate some uses of wd2 - tests can be done on raw2 buffer instead.

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 54cd4e0b2d0573d3983ba06e26af20ee93d07e85..83177d4ad666cdec551f77021c5792811bda8098 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -265,6 +265,7 @@ static int vbreak(verb_t verb, obj_t obj)
             game.fixed[VASE] = IS_FIXED;
             break;
         }
+       /* FALLTHRU */
     default:
         speak(actions[verb].message);
     }
@@ -591,6 +592,7 @@ static int eat(verb_t verb, obj_t obj)
     case INTRANSITIVE:
         if (!HERE(FOOD))
             return GO_UNKNOWN;
+       /* FALLTHRU */
     case FOOD:
         DESTROY(FOOD);
         rspeak(THANKS_DELICIOUS);
@@ -1143,7 +1145,7 @@ static int rub(verb_t verb, obj_t obj)
 static int say(struct command_t *command)
 /* Say.  Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).)  Magic words override. */
 {
-    if (command->wd2 > 0) {
+    if (command->raw2 != '\0') {
         command->wd1 = command->wd2;
         strncpy(command->raw1, command->raw2, LINESIZE - 1);
     }
@@ -1315,14 +1317,14 @@ int action(struct command_t *command)
             if (game.loc == LOC_START ||
                 game.loc == LOC_VALLEY ||
                 game.loc == LOC_SLIT) {
-                command->obj = DPRSSN;
+                command->obj = DEPRESSION;
             }
             if (game.loc == LOC_COBBLE ||
                 game.loc == LOC_DEBRIS ||
                 game.loc == LOC_AWKWARD ||
                 game.loc == LOC_BIRD ||
                 game.loc == LOC_PITTOP) {
-                command->obj = ENTRNC;
+                command->obj = ENTRANCE;
             }
         } else if (command->obj == DWARF && atdwrf(game.loc) > 0)
             /* FALL THROUGH */;
@@ -1358,7 +1360,7 @@ int action(struct command_t *command)
 
     switch (command->part) {
     case intransitive:
-        if (command->wd2 > 0 && command->verb != SAY)
+        if (command->raw2[0] != '\0' && command->verb != SAY)
             return GO_WORD2;
         if (command->verb == SAY)
             command->obj = command->wd2;