Server: Remove unneeded library includes.

[plomrogue] / src / server / thing_actions.c

diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index d12087692514d70569c297a4fee893ae3b2d76ce..df516e45864f2c076b4fd162eec2f96400f1713d 100644 (file)
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -8,15 +8,15 @@
 #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(),
                      * set_thing_position(), get_thing_type(),
                      * free_things_in_memory()
                      */
-#include "map.h" /* mv_yx_in_dir_legal(), is_passable() */
-#include "yx_uint8.h" /* mv_yx_in_dir_wrap(), yx_uint8_cmp() */
+#include "map.h" /* mv_yx_in_dir_legal() */
+#include "yx_uint8.h" /* mv_yx_in_dir_wrap() */
 #include "world.h" /* global world */
 
 
@@ -271,14 +271,15 @@ extern void actor_move(struct Thing * t)
             {
                 continue;
             }
-            if (yx_uint8_cmp(&target, &other_t->pos))
+            if (target.y == other_t->pos.y && target.x == other_t->pos.x)
             {
-                actor_hits_actor(t, other_t);
+               actor_hits_actor(t, other_t);
                return;
             }
         }
     }
-    uint8_t passable = legal_move && is_passable(target);
+    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);
@@ -317,7 +318,7 @@ extern void actor_pick(struct Thing * t)
     struct Thing * t_i;
     for (t_i = world.things; t_i; t_i = t_i->next)
     {
-        if (t_i != t && yx_uint8_cmp(&t_i->pos, &t->pos))
+        if (t_i != t && t_i->pos.y == t->pos.y && t_i->pos.x == t->pos.x)
         {
             picked = t_i;
         }