Magic-number elimination and fix

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index 4a7c514207ae74235e2a84fa9170e9fc1990436e..91a0e6e680fd069e68b016472869d6ad01369f67 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -113,12 +113,12 @@ static int attack(struct command_t *command)
         state_change(DRAGON, DRAGON_DEAD);
         game.prop[RUG] = RUG_FLOOR;
         /* Hardcoding LOC_SECRET5 as the dragon's death location is ugly.
-         * The way it was computed before was wirse; it depended on the
+         * The way it was computed before was worse; it depended on the
          * two dragon locations being LOC_SECRET4 and LOC_SECRET6 and
          * LOC_SECRET5 being right between them.
          */
-        move(DRAGON + NOBJECTS, -1);
-        move(RUG + NOBJECTS, LOC_NOWHERE);
+        move(DRAGON + NOBJECTS, IS_FIXED);
+        move(RUG + NOBJECTS, IS_FREE);
         move(DRAGON, LOC_SECRET5);
         move(RUG, LOC_SECRET5);
         drop(BLOOD, LOC_SECRET5);
@@ -493,7 +493,7 @@ static int discard(token_t verb, obj_t obj)
     } else if (obj == BEAR && AT(TROLL)) {
         state_change(TROLL, TROLL_GONE);
         move(TROLL, LOC_NOWHERE);
-        move(TROLL + NOBJECTS, LOC_NOWHERE);
+        move(TROLL + NOBJECTS, IS_FREE);
         move(TROLL2, objects[TROLL].plac);
         move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
         juggle(CHASM);
@@ -594,30 +594,27 @@ static int extinguish(token_t verb, obj_t obj)
             return GO_UNKNOWN;
     }
 
-    if (obj == URN) {
+    switch (obj) {
+    case URN:
         if (game.prop[URN] != URN_EMPTY) {
             state_change(URN, URN_DARK);
         } else {
             pspeak(URN, change, URN_DARK, true);
         }
-        return GO_CLEAROBJ;
-    }
-
-    if (obj == LAMP) {
+        break;
+    case LAMP:
         state_change(LAMP, LAMP_DARK);
         rspeak(DARK(game.loc) ?
                PITCH_DARK :
                NO_MESSAGE);
-        return GO_CLEAROBJ;
-    }
-
-    if (obj == DRAGON ||
-        obj == VOLCANO) {
+        break;
+    case DRAGON:
+    case VOLCANO:
         rspeak(BEYOND_POWER);
-        return GO_CLEAROBJ;
+        break;
+    default:
+        speak(actions[verb].message);
     }
-
-    speak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -844,36 +841,38 @@ static int light(token_t verb, obj_t obj)
 /*  Light.  Applicable only to lamp and urn. */
 {
     if (obj == INTRANSITIVE) {
-        if (HERE(LAMP) && game.prop[LAMP] == LAMP_DARK && game.limit >= 0)
+        int selects = 0;
+        if (HERE(LAMP) && game.prop[LAMP] == LAMP_DARK && game.limit >= 0) {
             obj = LAMP;
-        if (HERE(URN) && game.prop[URN] == URN_DARK)
+            selects++;
+        }
+        if (HERE(URN) && game.prop[URN] == URN_DARK) {
             obj =  URN;
-        if (obj == INTRANSITIVE ||
-            (HERE(LAMP) && game.prop[LAMP] == LAMP_DARK && game.limit >= 0 &&
-             HERE(URN) && game.prop[URN] == URN_DARK))
+            selects++;
+        }
+        if (selects != 1)
             return GO_UNKNOWN;
     }
 
-    if (obj == URN) {
+    switch (obj) {
+    case URN:
         state_change(URN, game.prop[URN] == URN_EMPTY ?
                      URN_EMPTY :
                      URN_LIT);
-        return GO_CLEAROBJ;
-    } else {
-        if (obj != LAMP) {
-            speak(actions[verb].message);
-            return GO_CLEAROBJ;
-        }
+        break;
+    case LAMP:
         if (game.limit < 0) {
             rspeak(LAMP_OUT);
-            return GO_CLEAROBJ;
+            break;
         }
         state_change(LAMP, LAMP_BRIGHT);
         if (game.wzdark)
             return GO_TOP;
-        else
-            return GO_CLEAROBJ;
+        break;
+    default:
+        speak(actions[verb].message);
     }
+    return GO_CLEAROBJ;
 }
 
 static int listen(void)
@@ -1151,7 +1150,7 @@ static int throw (struct command_t *command)
         /*  Snarf a treasure for the troll. */
         drop(command->obj, LOC_NOWHERE);
         move(TROLL, LOC_NOWHERE);
-        move(TROLL + NOBJECTS, LOC_NOWHERE);
+        move(TROLL + NOBJECTS, IS_FREE);
         drop(TROLL2, objects[TROLL].plac);
         drop(TROLL2 + NOBJECTS, objects[TROLL].fixd);
         juggle(CHASM);
@@ -1171,9 +1170,9 @@ static int throw (struct command_t *command)
                 return throw_support(DRAGON_SCALES);
             if (AT(TROLL))
                 return throw_support(TROLL_RETURNS);
-            else if (AT(OGRE))
+            if (AT(OGRE))
                 return throw_support(OGRE_DODGE);
-            else if (HERE(BEAR) && game.prop[BEAR] == UNTAMED_BEAR) {
+            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] = IS_FIXED;
@@ -1290,10 +1289,10 @@ int action(struct command_t *command)
         else if ((LIQUID() == command->obj && HERE(BOTTLE)) ||
                  command->obj == LIQLOC(game.loc))
             /* FALL THROUGH */;
-        else if (command->obj == OIL && HERE(URN) && game.prop[URN] != 0) {
+        else if (command->obj == OIL && HERE(URN) && game.prop[URN] != URN_EMPTY) {
             command->obj = URN;
             /* FALL THROUGH */;
-        } else if (command->obj == PLANT && AT(PLANT2) && game.prop[PLANT2] != 0) {
+        } else if (command->obj == PLANT && AT(PLANT2) && game.prop[PLANT2] != PLANT_THIRSTY) {
             command->obj = PLANT2;
             /* FALL THROUGH */;
         } else if (command->obj == KNIFE && game.knfloc == game.loc) {