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

diff --git a/main.c b/main.c
index c68a7ed..083dac5 100644
--- a/main.c
+++ b/main.c
@@ -1037,11 +1037,11 @@ static bool do_command()
         listobjects();
 
 Lclearobj:
-	command.verb = 0;
+	command.verb = ACT_NULL;
         game.oldobj = command.obj;
-	command.obj = 0;
+	command.obj = NO_OBJECT;
 
-L2600:
+Lcheckhint:
         checkhints();
 
         /*  If closing time, check for any objects being toted with
@@ -1060,9 +1060,6 @@ L2600:
         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;
@@ -1073,12 +1070,6 @@ Lclosecheck:
         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],
@@ -1087,10 +1078,6 @@ Lclosecheck:
                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;
-
         ++game.turns;
 
         if (closecheck()) {
@@ -1177,7 +1164,7 @@ 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;
@@ -1196,11 +1183,7 @@ Lookup:
         case GO_CLEAROBJ:
             goto Lclearobj;
         case GO_CHECKHINT:
-            goto L2600;
-        case GO_CHECKFOO:
-            goto Lclosecheck;
-        case GO_LOOKUP:
-            goto Lookup;
+            goto Lcheckhint;
         case GO_WORD2:
 #ifdef GDEBUG
             printf("Word shift\n");
@@ -1215,7 +1198,7 @@ Lookup:
             command.word[0].raw[0] = toupper(command.word[0].raw[0]);
             sspeak(DO_WHAT, command.word[0].raw);
             command.obj = 0;
-            goto L2600;
+            goto Lcheckhint;
         case GO_DWARFWAKE:
             /*  Oh dear, he's disturbed the dwarves. */
             rspeak(DWARVES_AWAKEN);