From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 20 Jul 2017 14:47:33 +0000 (-0400)
Subject: Fix Gitlab issue #30: Say is broken.
X-Git-Tag: 1.3~36
X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=08f260c4d56eb26d8f4375c8212862b170e5a637

Fix Gitlab issue #30: Say is broken.
---

diff --git a/actions.c b/actions.c
index 4fd0dda..bc442de 100644
--- 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. */
 {
-    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);