Add check of lantern_fuel_left > 0 for throw_rock

[snowed-in.git] / src / snowed-in.inf

diff --git a/src/snowed-in.inf b/src/snowed-in.inf
index e37515b5ae323bc3ce83111d8dc6c2c97a49e7ce..0c4ce1a35fa647c6511c8595fe40f37b7b4033ac 100644 (file)
--- a/src/snowed-in.inf
+++ b/src/snowed-in.inf
@@ -202,7 +202,7 @@ Object  lightsocket "light socket" mainroom
                     with a warning label because you contain more than 
                     a trace amount of nut.";
             }
-            if (noun == lightbulb && light has on) {
+            if (noun == lightbulb && lightbulb has on) {
                 give mainroom light;
                 give office light;
                 give kitchenette light;
@@ -573,8 +573,9 @@ Object  southofcabin "South Of Cabin"
             check_for_cabin_lighting();
             ! }
             if (snowshoes has worn && lantern in player && eastofcabin hasnt
-            visited) {
+            visited && lantern_fuel_left > 0) {
                 throw_rock();
+                print "^";
             }
         ],
         n_to frontdoor,
@@ -868,8 +869,10 @@ Object  eastofcabin "East Of Cabin"
   with  description [;
             print "It's dark outside. ";
             check_for_cabin_lighting();
-            if (cabin_has_electricity == 1 && lantern in player) {
+            if (cabin_has_electricity == 1 && lantern in player && lantern_fuel_left
+            > 0) {
                 throw_rock();
+                print "^";
             }
         ],
         w_to window,