Each map object action now take different numbers of turns to complete. Re-wrote...

[plomrogue] / src / yx_uint16.c

diff --git a/src/yx_uint16.c b/src/yx_uint16.c
index 2d7503ba904381c87136e1df8b3f288fdf0e622b..6adc034aecc2840f237bf0830de5a40c45a29b8c 100644 (file)
--- a/src/yx_uint16.c
+++ b/src/yx_uint16.c
@@ -2,29 +2,41 @@
 
 
 
-#include "yx_uint16.h" /* for uint16_t */
+#include "yx_uint16.h" /* for uint8_t, uint16_t */
 
 
 
-extern char yx_uint16_cmp(struct yx_uint16 a, struct yx_uint16 b)
+extern uint8_t yx_uint16_cmp(struct yx_uint16 * a, struct yx_uint16 * b)
 {
-    if (a.y == b.y && a.x == b.x)
+    if (a->y == b->y && a->x == b->x)
+    {
         return 1;
+    }
     else
+    {
         return 0;
+    }
 }
 
 
 
-extern struct yx_uint16 mv_yx_in_dir(enum dir d, struct yx_uint16 yx)
+extern struct yx_uint16 mv_yx_in_dir(char d, struct yx_uint16 yx)
 {
-    if      (d == NORTH)
+    if      (d == 'N')
+    {
         yx.y--;
-    else if (d == EAST)
+    }
+    else if (d == 'E')
+    {
         yx.x++;
-    else if (d == SOUTH)
+    }
+    else if (d == 'S')
+    {
         yx.y++;
-    else if (d == WEST)
+    }
+    else if (d == 'W')
+    {
         yx.x--;
+    }
     return yx;
 }