From: Jason S. Ninneman <jsn@mbar.us>
Date: Sat, 1 Jul 2017 13:21:37 +0000 (-0700)
Subject: Apply DEMOTE_WORD().
X-Git-Tag: takebird~156
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F178%2Fhead;p=open-adventure.git

Apply DEMOTE_WORD().
---

diff --git a/main.c b/main.c
index 3c4d448..39a8899 100644
--- a/main.c
+++ b/main.c
@@ -1115,7 +1115,7 @@ L2607:
             /* FIXME: Magic numbers related to vocabulary */
 	    if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) ||
 		  (V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) {
-                if (AT(V2 - 1000))
+	        if (AT(DEMOTE_WORD(V2)))
                     command.wd2 = token_to_packed("POUR");
             }
 	    if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))