projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9a32aab
)
Eliminate a label.
author
Eric S. Raymond
<esr@thyrsus.com>
Fri, 16 Nov 2018 13:30:26 +0000
(08:30 -0500)
committer
Eric S. Raymond
<esr@thyrsus.com>
Fri, 16 Nov 2018 13:30:26 +0000
(08:30 -0500)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 083dac5de3f4a8e8271421f6d14844ef4d300f3c..3f2776c227e65ff35eb08a2de116e94f549ab7e5 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1035,12
+1035,8
@@
static bool do_command()
rspeak(SAYS_PLUGH);
listobjects();
rspeak(SAYS_PLUGH);
listobjects();
-
-Lclearobj:
- command.verb = ACT_NULL;
- game.oldobj = command.obj;
- command.obj = NO_OBJECT;
-
+ clear_command(&command);
+
Lcheckhint:
checkhints();
Lcheckhint:
checkhints();
@@
-1093,7
+1089,8
@@
Lclosecheck:
else
rspeak(WHERE_QUERY);
else
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) {
/* Gee, I don't understand. */
sspeak(DONT_KNOW, command.word[0].raw);
if (command.word[0].id == WORD_NOT_FOUND) {
/* Gee, I don't understand. */
sspeak(DONT_KNOW, command.word[0].raw);
- goto Lclearobj;
+ clear_command(&command);
+ goto Lcheckhint;
}
switch (command.word[0].type) {
case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
}
switch (command.word[0].type) {
case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
@@
-1167,7
+1165,8
@@
Lookup:
case NUMERIC:
if (!settings.oldstyle) {
sspeak(DONT_KNOW, command.word[0].raw);
case NUMERIC:
if (!settings.oldstyle) {
sspeak(DONT_KNOW, command.word[0].raw);
- goto Lclearobj;
+ clear_command(&command);
+ goto Lcheckhint;
}
default: // LCOV_EXCL_LINE
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
}
default: // 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:
continue; /* back to top of main interpreter loop */
case GO_CLEAROBJ:
case GO_TOP:
continue; /* back to top of main interpreter loop */
case GO_CLEAROBJ:
- goto Lclearobj;
+ clear_command(&command);
+ /* FALL THROUGH */
case GO_CHECKHINT:
goto Lcheckhint;
case GO_WORD2:
case GO_CHECKHINT:
goto Lcheckhint;
case GO_WORD2: