X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=f8a920d8bec977c763ae5e448dfe22cbed372719;hb=96950869c66c72e8726f3b6b901f2f97c1c009dc;hp=bff59fbb21ba7e03e32ed43672a2987b8c4fb5af;hpb=18ec2f79b0b2bc853be1233b3ad7af72661ace24;p=open-adventure.git

diff --git a/main.c b/main.c
index bff59fb..f8a920d 100644
--- a/main.c
+++ b/main.c
@@ -788,6 +788,15 @@ static bool closecheck(void)
  *  problems arise from the use of negative prop numbers to suppress
  *  the object descriptions until he's actually moved the objects. */
 {
+    /* If a turn threshold has been met, apply penalties and tell
+     * the player about it. */
+    for (int i = 0; i < NTHRESHOLDS; ++i) {
+        if (game.turns == turn_thresholds[i].threshold + 1) {
+            game.trnluz += turn_thresholds[i].point_loss;
+            speak(turn_thresholds[i].message);
+        }
+    }
+
     /*  Don't tick game.clock1 unless well into cave (and not at Y2). */
     if (game.tally == 0 && INDEEP(game.loc) && game.loc != LOC_Y2)
         --game.clock1;
@@ -1000,7 +1009,7 @@ static bool get_command_input(struct command_t *command)
     packed_to_token(command->wd2, word2);
     command->id1 = get_vocab_id(word1);
     command->id2 = get_vocab_id(word2);
-    
+
     return true;
 }
 
@@ -1075,7 +1084,6 @@ static bool do_command()
 Lclearobj:
         game.oldobj = command.obj;
 
-L2600:
         checkhints();
 
         /*  If closing time, check for any objects being toted with
@@ -1093,23 +1101,14 @@ L2600:
         game.wzdark = DARK(game.loc);
         if (game.knfloc > 0 && game.knfloc != game.loc)
             game.knfloc = 0;
-        
+
         // Get command input from user
-        if(!get_command_input(&command)) 
+        if (!get_command_input(&command))
             return false;
 
-L2607:
+Lclosecheck:
         ++game.turns;
 
-        /* If a turn threshold has been met, apply penalties and tell
-         * the player about it. */
-        for (int i = 0; i < NTHRESHOLDS; ++i) {
-            if (game.turns == turn_thresholds[i].threshold + 1) {
-                game.trnluz += turn_thresholds[i].point_loss;
-                speak(turn_thresholds[i].message);
-            }
-        }
-
         if (closecheck()) {
             if (game.closed)
                 return true;
@@ -1118,11 +1117,11 @@ L2607:
 
         if (command.id1 == ENTER && (command.id2 == STREAM ||
                                      command.id2 == PROMOTE_WORD(WATER))) {
-            if (LIQLOC(game.loc) == WATER) {
+            if (LIQLOC(game.loc) == WATER)
                 rspeak(FEET_WET);
-            } else {
+            else
                 rspeak(WHERE_QUERY);
-            }
+
             goto Lclearobj;
         }
         if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
@@ -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);
@@ -1176,7 +1175,7 @@ Lookup:
         default:
             BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
         }
-        
+
         switch (action(&command)) {
         case GO_TERMINATE:
             return true;
@@ -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 Lclosecheck;
         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);