Server: Remove unneeded yx_uint8_cmp() function.

diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index 9f1f5726a3d2f82c33539800b155decacaab6d07..627235c7b04728adc0b47ea90ec9c9ade9da26ec 100644 (file)
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -16,7 +16,7 @@
                      * 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 "yx_uint8.h" /* mv_yx_in_dir_wrap() */
 #include "world.h" /* global world */
 
 
@@ -271,9 +271,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 +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;
         }

diff --git a/src/server/things.c b/src/server/things.c
index ebecf6d59e1cb0c5d93ad31b8f16508b413c8256..804f5231d15489aa5f096c32cf0ae67f88f0354c 100644 (file)
--- a/src/server/things.c
+++ b/src/server/things.c
@@ -14,7 +14,6 @@
 #include "rrand.h" /* rrand() */
 #include "thing_actions.h" /* actor_wait */
 #include "world.h" /* world */
-#include "yx_uint8.h" /* yx_uint8_cmp() */
 
 
 
@@ -280,7 +279,7 @@ extern void add_things(uint8_t type, uint8_t n)
             uint8_t clear = 1;
             for (t = world.things; t; t = t->next)
             {
-                if (yx_uint8_cmp(&pos, &t->pos) && 0 != t->lifepoints)
+                if (0 != t->lifepoints && pos.y==t->pos.y && pos.x==t->pos.x)
                 {
                     clear = 0;
                     break;

diff --git a/src/server/yx_uint8.c b/src/server/yx_uint8.c
index c6a816dbc31ed355c4dc4906b4752c52ed6a6b72..18355a21af5bb3cfdad4c3be432179c11e1461fa 100644 (file)
--- a/src/server/yx_uint8.c
+++ b/src/server/yx_uint8.c
@@ -46,17 +46,6 @@ static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx)
 
 
 
-extern uint8_t yx_uint8_cmp(struct yx_uint8 * a, struct yx_uint8 * b)
-{
-    if (a->y == b->y && a->x == b->x)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-
-
 extern uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx, uint8_t unwrap)
 {
     static int8_t wrap_west_east   = 0;

diff --git a/src/server/yx_uint8.h b/src/server/yx_uint8.h
index 62cc9ce1f9c74fb07eb8df071039bbe8e1299e32..4763f55a7247fd7c6a74dc918cf0e6809aad3142 100644 (file)
--- a/src/server/yx_uint8.h
+++ b/src/server/yx_uint8.h
@@ -11,9 +11,6 @@
 
 
 
-/* Return 1 if two yx_uint8 coordinates at "a" and "b" are equal, else 0. */
-extern uint8_t yx_uint8_cmp(struct yx_uint8 * a, struct yx_uint8 * b);
-
 /* Move "yx" into hex direction "d". If this moves "yx" beyond the minimal (0)
  * or maximal (UINT8_MAX) column or row, it wraps to the opposite side. Such
  * wrapping is returned as a wraps enum value and stored, so that further calls