X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=027f92d46ba00fa5bd4c4541ca52737944dbcdbd;hp=198a4ccb55868c4505fd9dfb8252392bd0fcd664;hb=08f77c692a84d836e494c8cd469f5ac00524cf1c;hpb=d5d6a3e02d344ed4097a38f54ccf6757e627a1f6

diff --git a/main.c b/main.c
index 198a4cc..027f92d 100644
--- a/main.c
+++ b/main.c
@@ -465,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;
@@ -972,6 +972,13 @@ static void listobjects(void)
     }
 }
 
+void clear_command(command_t *cmd)
+{
+    cmd->verb = ACT_NULL;
+    game.oldobj = cmd->obj;
+    cmd->obj = NO_OBJECT;
+}
+
 static bool do_command()
 /* Get and execute a command */
 {
@@ -1035,10 +1042,9 @@ static bool do_command()
             rspeak(SAYS_PLUGH);
 
         listobjects();
-
-Lclearobj:
-        game.oldobj = command.obj;
-
+	clear_command(&command);
+	
+Lcheckhint:
         checkhints();
 
         /*  If closing time, check for any objects being toted with
@@ -1057,24 +1063,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],
@@ -1083,16 +1081,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.word[0].type == OBJECT && preserve.word[1].type == NO_WORD_TYPE && command.word[1].id == 0 && command.word[0].id == CARRY)
-            command.obj = preserve.obj;
-#endif /* BROKEN */
-	
         ++game.turns;
 
         if (closecheck()) {
@@ -1108,7 +1096,8 @@ Lclearobj:
             else
                 rspeak(WHERE_QUERY);
 
-            goto Lclearobj;
+	    clear_command(&command);
+            goto Lcheckhint;
         }
 
         if (command.word[0].type == OBJECT) {
@@ -1120,6 +1109,7 @@ Lclearobj:
                     command.word[0].id = DEPRESSION;
                 }
                 if (game.loc == LOC_COBBLE ||
+
                     game.loc == LOC_DEBRIS ||
                     game.loc == LOC_AWKWARD ||
                     game.loc == LOC_BIRD ||
@@ -1160,7 +1150,8 @@ Lookup:
         if (command.word[0].id == WORD_NOT_FOUND) {
             /* Gee, I don't understand. */
             sspeak(DONT_KNOW, command.word[0].raw);
-            goto Lclearobj;
+	    clear_command(&command);
+            goto Lcheckhint;
         }
         switch (command.word[0].type) {
         case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
@@ -1178,10 +1169,11 @@ 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;
+		clear_command(&command);
+		goto Lcheckhint;
 	    }
         default: // LCOV_EXCL_LINE
             BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
@@ -1194,6 +1186,11 @@ Lookup:
             return true;
         case GO_TOP:
             continue;	/* back to top of main interpreter loop */
+        case GO_CLEAROBJ:
+	    clear_command(&command);
+            /* FALL THROUGH */
+        case GO_CHECKHINT:
+            goto Lcheckhint;
         case GO_WORD2:
 #ifdef GDEBUG
             printf("Word shift\n");
@@ -1208,9 +1205,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);