X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fyx_uint16.h;h=f6f90a372dca46c8af4b63a17dcd1e4e3f37bcb6;hb=67bcb0339e09a67fe1685cf81e35ccac18eba0c5;hp=eb951a7fd895d959046d3e5078a1ddaed71e74ac;hpb=35cdeffc062d3d87f1526bbff10c401b56b1345a;p=plomrogue

diff --git a/src/yx_uint16.h b/src/yx_uint16.h
index eb951a7..f6f90a3 100644
--- a/src/yx_uint16.h
+++ b/src/yx_uint16.h
@@ -1,13 +1,15 @@
-/*  yx_uint16.h
+/* yx_uint16.h
  *
- *  Structs and routines for coordinates and movement in 2-dimensional space
- *  (such as the ncurses screen and game maps).
+ * Structs and routines for coordinates and movement in 2-dimensional space
+ * (such as the ncurses screen and game maps).
  */
 
 #ifndef YX_UINT16_H
 #define YX_UINT16_H
 
-#include <stdint.h>
+#include <stdint.h> /* for uint8_t, uint16_t */
+
+
 
 /* Coordinates for maps of max. 65536x65536 cells. */
 struct yx_uint16
@@ -16,20 +18,17 @@ struct yx_uint16
     uint16_t x;
 };
 
-/* This encodes directions. */
 
-enum dir
-{
-    NORTH = 1,
-    EAST  = 2,
-    SOUTH = 3,
-    WEST  = 4
-};
 
-/* Return 1 if two yx_uint16 coordinates a and b are equal, else 0. */
-extern char yx_uint16_cmp(struct yx_uint16 a, struct yx_uint16 b);
+/* Return 1 if two yx_uint16 coordinates at "a" and "b" are equal, else 0. */
+extern uint8_t yx_uint16_cmp(struct yx_uint16 * a, struct yx_uint16 * b);
+
+/* Return yx_uint16 coordinate one step from "yx" in direction "dir" (east: 'E',
+ * west: 'W', north: 'N', south: 'S'). If "dir" is invalid or would wrap the
+ * move around the edge of a 2^16x2^16 cells field, "yx" remains unchanged.
+ */
+extern struct yx_uint16 mv_yx_in_dir(char dir, struct yx_uint16 yx);
+
 
-/* Return yx_uint16 coordinate one step from coordinate yx in direction dir. */
-extern struct yx_uint16 mv_yx_in_dir(enum dir d, struct yx_uint16 yx);
 
 #endif