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:
aa5870a
)
Fix Gitlab issue #30: Say is broken.
author
Eric S. Raymond
<esr@thyrsus.com>
Thu, 20 Jul 2017 14:47:33 +0000
(10:47 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Thu, 20 Jul 2017 14:47:33 +0000
(10:47 -0400)
actions.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index 4fd0dda52652fe7941e58390779a5eaf407e4960..bc442de600dd72209a3219a0256c6813e4c24ad6 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-1144,18
+1144,19
@@
static int rub(verb_t verb, obj_t obj)
static int say(struct command_t *command)
/* Say. Echo WD2. Magic words override. */
{
static int say(struct command_t *command)
/* Say. Echo WD2. Magic words override. */
{
- long wd;
- enum wordtype type;
- get_vocab_metadata(command->raw2, &wd, &type);
- if (wd == XYZZY ||
- wd == PLUGH ||
- wd == PLOVER ||
- wd == FEE ||
- wd == FIE ||
- wd == FOE ||
- wd == FOO ||
- wd == FUM ||
- wd == PART) {
+ if (command->type2 == MOTION &&
+ (command->id2 == XYZZY ||
+ command->id2 == PLUGH ||
+ command->id2 == PLOVER)) {
+ return GO_WORD2;
+ }
+ if (command->type2 == ACTION &&
+ (command->id2 == FEE ||
+ command->id2 == FIE ||
+ command->id2 == FOE ||
+ command->id2 == FOO ||
+ command->id2 == FUM ||
+ command->id2 == PART)) {
return GO_WORD2;
}
sspeak(OKEY_DOKEY, command->raw2);
return GO_WORD2;
}
sspeak(OKEY_DOKEY, command->raw2);