From: Jason S. Ninneman <jsn@mbar.us>
Date: Wed, 12 Jul 2017 21:32:46 +0000 (-0700)
Subject: Replace some more wd? with id?.
X-Git-Tag: 1.3~98
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=e581c7741d0afebd2fd52adf575e530295391b4f;p=open-adventure.git

Replace some more wd? with id?.
---

diff --git a/actions.c b/actions.c
index 802c1f3..6cff55c 100644
--- a/actions.c
+++ b/actions.c
@@ -1347,14 +1347,14 @@ int action(struct command_t *command)
             command->obj = ROD2;
             /* FALL THROUGH */;
         } else if ((command->verb == FIND ||
-                    command->verb == INVENTORY) && command->wd2 <= 0)
+                    command->verb == INVENTORY) && (command->id2 == WORD_EMPTY || command->id2 == WORD_NOT_FOUND))
             /* FALL THROUGH */;
         else {
             sspeak(NO_SEE, command->raw1);
             return GO_CLEAROBJ;
         }
 
-        if (command->wd2 > 0)
+        if (command->id2 != WORD_EMPTY && command->id2 != WORD_NOT_FOUND)
             return GO_WORD2;
         if (command->verb != 0)
             command->part = transitive;