archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate a label.

Browse source
This commit is contained in:
Eric S. Raymond 2018-11-16 08:30:26 -05:00
parent 9a32aab879
commit deb489cd8c
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
main.c
View file

@ -1035,11 +1035,7 @@ static bool do_command()
rspeak(SAYS_PLUGH); rspeak(SAYS_PLUGH);
listobjects(); listobjects();
clear_command(&command);
Lclearobj:
command.verb = ACT_NULL;
game.oldobj = command.obj;
command.obj = NO_OBJECT;
Lcheckhint: Lcheckhint:
checkhints(); checkhints();
@ -1093,7 +1089,8 @@ Lclosecheck:
else else
rspeak(WHERE_QUERY); rspeak(WHERE_QUERY);
goto Lclearobj; clear_command(&command);
goto Lcheckhint;
} }
if (command.word[0].type == OBJECT) { if (command.word[0].type == OBJECT) {
@ -1146,7 +1143,8 @@ Lookup:
if (command.word[0].id == WORD_NOT_FOUND) { if (command.word[0].id == WORD_NOT_FOUND) {
/* Gee, I don't understand. */ /* Gee, I don't understand. */
sspeak(DONT_KNOW, command.word[0].raw); sspeak(DONT_KNOW, command.word[0].raw);
goto Lclearobj; clear_command(&command);
goto Lcheckhint;
} }
switch (command.word[0].type) { switch (command.word[0].type) {
case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
@ -1167,7 +1165,8 @@ Lookup:
case NUMERIC: case NUMERIC:
if (!settings.oldstyle) { if (!settings.oldstyle) {
sspeak(DONT_KNOW, command.word[0].raw); sspeak(DONT_KNOW, command.word[0].raw);
goto Lclearobj; clear_command(&command);
goto Lcheckhint;
} }
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
@ -1181,7 +1180,8 @@ Lookup:
case GO_TOP: case GO_TOP:
continue; /* back to top of main interpreter loop */ continue; /* back to top of main interpreter loop */
case GO_CLEAROBJ: case GO_CLEAROBJ:
goto Lclearobj; clear_command(&command);
/* FALL THROUGH */
case GO_CHECKHINT: case GO_CHECKHINT:
goto Lcheckhint; goto Lcheckhint;
case GO_WORD2: case GO_WORD2: