X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=9114621e974e9314aa34cae60707db25a3587c36;hb=de3be760b6ed1046d275517a48e405261644bf4e;hp=c53939cb5ed673a0ac6a79b206b28ca1f0969da1;hpb=9056fa7a2c429bef0b5abca1f7f0f9bbecefd4b6;p=open-adventure.git

diff --git a/main.c b/main.c
index c53939c..9114621 100644
--- a/main.c
+++ b/main.c
@@ -9,9 +9,8 @@
  * to idiomatic C, the following is more appropriate:
  *
  * ESR apologizes for the remaing gotos (now confined to one function
- * in this file - there used to be over 350 of them, *everywhere*),
- * and for the offensive globals.  Applying the Structured Program
- * Theorem can be hard.
+ * in this file - there used to be over 350 of them, *everywhere*).
+ * Applying the Structured Program Theorem can be hard.
  */
 
 #include <stdlib.h>
@@ -729,10 +728,11 @@ static void playermove( int motion)
                      * wander across and encounter the bear.  (They
                      * won't follow the player there because that
                      * region is forbidden to the pirate.)  If
-                     * game.prop(TROLL)=1, he's crossed since paying,
-                     * so step out and block him.  (standard travel
-                     * entries check for game.prop(TROLL)=0.)  Special
-                     * stuff for bear. */
+                     * game.prop[TROLL]=TROLL_PAIDONCE, he's crossed
+                     * since paying, so step out and block him.
+                     * (standard travel entries check for
+                     * game.prop[TROLL]=TROLL_UNPAID.)  Special stuff
+                     * for bear. */
                     if (game.prop[TROLL] == TROLL_PAIDONCE) {
                         pspeak(TROLL, look, TROLL_PAIDONCE, true);
                         game.prop[TROLL] = TROLL_UNPAID;
@@ -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;
 }
 
@@ -1092,23 +1101,14 @@ Lclearobj:
         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;
 
-Lthreshold:
+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;
@@ -1117,11 +1117,11 @@ Lthreshold:
 
         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) {
@@ -1175,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,7 +1185,7 @@ Lookup:
         case GO_TOP:
             continue;	/* back to top of main interpreter loop */
         case GO_CHECKFOO:
-            goto Lthreshold;
+            goto Lclosecheck;
         case GO_LOOKUP:
             goto Lookup;
         case GO_WORD2:
@@ -1201,7 +1201,7 @@ Lookup:
             command.raw1[0] = toupper(command.raw1[0]);
             sspeak(DO_WHAT, command.raw1);
             command.obj = 0;
-            // Fallthrough
+        // Fallthrough
         case GO_CHECKHINT: // Fallthrough
         case GO_CLEAROBJ:
             goto Lclearobj;