X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=4a92f00835d3f4c616b50fe95ae1b4d7f6c7b670;hp=6ad7c3669289b77ced08c8efae7f07e41c676071;hb=39a25f8ec79c2a6e0f25fb9060cdb932e3383905;hpb=3001fb1dc1761502f875bb266706a311ee5ff24f

diff --git a/main.c b/main.c
index 6ad7c36..4a92f00 100644
--- a/main.c
+++ b/main.c
@@ -425,7 +425,8 @@ static bool dwarfmove(void)
         game.odloc[i] = game.dloc[i];
         game.dloc[i] = tk[j];
         game.dseen[i] = (game.dseen[i] && INDEEP(game.loc)) || (game.dloc[i] == game.loc || game.odloc[i] == game.loc);
-        if (!game.dseen[i]) continue;
+        if (!game.dseen[i])
+            continue;
         game.dloc[i] = game.loc;
         if (spotted_by_pirate(i))
             continue;
@@ -448,7 +449,8 @@ static bool dwarfmove(void)
     rspeak(game.dtotal == 1 ? DWARF_SINGLE : DWARF_PACK, game.dtotal);
     if (attack == 0)
         return true;
-    if (game.dflag == 2)game.dflag = 3;
+    if (game.dflag == 2)
+        game.dflag = 3;
     if (attack > 1) {
         rspeak(THROWN_KNIVES, attack);
         rspeak(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT), stick);
@@ -519,7 +521,7 @@ static void croak(void)
  *  him, so we need game.oldlc2, which is the last place he was
  *  safe.) */
 
-static bool playermove(token_t verb, int motion)
+static bool playermove( int motion)
 {
     int scratchloc, travel_entry = tkey[game.loc];
     game.newloc = game.loc;
@@ -596,17 +598,21 @@ 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)spk = BAD_DIRECTION;
-            if (motion == 29 || motion == 30)spk = BAD_DIRECTION;
-            if (motion == 7 || motion == 36 || motion == 37)spk = UNSURE_FACING;
-            if (motion == 11 || motion == 19)spk = NO_INOUT_HERE;
-            if (verb == FIND || verb == INVENTORY)spk = NEARBY;
-            if (motion == 62 || motion == 65)spk = NOTHING_HAPPENS;
-            if (motion == 17)spk = WHICH_WAY;
+            if (motion >= EAST && motion <= NW)
+                spk = BAD_DIRECTION;
+            if (motion == UP || motion == DOWN)
+                spk = BAD_DIRECTION;
+            if (motion == FORWARD || motion == LEFT || motion == RIGHT)
+                spk = UNSURE_FACING;
+            if (motion == OUTSIDE || motion == INSIDE)
+                spk = NO_INOUT_HERE;
+            if (motion == XYZZY || motion == PLUGH)
+                spk = NOTHING_HAPPENS;
+            if (motion == CRAWL)
+                spk = WHICH_WAY;
             rspeak(spk);
             return true;
         }
@@ -710,8 +716,10 @@ static bool playermove(token_t verb, int motion)
                         return true;
                     } else {
                         game.newloc = objects[TROLL].plac + objects[TROLL].fixd - game.loc;
-                        if (game.prop[TROLL] == 0)game.prop[TROLL] = 1;
-                        if (!TOTING(BEAR)) return true;
+                        if (game.prop[TROLL] == 0)
+                            game.prop[TROLL] = 1;
+                        if (!TOTING(BEAR))
+                            return true;
                         rspeak(BRIDGE_COLLAPSE);
                         game.prop[CHASM] = 1;
                         game.prop[TROLL] = 2;
@@ -872,7 +880,8 @@ static void lampcheck(void)
         if (!game.lmwarn && HERE(LAMP)) {
             game.lmwarn = true;
             int spk = GET_BATTERIES;
-            if (game.place[BATTERY] == LOC_NOWHERE)spk = LAMP_DIM;
+            if (game.place[BATTERY] == LOC_NOWHERE)
+                spk = LAMP_DIM;
             if (game.prop[BATTERY] == DEAD_BATTERIES)
                 spk = MISSING_BATTERIES;
             rspeak(spk);
@@ -893,7 +902,8 @@ static void listobjects(void)
         ++game.abbrev[game.loc];
         for (int i = game.atloc[game.loc]; i != 0; i = game.link[i]) {
             long obj = i;
-            if (obj > NOBJECTS)obj = obj - NOBJECTS;
+            if (obj > NOBJECTS)
+                obj = obj - NOBJECTS;
             if (obj == STEPS && TOTING(NUGGET))
                 continue;
             if (game.prop[obj] < 0) {
@@ -939,7 +949,8 @@ static bool do_command()
     if (OUTSID(game.newloc) && game.newloc != 0 && game.closng) {
         rspeak(EXIT_CLOSED);
         game.newloc = game.loc;
-        if (!game.panic)game.clock2 = PANICTIME;
+        if (!game.panic)
+            game.clock2 = PANICTIME;
         game.panic = true;
     }
 
@@ -980,10 +991,11 @@ static bool do_command()
             }
             msg = arbitrary_messages[PITCH_DARK];
         }
-        if (TOTING(BEAR))rspeak(TAME_BEAR);
+        if (TOTING(BEAR))
+            rspeak(TAME_BEAR);
         speak(msg);
         if (FORCED(game.loc)) {
-            if (playermove(command.verb, 1))
+            if (playermove(HERE))
                 return true;
             else
                 continue;	/* back to top of main interpreter loop */
@@ -1117,7 +1129,7 @@ Lookup:
         kmod = MOD(defn, 1000);
         switch (defn / 1000) {
         case 0:
-            if (playermove(command.verb, kmod))
+            if (playermove(kmod))
                 return true;
             else
                 continue;	/* back to top of main interpreter loop */
@@ -1141,7 +1153,7 @@ Laction:
         case GO_TERMINATE:
             return true;
         case GO_MOVE:
-            playermove(command.verb, NUL);
+            playermove(NUL);
             return true;
         case GO_TOP:
             continue;	/* back to top of main interpreter loop */