X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=083dac5de3f4a8e8271421f6d14844ef4d300f3c;hp=0f245a2d0e6d971279ebaab0e7b6157f7a39106d;hb=9a32aab879bfcaa28c48e81a95e9314589171512;hpb=917af2e7440cd0d274db78c55e1f0cc8c05cde2d

diff --git a/main.c b/main.c
index 0f245a2..083dac5 100644
--- a/main.c
+++ b/main.c
@@ -11,6 +11,10 @@
  * ESR apologizes for the remaing gotos (now confined to one function
  * in this file - there used to be over 350 of them, *everywhere*).
  * Applying the Structured Program Theorem can be hard.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
  */
 
 #include <stdlib.h>
@@ -85,7 +89,6 @@ int main(int argc, char *argv[])
                 fprintf(stderr,
                         "advent: can't open save file %s for read\n",
                         optarg);
-            signal(SIGINT, sig_handler);
             break;
 #endif
         default:
@@ -461,6 +464,8 @@ static bool dwarfmove(void)
 static void croak(void)
 /*  Okay, he's dead.  Let's get on with it. */
 {
+    if (game.numdie < 0)
+        game.numdie = 0;  // LCOV_EXCL_LINE
     const char* query = obituaries[game.numdie].query;
     const char* yes_response = obituaries[game.numdie].yes_response;
     ++game.numdie;
@@ -693,14 +698,16 @@ static void playermove( int motion)
                      * to get it out.  Having dropped it, go back and
                      * pretend he wasn't carrying it after all. */
                     drop(EMERALD, game.loc);
-                    int te_tmp = travel_entry;
-                    do {
-                        if (travel[te_tmp].stop)
-                            BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
-                        ++te_tmp;
-                    } while
-                    (traveleq(travel_entry, te_tmp));
-                    travel_entry = te_tmp;
+                    {
+                        int te_tmp = travel_entry;
+                        do {
+                            if (travel[te_tmp].stop)
+                                BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE
+                            ++te_tmp;
+                        } while
+                        (traveleq(travel_entry, te_tmp));
+                        travel_entry = te_tmp;
+                    }
                     continue; /* goto L12 */
                 case 3:
                     /* Special travel 3.  Troll bridge.  Must be done
@@ -1030,8 +1037,11 @@ static bool do_command()
         listobjects();
 
 Lclearobj:
+	command.verb = ACT_NULL;
         game.oldobj = command.obj;
+	command.obj = NO_OBJECT;
 
+Lcheckhint:
         checkhints();
 
         /*  If closing time, check for any objects being toted with
@@ -1050,24 +1060,16 @@ Lclearobj:
         if (game.knfloc > 0 && game.knfloc != game.loc)
             game.knfloc = 0;
 
-        /* Preserve state from last command for reuse when required */
-        command_t preserve = command;
-
         // Get command input from user
         if (!get_command_input(&command))
             return false;
 
+Lclosecheck:
 #ifdef GDEBUG
         /* Needs to stay synced with enum word_type_t */
         const char *types[] = {"NO_WORD_TYPE", "MOTION", "OBJECT", "ACTION", "NUMERIC"};
         /* needs to stay synced with enum speechpart */
         const char *roles[] = {"unknown", "intransitive", "transitive"};
-        printf("Preserve: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n",
-               roles[preserve.part],
-               types[preserve.word[0].type],
-               preserve.word[0].id,
-               types[preserve.word[1].type],
-               preserve.word[1].id);
         printf("Command: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n",
                roles[command.part],
                types[command.word[0].type],
@@ -1076,16 +1078,6 @@ Lclearobj:
                command.word[1].id);
 #endif
 
-        /* Handle of objectless action followed by actionless object */
-        if (preserve.word[0].type == ACTION && preserve.word[1].type == NO_WORD_TYPE && command.word[1].id == 0)
-            command.verb = preserve.verb;
-
-#ifdef BROKEN
-        /* Handling of actionless object followed by objectless action */
-        if (preserve.type1 == OBJECT && preserve.type2 == NO_WORD_TYPE && command.id2 == 0)
-            command.obj = preserve.obj;
-#endif
-
         ++game.turns;
 
         if (closecheck()) {
@@ -1113,6 +1105,7 @@ Lclearobj:
                     command.word[0].id = DEPRESSION;
                 }
                 if (game.loc == LOC_COBBLE ||
+
                     game.loc == LOC_DEBRIS ||
                     game.loc == LOC_AWKWARD ||
                     game.loc == LOC_BIRD ||
@@ -1171,13 +1164,14 @@ Lookup:
                 command.part = intransitive;
             command.verb = command.word[0].id;
             break;
-        case NUMERIC: // LCOV_EXCL_LINE
+        case NUMERIC:
+	    if (!settings.oldstyle) {
+		sspeak(DONT_KNOW, command.word[0].raw);
+		goto Lclearobj;
+	    }
         default: // LCOV_EXCL_LINE
             BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
         }
-        if (!is_valid(game)) {
-            exit(1);
-        }
         switch (action(command)) {
         case GO_TERMINATE:
             return true;
@@ -1186,6 +1180,10 @@ Lookup:
             return true;
         case GO_TOP:
             continue;	/* back to top of main interpreter loop */
+        case GO_CLEAROBJ:
+            goto Lclearobj;
+        case GO_CHECKHINT:
+            goto Lcheckhint;
         case GO_WORD2:
 #ifdef GDEBUG
             printf("Word shift\n");
@@ -1200,9 +1198,7 @@ Lookup:
             command.word[0].raw[0] = toupper(command.word[0].raw[0]);
             sspeak(DO_WHAT, command.word[0].raw);
             command.obj = 0;
-        // Fallthrough
-        case GO_CLEAROBJ:
-            goto Lclearobj;
+            goto Lcheckhint;
         case GO_DWARFWAKE:
             /*  Oh dear, he's disturbed the dwarves. */
             rspeak(DWARVES_AWAKEN);