Magic-number elimination.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index c68a7ed4d2d9295264cf673ffdcabe24b781dc2a..2ba9dda3d4a6a52ead0e6f833c6d358ded07b64f 100644 (file)
--- 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
@@ -1196,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");
@@ -1215,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);