Transformed trouble_msg() into exit_err() wrapper exit_trouble(), eliminating some...

[plomrogue] / src / yx_uint16.c

diff --git a/src/yx_uint16.c b/src/yx_uint16.c
index 8fb41bff04c80493279fc3fb7dd92070090a57b1..e14d16de8b51fd5d57c8cfe1ec52a4f72f7bf173 100644 (file)
--- a/src/yx_uint16.c
+++ b/src/yx_uint16.c
@@ -1,24 +1,38 @@
 /* yx_uint16.c */
 
 #include "yx_uint16.h"
+#include <stdint.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;
+    }
+    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;
 }