X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=95d7e0ff4e96f875e17845e8a608c60a05307fbd;hb=fcfa6591e6b043e05c3e34a70db1b4d06d54096f;hp=0edd955c4265419f7f09d19d14e10c1066384a62;hpb=e23ea3a560a432304851b6bcd7781f18181873e6;p=plomrogue diff --git a/src/server/map.c b/src/server/map.c index 0edd955..95d7e0f 100644 --- a/src/server/map.c +++ b/src/server/map.c @@ -1,7 +1,8 @@ /* src/server/map.c */ #include "map.h" -#include /* uint8_t, uint16_t, uint32_t */ +#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */ +#include "../common/rexit.h" /* exit_err() */ #include "../common/try_malloc.h" /* try_malloc() */ #include "../common/yx_uint8.h" /* struct yx_uint8 */ #include "rrand.h" /* rrand() */ @@ -24,7 +25,9 @@ extern void init_map() uint8_t add_half_width = !(world.map.size.y % 2) * (world.map.size.x / 2); world.map.cells[(size / 2) + add_half_width] = '.'; uint16_t curpos; - while (1) + char * err = "Map generation reached iteration limit. Change map size?"; + uint32_t i; + for (i = 0; ; i++, exit_err(256 * UINT16_MAX == i, err)) { y = rrand() % world.map.size.y; x = rrand() % world.map.size.x;