X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fserver%2Fthing_actions.c;h=42b77dcabdedf1e4f0905e8304411fe40d78882b;hb=632b6d3e471fcdebbbf0d753a9ae3080b432e626;hp=627235c7b04728adc0b47ea90ec9c9ade9da26ec;hpb=9f1f36adb18c45b1b834162b0f23b2847627e538;p=plomrogue

diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index 627235c..42b77dc 100644
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -1,4 +1,9 @@
-/* src/server/thing_actions.c */
+/* src/server/thing_actions.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #include "thing_actions.h"
 #include <stddef.h> /* NULL */
@@ -8,7 +13,7 @@
 #include <string.h> /* strlen(), memcpy(), strncmp() */
 #include "../common/rexit.h" /* exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
-#include "../common/yx_uint8.h" /* struct yx_uint8 */
+#include "../common/yx_uint8.h" /* yx_uint8 */
 #include "field_of_view.h" /* build_fov_map() */
 #include "hardcoded_strings.h" /* s */
 #include "things.h" /* Thing, ThingType, get_player(), own_thing(),
@@ -16,7 +21,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 +266,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 +284,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);