X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=0edd955c4265419f7f09d19d14e10c1066384a62;hb=fa079cbd21aacfc0d28a5af98cc3df4a7633f563;hp=2969b6dd4f9d551c40ebd3e7e7879989f0fea635;hpb=e03020342a74aef143b1ec38c18966dac64181b5;p=plomrogue
diff --git a/src/server/map.c b/src/server/map.c
index 2969b6d..0edd955 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -3,7 +3,7 @@
#include "map.h"
#include /* uint8_t, uint16_t, uint32_t */
#include "../common/try_malloc.h" /* try_malloc() */
-#include "../common/yx_uint16.h" /* struct yx_uint16 */
+#include "../common/yx_uint8.h" /* struct yx_uint8 */
#include "rrand.h" /* rrand() */
#include "world.h" /* global world */
@@ -21,13 +21,14 @@ extern void init_map()
x < world.map.size.x;
world.map.cells[(y * world.map.size.x) + x] = '~', x++);
}
- world.map.cells[size / 2 + (world.map.size.x / 2)] = '.';
- uint32_t curpos;
+ 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)
{
y = rrand() % world.map.size.y;
x = rrand() % world.map.size.x;
- curpos = y * world.map.size.x + x;
+ curpos = (y * world.map.size.x) + x;
if ('~' == world.map.cells[curpos]
&& ( ( curpos >= world.map.size.x
&& '.' == world.map.cells[curpos - world.map.size.x])
@@ -39,8 +40,8 @@ extern void init_map()
&& (curpos+1) % world.map.size.x != 0
&& '.' == world.map.cells[curpos+1])))
{
- if ( y == 0 || y == world.map.size.y - 1 || x == 0
- || x == world.map.size.x - 1)
+ if ( y == 0 || y == world.map.size.y - 1
+ || x == 0 || x == world.map.size.x - 1)
{
break;
}
@@ -51,13 +52,12 @@ extern void init_map()
-extern uint8_t is_passable(struct yx_uint16 pos)
+extern uint8_t is_passable(struct yx_uint8 pos)
{
uint8_t passable = 0;
- if ( 0 <= pos.x && pos.x < world.map.size.x
- && 0 <= pos.y && pos.y < world.map.size.y)
+ if (pos.x < world.map.size.x && pos.y < world.map.size.y)
{
- passable = (('.' == world.map.cells[pos.y * world.map.size.x + pos.x]));
+ passable = ('.' == world.map.cells[(pos.y * world.map.size.x) + pos.x]);
}
return passable;
}