X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fserver%2Fthing_actions.c;h=d12087692514d70569c297a4fee893ae3b2d76ce;hb=6db8d212ad66a7a934a47f319f88d1c811791798;hp=9befd76234bc1efba1f2c9edf0c047d99eb7946c;hpb=bc117a9e8e2d69fcad8c8955ae8237b3476bf67b;p=plomrogue

diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index 9befd76..d120876 100644
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -15,8 +15,8 @@
                      * set_thing_position(), get_thing_type(),
                      * free_things_in_memory()
                      */
-#include "map.h" /* is_passable() */
-#include "yx_uint8.h" /* mv_yx_in_dir(), yx_uint8_cmp() */
+#include "map.h" /* mv_yx_in_dir_legal(), is_passable() */
+#include "yx_uint8.h" /* mv_yx_in_dir_wrap(), yx_uint8_cmp() */
 #include "world.h" /* global world */
 
 
@@ -259,21 +259,26 @@ extern void actor_wait(struct Thing * t)
 extern void actor_move(struct Thing * t)
 {
     char d = t->arg;
-    struct yx_uint8 target = mv_yx_in_dir(d, t->pos);
     struct Thing * other_t;
-    for (other_t = world.things; other_t != 0; other_t = other_t->next)
+    struct yx_uint8 target = t->pos;
+    uint8_t legal_move = mv_yx_in_dir_legal(d, &target);
+    mv_yx_in_dir_wrap(0, NULL, 1);
+    if (legal_move)
     {
-        if (0 == other_t->lifepoints || other_t == t)
+        for (other_t = world.things; other_t != 0; other_t = other_t->next)
         {
-            continue;
-        }
-        if (yx_uint8_cmp(&target, &other_t->pos))
-        {
-            actor_hits_actor(t, other_t);
-            return;
+            if (0 == other_t->lifepoints || other_t == t)
+            {
+                continue;
+            }
+            if (yx_uint8_cmp(&target, &other_t->pos))
+            {
+                actor_hits_actor(t, other_t);
+               return;
+            }
         }
     }
-    uint8_t passable = is_passable(target);
+    uint8_t passable = legal_move && is_passable(target);
     if (passable)
     {
         set_thing_position(t, target);