X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=30d64a5ddea02da915d6bd733450f60f166e73b9;hb=ca22fd77389df670bc483c43ae03f4d76023816f;hp=4b49fa1b97d6e389787c08f2fc56f5410c1d3dee;hpb=cf0d81ea863df7adb1bdd862708571b0e40a73cb;p=plomrogue

diff --git a/src/server/map.c b/src/server/map.c
index 4b49fa1..30d64a5 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,7 +1,7 @@
 /* src/server/map.c */
 
 #include "map.h"
-#include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, UINT16_MAX */
+#include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */
 #include <stdlib.h> /* free() */
 #include <string.h> /* strchr() */
 #include "../common/rexit.h" /* exit_err() */
@@ -13,7 +13,7 @@
 
 
 /* Helper to mv_yx_in_dir_legal(). Move "yx" into hex direction "d". */
-static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx);
+static void mv_yx_in_dir(char d, struct yx_uint8 * yx);
 
 /* Helper to mv_yx_in_dir_legal(). Move "yx" into hex direction "d", do wrapping
  * logic, return 1 if "yx" ends outside of the original wrap space, else 0.
@@ -40,9 +40,9 @@ static void make_trees();
 
 
 
-static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx)
+static void mv_yx_in_dir(char d, struct yx_uint8 * yx)
 {
-    if     (d == 'e')
+    if      (d == 'e')
     {
         yx->x = yx->x + (yx->y % 2);
         yx->y--;
@@ -78,6 +78,9 @@ static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx)
 {
     static int8_t wrap_west_east   = 0;
     static int8_t wrap_north_south = 0;
+    char * err = "Too much wrapping in mv_yx_in_dir_wrap().";
+    exit_err(   INT8_MIN == wrap_west_east || INT8_MIN == wrap_north_south
+             || INT8_MAX == wrap_west_east || INT8_MAX == wrap_north_south, err);
     if (!yx)
     {
         wrap_west_east = wrap_north_south = 0;
@@ -86,7 +89,7 @@ static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx)
     struct yx_uint8 original;
     original.y = yx->y;
     original.x = yx->x;
-    mv_yx_in_hex_dir(d, yx);
+    mv_yx_in_dir(d, yx);
     if      (strchr("edc", d) && yx->x < original.x)
     {
         wrap_west_east++;