Magic-number elimination.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 198a4ccb55868c4505fd9dfb8252392bd0fcd664..2ba9dda3d4a6a52ead0e6f833c6d358ded07b64f 100644 (file)
--- 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;
@@ -1037,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
@@ -1064,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"};
@@ -1087,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.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()) {
@@ -1120,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 ||
@@ -1194,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");
@@ -1208,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);