X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=2ba9dda3d4a6a52ead0e6f833c6d358ded07b64f;hp=f0dbb3a988fe7461a6ecccddfa7463f27467f3d8;hb=5fb6e2e1bcec3bfddd322d27bdd85037c3c814f7;hpb=5cdaa301dcf6ececc1d2a9e340d8da698a9f55d8

diff --git a/main.c b/main.c
index f0dbb3a..2ba9dda 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>
@@ -461,7 +465,7 @@ static void croak(void)
 /*  Okay, he's dead.  Let's get on with it. */
 {
     if (game.numdie < 0)
-        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;
@@ -1033,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
@@ -1060,6 +1067,7 @@ Lclearobj:
         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"};
@@ -1083,12 +1091,6 @@ Lclearobj:
         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()) {
@@ -1116,6 +1118,7 @@ Lclearobj:
                     command.word[0].id = DEPRESSION;
                 }
                 if (game.loc == LOC_COBBLE ||
+
                     game.loc == LOC_DEBRIS ||
                     game.loc == LOC_AWKWARD ||
                     game.loc == LOC_BIRD ||
@@ -1175,6 +1178,10 @@ Lookup:
             command.verb = command.word[0].id;
             break;
         case NUMERIC: // LCOV_EXCL_LINE
+	    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
         }
@@ -1186,6 +1193,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 +1211,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);