X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Fmap.c;h=4cce02ae3c5cd08831f96f0d0bb49b5f0224959d;hb=eec39e9d6f991c90c8555859b5f10eb30c0370c1;hp=bc07c98d54293d3a3f271eca14eb413fdf284cbb;hpb=086dfd6b17d684bc3ac053ed2a4b494844ebd9b4;p=plomrogue
diff --git a/src/server/map.c b/src/server/map.c
index bc07c98..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, (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 */
@@ -193,35 +197,33 @@ extern uint8_t mv_yx_in_dir_legal(char dir, 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
- || 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;
+ 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 (strchr("edc", dir) && yx->x < original.x)
+ if (('e' == dir || 'd' == dir || 'c' == dir) && yx->x < original.x)
{
wrap_west_east++;
}
- else if (strchr("xsw", dir) && yx->x > original.x)
+ else if (('x' == dir || 's' == dir || 'w' == dir) && yx->x > original.x)
{
wrap_west_east--;
}
- if (strchr("we", dir) && yx->y > original.y)
+ if (('w' == dir || 'e' == dir) && yx->y > original.y)
{
wrap_north_south--;
}
- else if (strchr("xc", dir) && yx->y < original.y)
+ else if (('x' == dir || 'c' == dir) && yx->y < original.y)
{
wrap_north_south++;
}
- if ( !((wrap_west_east != 0) + (wrap_north_south != 0))
+ if ( !wrap_west_east && !wrap_north_south
&& yx->x < world.map.length && yx->y < world.map.length)
{
return 1;