Remove flawed code to drop batteries.
authorEric S. Raymond <esr@thyrsus.com>
Mon, 17 Jul 2017 11:29:44 +0000 (07:29 -0400)
committerEric S. Raymond <esr@thyrsus.com>
Mon, 17 Jul 2017 11:29:44 +0000 (07:29 -0400)
main.c

diff --git a/main.c b/main.c
index 1c818ccd1e0101a7762ced17e085d261f47a1f9e..350c4aeb36b7f4622b32306b2b5d0c8a4507b475 100644 (file)
--- a/main.c
+++ b/main.c
@@ -908,8 +908,14 @@ static void lampcheck(void)
         if (HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) {
             rspeak(REPLACE_BATTERIES);
             game.prop[BATTERY] = DEAD_BATTERIES;
+#ifdef __unused__
+           /* This code from the original game seems to have been faulty.
+            * No tests ever passed the guard, and with the guard removed
+            * the game hangs when the lamp limit is reached.  
+            */
             if (TOTING(BATTERY))
                 drop(BATTERY, game.loc);
+#endif
             game.limit += BATTERYLIFE;
             game.lmwarn = false;
         } else if (!game.lmwarn && HERE(LAMP)) {