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:
29b8f5b
)
Eliminate last logic guard on a packed value.
author
Eric S. Raymond
<esr@thyrsus.com>
Thu, 20 Jul 2017 13:50:58 +0000
(09:50 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Thu, 20 Jul 2017 13:50:58 +0000
(09:50 -0400)
actions.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index 682b03bd6cdecfa66e59203e967ef6552baf8cc8..5433a7dad1c0839b90e09f4b2264a66302d64784 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-1355,7
+1355,10
@@
int action(struct command_t *command)
if (command->raw2[0] != '\0' && command->verb != SAY)
return GO_WORD2;
if (command->verb == SAY)
if (command->raw2[0] != '\0' && command->verb != SAY)
return GO_WORD2;
if (command->verb == SAY)
- command->obj = command->wd2;
+ /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE
+ * will do here. We're preventing interpretation as an intransitive
+ * verb when the word is unknown. */
+ command->obj = command->raw2[0] != '\0' ? KEYS : NO_OBJECT;
if (command->obj == NO_OBJECT ||
command->obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */
if (command->obj == NO_OBJECT ||
command->obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */