Cleaned up light and extinguish

[open-adventure.git] / actions.c

diff --git a/actions.c b/actions.c
index ec7fb1c0a481d44d335da93ebe61e97e74cb7b41..1aa70ac2916115d0ad9a65d5cb2a7a4388daff48 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -557,31 +557,28 @@ static int eat(token_t verb, obj_t obj)
 /*  Eat.  Intransitive: assume food if present, else ask what.  Transitive: food
  *  ok, some things lose appetite, rest are ridiculous. */
 {
-    if (obj == INTRANSITIVE) {
+    switch (obj) {
+    case INTRANSITIVE:
         if (!HERE(FOOD))
             return GO_UNKNOWN;
+    case FOOD:
         DESTROY(FOOD);
         rspeak(THANKS_DELICIOUS);
-        return GO_CLEAROBJ;
-    }
-    if (obj == FOOD) {
-        DESTROY(FOOD);
-        rspeak(THANKS_DELICIOUS);
-        return GO_CLEAROBJ;
-    }
-    if (obj == BIRD ||
-        obj == SNAKE ||
-        obj == CLAM ||
-        obj == OYSTER ||
-        obj == DWARF ||
-        obj == DRAGON ||
-        obj == TROLL ||
-        obj == BEAR ||
-        obj == OGRE) {
+        break;
+    case BIRD:
+    case SNAKE:
+    case CLAM:
+    case OYSTER:
+    case DWARF:
+    case DRAGON:
+    case TROLL:
+    case BEAR:
+    case OGRE:
         rspeak(LOST_APPETITE);
-        return GO_CLEAROBJ;
+        break;
+    default:
+        speak(actions[verb].message);
     }
-    speak(actions[verb].message);
     return GO_CLEAROBJ;
 }
 
@@ -597,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;
 }
 
@@ -847,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)