Server: Refactor, remove yx_uint8 module.

[plomrogue] / src / server / thing_actions.c

diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index 9f1f5726a3d2f82c33539800b155decacaab6d07..6f7254490c9819f37a009e5458649956140d8294 100644 (file)
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -8,7 +8,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 +16,6 @@
                      * free_things_in_memory()
                      */
 #include "map.h" /* mv_yx_in_dir_legal() */
-#include "yx_uint8.h" /* mv_yx_in_dir_wrap(), yx_uint8_cmp() */
 #include "world.h" /* global world */
 
 
@@ -262,7 +261,7 @@ 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);
     if (legal_move)
     {
         for (other_t = world.things; other_t != 0; other_t = other_t->next)
@@ -271,9 +270,9 @@ 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;
             }
         }
@@ -318,7 +317,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;
         }