Remove gaps from arbitrary_messages, there are no more number sependencies.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index 0a2ed9a0828b99405a30e8690c36666fdc3e6cb6..5cb4a87a939dafec2ac154d1af3b08d7ed6e3d36 100644 (file)
--- a/main.c
+++ b/main.c
@@ -598,23 +598,22 @@ static bool playermove(token_t verb, int motion)
         if (T_TERMINATE(travel[travel_entry]) || travel[travel_entry].motion == motion)
             break;
         if (travel[travel_entry].stop) {
-            /* FIXME: Magic numbers! */
             /*  Couldn't find an entry matching the motion word passed
              *  in.  Various messages depending on word given. */
             int spk = CANT_APPLY;
-            if (motion >= 43 && motion <= 50)
+            if (motion >= EAST && motion <= NW)
                 spk = BAD_DIRECTION;
-            if (motion == 29 || motion == 30)
+            if (motion == UP || motion == DOWN)
                 spk = BAD_DIRECTION;
-            if (motion == 7 || motion == 36 || motion == 37)
+            if (motion == FORWARD || motion == LEFT || motion == RIGHT)
                 spk = UNSURE_FACING;
-            if (motion == 11 || motion == 19)
+            if (motion == OUTSIDE || motion == INSIDE)
                 spk = NO_INOUT_HERE;
             if (verb == FIND || verb == INVENTORY)
                 spk = NEARBY;
-            if (motion == 62 || motion == 65)
+            if (motion == XYZZY || motion == PLUGH)
                 spk = NOTHING_HAPPENS;
-            if (motion == 17)
+            if (motion == CRAWL)
                 spk = WHICH_WAY;
             rspeak(spk);
             return true;