X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=2ba9dda3d4a6a52ead0e6f833c6d358ded07b64f;hp=c68a7ed4d2d9295264cf673ffdcabe24b781dc2a;hb=5fb6e2e1bcec3bfddd322d27bdd85037c3c814f7;hpb=31d561b4708c96f2d42cc04b9075b414de10288d diff --git a/main.c b/main.c index c68a7ed..2ba9dda 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 @@ -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);