X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fmap.c;h=4cce02ae3c5cd08831f96f0d0bb49b5f0224959d;hb=eec39e9d6f991c90c8555859b5f10eb30c0370c1;hp=4b49fa1b97d6e389787c08f2fc56f5410c1d3dee;hpb=cf0d81ea863df7adb1bdd862708571b0e40a73cb;p=plomrogue
diff --git a/src/server/map.c b/src/server/map.c
index 4b49fa1..4cce02a 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,9 +1,13 @@
-/* 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 /* uint8_t, int8_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 */
@@ -13,12 +17,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 +39,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 +73,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 +195,36 @@ 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;
}