Uncomment if frontdoor has open. Also remove a commented line

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

diff --git a/src/snowed-in.inf b/src/snowed-in.inf
index e37515b5ae323bc3ce83111d8dc6c2c97a49e7ce..af4c4c9936ef671bb9c9a0549f9c55b7da973a55 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;
@@ -569,13 +569,14 @@ Object  southofcabin "South Of Cabin"
                 print 
                     "It's really cold and you're not dressed for 
                     this weather. ";
-            ! if (frontdoor has open) {
-            check_for_cabin_lighting();
-            ! }
+            if (frontdoor has open) {
+                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,
         s_to forest,
@@ -861,16 +862,17 @@ Object  forest "Forest"
             "The snowshoes are doing their job by making sure 
             you don't sink into the snow. ";
     }
-    print "^";
 ];
 
 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,
         s_to southofcabin,