X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=d4265f37a6e3ce4daa2881ecf03ff7932d8264b4;hb=bc7f716bd4845e9660d904cad7b9f7d813e22541;hp=ae907d2327363fef50919575440a27a6a094a702;hpb=f6615d3be438bbca4997c38c546c0d8724da80d4;p=plomrogue
diff --git a/src/server/map.c b/src/server/map.c
index ae907d2..d4265f3 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,17 +1,25 @@
/* src/server/map.c */
#include "map.h"
-#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
+#include /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */
#include /* free() */
+#include /* strchr() */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* yx_uint8 */
#include "rrand.h" /* rrand() */
-#include "yx_uint8.h" /* mv_yx_in_dir_wrap() */
#include "world.h" /* global world */
+/* 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.
@@ -32,6 +40,77 @@ static void make_trees();
+static void mv_yx_in_dir(char d, struct yx_uint8 * yx)
+{
+ if (d == 'e')
+ {
+ yx->x = yx->x + (yx->y % 2);
+ yx->y--;
+ }
+ else if (d == 'd')
+ {
+ yx->x++;
+ }
+ else if (d == 'c')
+ {
+ yx->x = yx->x + (yx->y % 2);
+ yx->y++;
+ }
+ else if (d == 'x')
+ {
+ yx->x = yx->x - !(yx->y % 2);
+ yx->y++;
+ }
+ else if (d == 's')
+ {
+ yx->x--;
+ }
+ else if (d == 'w')
+ {
+ yx->x = yx->x - !(yx->y % 2);
+ yx->y--;
+ }
+}
+
+
+
+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;
@@ -154,8 +233,8 @@ 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, 0);
- if (!wraptest && yx->x < world.map.length && yx->y < world.map.length)
+ uint8_t wraptest = mv_yx_in_dir_wrap(dir, yx);
+ if (yx && !wraptest && yx->x < world.map.length && yx->y < world.map.length)
{
return 1;
}