Fixed regression in #21 Cleaned up logic of light/extinguish

diff --git a/actions.c b/actions.c
index ae463219171b05ea1525c2ef2a55c4eb2b0baa91..51a3f599a6cddde9b9d7d590e7b5bfb70826b6b0 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -523,13 +523,12 @@ static int eat(token_t verb, token_t obj)
 static int extinguish(token_t verb, int obj)
 /* Extinguish.  Lamp, urn, dragon/volcano (nice try). */
 {
-    int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (HERE(LAMP) && game.prop[LAMP] == LAMP_BRIGHT)
             obj = LAMP;
         if (HERE(URN) && game.prop[URN] == URN_LIT)
-            obj = obj * NOBJECTS + URN;
-        if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS)
+            obj = URN;
+        if (obj == INTRANSITIVE)
             return GO_UNKNOWN;
     }
 
@@ -539,13 +538,16 @@ static int extinguish(token_t verb, int obj)
         } else {
             pspeak(URN, change, URN_DARK);
         }
-        return GO_CLEAROBJ;
+
     } else if (obj == LAMP) {
         state_change(LAMP, LAMP_DARK);
-        spk = DARK(game.loc) ? PITCH_DARK : NO_MESSAGE;
-    } else if (obj == DRAGON || obj == VOLCANO)
-        spk = BEYOND_POWER;
-    rspeak(spk);
+        rspeak(DARK(game.loc) ? PITCH_DARK : NO_MESSAGE);
+    } else if (obj == DRAGON || obj == VOLCANO) {
+        rspeak(BEYOND_POWER);
+
+    } else {
+        rspeak(actions[verb].message);
+    }
     return GO_CLEAROBJ;
 }
 

diff --git a/tests/urntest.chk b/tests/urntest.chk
index 90ae17c6b1fa1cab3a65696f8fb8e75f69d298fa..8beba1bcaebb621b7e9860d62269987a0da7b1b2 100644 (file)
--- a/tests/urntest.chk
+++ b/tests/urntest.chk
@@ -2013,7 +2013,7 @@ A small oil flame extrudes from an urn embedded in the rock.
 
 > extinguish
 
-I'm afraid I don't understand.
+The urn is now dark.
 
 > look
 
@@ -2023,11 +2023,11 @@ long description of your location.
 The forest thins out here to reveal a steep cliff.  There is no way
 down, but a small ledge can be seen to the west across the chasm.
 
-A small oil flame extrudes from an urn embedded in the rock.
+A small urn full of oil is embedded in the rock.
 
-> extinguish urn
+> light
 
-The urn is now dark.
+The urn is now lit.
 
 > look
 
@@ -2037,7 +2037,7 @@ long description of your location.
 The forest thins out here to reveal a steep cliff.  There is no way
 down, but a small ledge can be seen to the west across the chasm.
 
-A small urn full of oil is embedded in the rock.
+A small oil flame extrudes from an urn embedded in the rock.
 
 > extinguish urn
 

diff --git a/tests/urntest.log b/tests/urntest.log
index 48c9836043a253ba9ce6d8c2edc2ba265d51ca2f..4cd8c31061cd85fefad5c273c87ad5ce1f8ae09f 100644 (file)
--- a/tests/urntest.log
+++ b/tests/urntest.log
@@ -344,7 +344,7 @@ read urn
 look
 extinguish
 look
-extinguish urn
+light
 look
 extinguish urn
 look