From 9056fa7a2c429bef0b5abca1f7f0f9bbecefd4b6 Mon Sep 17 00:00:00 2001
From: Aaron Traas <aaron@traas.org>
Date: Mon, 10 Jul 2017 17:35:24 -0400
Subject: [PATCH] Eliminated another label

---
 main.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/main.c b/main.c
index bff59fb..c53939c 100644
--- a/main.c
+++ b/main.c
@@ -1075,7 +1075,6 @@ static bool do_command()
 Lclearobj:
         game.oldobj = command.obj;
 
-L2600:
         checkhints();
 
         /*  If closing time, check for any objects being toted with
@@ -1098,7 +1097,7 @@ L2600:
         if(!get_command_input(&command)) 
             return false;
 
-L2607:
+Lthreshold:
         ++game.turns;
 
         /* If a turn threshold has been met, apply penalties and tell
@@ -1154,7 +1153,7 @@ Lookup:
                 continue;
             /* Gee, I don't understand. */
             sspeak(DONT_KNOW, command.raw1);
-            goto L2600;
+            goto Lclearobj;
         }
         /* FIXME: magic numbers related to vocabulary */
         kmod = MOD(defn, 1000);
@@ -1185,12 +1184,8 @@ Lookup:
             return true;
         case GO_TOP:
             continue;	/* back to top of main interpreter loop */
-        case GO_CLEAROBJ:
-            goto Lclearobj;
-        case GO_CHECKHINT:
-            goto L2600;
         case GO_CHECKFOO:
-            goto L2607;
+            goto Lthreshold;
         case GO_LOOKUP:
             goto Lookup;
         case GO_WORD2:
@@ -1206,7 +1201,10 @@ Lookup:
             command.raw1[0] = toupper(command.raw1[0]);
             sspeak(DO_WHAT, command.raw1);
             command.obj = 0;
-            goto L2600;
+            // Fallthrough
+        case GO_CHECKHINT: // Fallthrough
+        case GO_CLEAROBJ:
+            goto Lclearobj;
         case GO_DWARFWAKE:
             /*  Oh dear, he's disturbed the dwarves. */
             rspeak(DWARVES_AWAKEN);
-- 
2.31.1