X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=0edd955c4265419f7f09d19d14e10c1066384a62;hb=1a8b80508bc0bc6d9e9d3f8c48a8c7c40675c61f;hp=29beb1a03d5d0a6ebf1113d6ead1cd34763f2573;hpb=f9c94db47aa883149aa762fa128ac1ff1b3f92e1;p=plomrogue
diff --git a/src/server/map.c b/src/server/map.c
index 29beb1a..0edd955 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,7 +1,7 @@
/* src/server/map.c */
#include "map.h"
-#include /* uint8_t, uint16_t */
+#include /* uint8_t, uint16_t, uint32_t */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* struct yx_uint8 */
#include "rrand.h" /* rrand() */
@@ -12,22 +12,23 @@
extern void init_map()
{
char * f_name = "init_map()";
- uint16_t size = world.map.size.x * world.map.size.y;
+ uint32_t size = world.map.size.x * world.map.size.y;
world.map.cells = try_malloc(size, f_name);
- uint8_t y, x;
+ uint16_t y, x;
for (y = 0; y < world.map.size.y; y++)
{
for (x = 0;
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)] = '.';
+ 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;
}
@@ -54,10 +55,9 @@ extern void init_map()
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;
}