Server: In actor_move() avoid illegal world.map.cells access.

[plomrogue] / src / server / thing_actions.c

diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index df516e45864f2c076b4fd162eec2f96400f1713d..638bbd3ad35763ed278db26b8f08b6d056bf3b96 100644 (file)
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -16,7 +16,6 @@
                      * free_things_in_memory()
                      */
 #include "map.h" /* mv_yx_in_dir_legal() */
-#include "yx_uint8.h" /* mv_yx_in_dir_wrap() */
 #include "world.h" /* global world */
 
 
@@ -262,9 +261,11 @@ extern void actor_move(struct Thing * t)
     struct Thing * other_t;
     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);
+    mv_yx_in_dir_legal(0, NULL);
+    uint8_t passable = 0;
     if (legal_move)
     {
+        passable = '.' == world.map.cells[target.y*world.map.length + target.x];
         for (other_t = world.things; other_t != 0; other_t = other_t->next)
         {
             if (0 == other_t->lifepoints || other_t == t)
@@ -278,8 +279,6 @@ extern void actor_move(struct Thing * t)
             }
         }
     }
-    char target_cell = world.map.cells[target.y * world.map.length + target.x];
-    uint8_t passable = legal_move && '.' == target_cell;
     if (passable)
     {
         set_thing_position(t, target);