X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=3a5a0a213d1c6f8f644739f1410a0778bb66a9fa;hb=d87585beaacf5ad82f661cc577d3dfbeedfde398;hp=d4265f37a6e3ce4daa2881ecf03ff7932d8264b4;hpb=bc7f716bd4845e9660d904cad7b9f7d813e22541;p=plomrogue

diff --git a/src/server/map.c b/src/server/map.c
index d4265f3..3a5a0a2 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,9 +1,14 @@
-/* src/server/map.c */
+/* src/server/map.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #include "map.h"
 #include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */
 #include <stdlib.h> /* free() */
-#include <string.h> /* strchr() */
+#include <string.h> /* memset() */
 #include "../common/rexit.h" /* exit_err() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "../common/yx_uint8.h" /* yx_uint8 */
@@ -15,11 +20,6 @@
 /* Helper to mv_yx_in_dir_legal(). Move "yx" into hex direction "d". */
 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.
- */
-static uint8_t mv_yx_in_dir_wrap(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
  * to 0. Iteration limit is currently 256 * UINT16_MAX.
@@ -74,43 +74,6 @@ static void mv_yx_in_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;
-    char * err = "Too much wrapping in mv_yx_in_dir_wrap().";
-    exit_err(INT8_MIN == wrap_west_east || INT8_MIN == wrap_north_south, err);
-    exit_err(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(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;
@@ -233,10 +196,46 @@ 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;
+    if (!yx)
+    {
+        wrap_west_east = wrap_north_south = 0;
+        return 0;
+    }
+    char * err = "Too much wrapping in mv_yx_in_dir_legal().";
+    exit_err(   INT8_MIN == wrap_west_east || INT8_MIN == wrap_north_south
+             || INT8_MAX == wrap_west_east || INT8_MAX == wrap_north_south,err);
+    struct yx_uint8 original = *yx;
+    mv_yx_in_dir(dir, yx);
+    if      (('e' == dir || 'd' == dir || 'c' == dir) && yx->x < original.x)
+    {
+        wrap_west_east++;
+    }
+    else if (('x' == dir || 's' == dir || 'w' == dir) && yx->x > original.x)
+    {
+        wrap_west_east--;
+    }
+    if      (('w' == dir || 'e' == dir)               && yx->y > original.y)
+    {
+        wrap_north_south--;
+    }
+    else if (('x' == dir || 'c' == dir)               && yx->y < original.y)
+    {
+        wrap_north_south++;
+    }
+    if (   !wrap_west_east && !wrap_north_south
+        && yx->x < world.map.length && yx->y < world.map.length)
     {
         return 1;
     }
     return 0;
 }
+
+
+
+extern void init_empty_map(char ** map)
+{
+    *map = try_malloc(world.map.length * world.map.length, __func__);
+    memset(*map, ' ', world.map.length * world.map.length);
+}