Magic-number elimination.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 05812402df1ff34831e178b2b295a269f6e6a1f7..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,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
@@ -1091,12 +1091,6 @@ Lclosecheck:
         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()) {
@@ -1191,9 +1185,6 @@ Lookup:
         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;
@@ -1205,11 +1196,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");
@@ -1224,7 +1211,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);