X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=bc442de600dd72209a3219a0256c6813e4c24ad6;hb=4da9742cd28e87ea91d3a7b75e3d7147011b95e7;hp=4fd0dda52652fe7941e58390779a5eaf407e4960;hpb=8bd947b54d365f4e8a119be761021be055ea8748;p=open-adventure.git

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);