X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=5a9c7c396df492eba7f5324333a2bc0e26455fb7;hb=12b2ff74f6bbca81dc04e359f2209fe3a442e0df;hp=c23b46747c5f99e45029d46de4ca2d7451ef435c;hpb=4d7858d333057850b7d4635ba51441238f0721e2;p=open-adventure.git

diff --git a/main.c b/main.c
index c23b467..5a9c7c3 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;
@@ -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
@@ -1098,18 +1106,9 @@ L2600:
         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) {
@@ -1138,7 +1137,7 @@ L2607:
             if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
                 command.wd1 = token_to_packed("CATCH");
         }
-Lmovehint:
+Lookup:
         if (wordeq(command.wd1, token_to_packed("WEST"))) {
             if (++game.iwest == 10)
                 rspeak(W_IS_WEST);
@@ -1147,7 +1146,6 @@ Lmovehint:
             if (++game.igo == 10)
                 rspeak(GO_UNNEEDED);
         }
-Lookup:
         packed_to_token(command.wd1, word1);
         defn = get_vocab_id(word1);
         if (defn == WORD_NOT_FOUND) {
@@ -1155,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);
@@ -1186,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:
@@ -1200,14 +1194,17 @@ Lookup:
             strncpy(command.raw1, command.raw2, LINESIZE - 1);
             wordclear(&command.wd2);
             command.raw2[0] = '\0';
-            goto Lmovehint;
+            goto Lookup;
         case GO_UNKNOWN:
             /*  Random intransitive verbs come here.  Clear obj just in case
              *  (see attack()). */
             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);