X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Fmap.c;h=4cce02ae3c5cd08831f96f0d0bb49b5f0224959d;hb=12768befa67d99e25dc67140e0bab13ee7c44ba6;hp=7eececab5a74257d44b98ab3dad31351f3d3b85f;hpb=1cb57a35a3b3cc4ec8870531ca254a655c0bdda2;p=plomrogue
diff --git a/src/server/map.c b/src/server/map.c
index 7eececa..4cce02a 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,16 +1,24 @@
-/* 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, uint16_t, uint32_t, UINT16_MAX */
+#include /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */
#include /* free() */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
-#include "../common/yx_uint8.h" /* struct yx_uint8 */
+#include "../common/yx_uint8.h" /* yx_uint8 */
#include "rrand.h" /* rrand() */
#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);
+
/* 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.
@@ -31,6 +39,40 @@ 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 iter_limit(uint8_t init)
{
static uint32_t i = 0;
@@ -151,19 +193,40 @@ extern void remake_map()
-extern uint8_t is_passable(struct yx_uint8 pos)
+extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
{
- uint8_t passable = 0;
- if (pos.x < world.map.length && pos.y < world.map.length)
+ static int8_t wrap_west_east = 0;
+ static int8_t wrap_north_south = 0;
+ if (!yx)
{
- passable = ('.' == world.map.cells[(pos.y * world.map.length) + pos.x]);
+ wrap_west_east = wrap_north_south = 0;
+ return 0;
}
- return passable;
-}
-
-
-
-extern uint16_t yx_to_map_pos(struct yx_uint8 * yx)
-{
- return (yx->y * world.map.length) + yx->x;
+ 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;
}