Server: Minor refactoring.

[plomrogue] / src / server / map.c

diff --git a/src/server/map.c b/src/server/map.c
index 4b49fa1b97d6e389787c08f2fc56f5410c1d3dee..bc07c98d54293d3a3f271eca14eb413fdf284cbb 100644 (file)
--- 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,12 +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);
-
-/* 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.
- */
-static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx);
+static void mv_yx_in_dir(char d, struct yx_uint8 * yx);
 
 /* Call this too often with "init" of 0 and the game exits with an error message
  * about reaching an iteration limit. An "init" of 1 sets the iteration counter
@@ -40,9 +35,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--;
@@ -74,40 +69,6 @@ static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx)
 
 
 
-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;
-    if (!yx)
-    {
-        wrap_west_east = wrap_north_south = 0;
-        return 0;
-    }
-    struct yx_uint8 original;
-    original.y = yx->y;
-    original.x = yx->x;
-    mv_yx_in_hex_dir(d, yx);
-    if      (strchr("edc", d) && yx->x < original.x)
-    {
-        wrap_west_east++;
-    }
-    else if (strchr("xsw", d) && yx->x > original.x)
-    {
-        wrap_west_east--;
-    }
-    if      (strchr("we", d) && yx->y > original.y)
-    {
-        wrap_north_south--;
-    }
-    else if (strchr("xc", d) && yx->y < original.y)
-    {
-        wrap_north_south++;
-    }
-    return (wrap_west_east != 0) + (wrap_north_south != 0);
-}
-
-
-
 static uint8_t iter_limit(uint8_t init)
 {
     static uint32_t i = 0;
@@ -230,8 +191,38 @@ extern void remake_map()
 
 extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
 {
-    uint8_t wraptest = mv_yx_in_dir_wrap(dir, yx);
-    if (yx && !wraptest && yx->x < world.map.length && yx->y < world.map.length)
+    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;
+        return 0;
+    }
+    struct yx_uint8 original;
+    original.y = yx->y;
+    original.x = yx->x;
+    mv_yx_in_dir(dir, yx);
+    if      (strchr("edc", dir) && yx->x < original.x)
+    {
+        wrap_west_east++;
+    }
+    else if (strchr("xsw", dir) && yx->x > original.x)
+    {
+        wrap_west_east--;
+    }
+    if      (strchr("we", dir) && yx->y > original.y)
+    {
+        wrap_north_south--;
+    }
+    else if (strchr("xc", dir) && yx->y < original.y)
+    {
+        wrap_north_south++;
+    }
+    if (   !((wrap_west_east != 0) + (wrap_north_south != 0))
+        && yx->x < world.map.length && yx->y < world.map.length)
     {
         return 1;
     }