X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=c53939cb5ed673a0ac6a79b206b28ca1f0969da1;hb=9056fa7a2c429bef0b5abca1f7f0f9bbecefd4b6;hp=c23b46747c5f99e45029d46de4ca2d7451ef435c;hpb=4d7858d333057850b7d4635ba51441238f0721e2;p=open-adventure.git diff --git a/main.c b/main.c index c23b467..c53939c 100644 --- a/main.c +++ b/main.c @@ -1075,7 +1075,6 @@ static bool do_command() Lclearobj: game.oldobj = command.obj; -L2600: checkhints(); /* If closing time, check for any objects being toted with @@ -1098,7 +1097,7 @@ L2600: if(!get_command_input(&command)) return false; -L2607: +Lthreshold: ++game.turns; /* If a turn threshold has been met, apply penalties and tell @@ -1138,7 +1137,7 @@ L2607: if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD)) command.wd1 = token_to_packed("CATCH"); } -Lmovehint: +Lookup: if (wordeq(command.wd1, token_to_packed("WEST"))) { if (++game.iwest == 10) rspeak(W_IS_WEST); @@ -1147,7 +1146,6 @@ Lmovehint: if (++game.igo == 10) rspeak(GO_UNNEEDED); } -Lookup: packed_to_token(command.wd1, word1); defn = get_vocab_id(word1); if (defn == WORD_NOT_FOUND) { @@ -1155,7 +1153,7 @@ Lookup: continue; /* Gee, I don't understand. */ sspeak(DONT_KNOW, command.raw1); - goto L2600; + goto Lclearobj; } /* FIXME: magic numbers related to vocabulary */ kmod = MOD(defn, 1000); @@ -1186,12 +1184,8 @@ Lookup: return true; case GO_TOP: continue; /* back to top of main interpreter loop */ - case GO_CLEAROBJ: - goto Lclearobj; - case GO_CHECKHINT: - goto L2600; case GO_CHECKFOO: - goto L2607; + goto Lthreshold; case GO_LOOKUP: goto Lookup; case GO_WORD2: @@ -1200,14 +1194,17 @@ Lookup: strncpy(command.raw1, command.raw2, LINESIZE - 1); wordclear(&command.wd2); command.raw2[0] = '\0'; - goto Lmovehint; + goto Lookup; case GO_UNKNOWN: /* Random intransitive verbs come here. Clear obj just in case * (see attack()). */ command.raw1[0] = toupper(command.raw1[0]); sspeak(DO_WHAT, command.raw1); command.obj = 0; - goto L2600; + // Fallthrough + case GO_CHECKHINT: // Fallthrough + case GO_CLEAROBJ: + goto Lclearobj; case GO_DWARFWAKE: /* Oh dear, he's disturbed the dwarves. */ rspeak(DWARVES_AWAKEN);