home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor atomic writing to atomic_write_start() + atomic_write_finish().
[plomrogue]
/
src
/
server
/
map.c
diff --git
a/src/server/map.c
b/src/server/map.c
index 36c446580205e67041237c3e950c8441d62b6ac4..059a7133134cea14f0c4343241f05fba373daf84 100644
(file)
--- a/
src/server/map.c
+++ b/
src/server/map.c
@@
-2,6
+2,7
@@
#include "map.h"
#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
#include "map.h"
#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
+#include <stdlib.h> /* free() */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* struct yx_uint8 */
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* struct yx_uint8 */
@@
-50,20
+51,20
@@
static uint8_t is_neighbor(struct yx_uint8 pos, char type)
{
uint8_t ind = pos.y % 2;
uint8_t diag_west = pos.x + ind > 0;
{
uint8_t ind = pos.y % 2;
uint8_t diag_west = pos.x + ind > 0;
- uint8_t diag_east = pos.x + ind <= world.map.
size.x
- 1;
- uint16_t pos_i = (pos.y * world.map.
size.x
) + pos.x;
+ uint8_t diag_east = pos.x + ind <= world.map.
length
- 1;
+ uint16_t pos_i = (pos.y * world.map.
length
) + pos.x;
if ( ( pos.y > 0 && diag_east
if ( ( pos.y > 0 && diag_east
- && type == world.map.cells[pos_i - world.map.
size.x
+ ind])
- || ( pos.x < world.map.
size.x
- 1
+ && type == world.map.cells[pos_i - world.map.
length
+ ind])
+ || ( pos.x < world.map.
length
- 1
&& type == world.map.cells[pos_i + 1])
&& type == world.map.cells[pos_i + 1])
- || ( pos.y < world.map.
size.y
- 1 && diag_east
- && type == world.map.cells[pos_i + world.map.
size.x
+ ind])
+ || ( pos.y < world.map.
length
- 1 && diag_east
+ && type == world.map.cells[pos_i + world.map.
length
+ ind])
|| ( pos.y > 0 && diag_west
|| ( pos.y > 0 && diag_west
- && type == world.map.cells[pos_i - world.map.
size.x
- !ind])
+ && type == world.map.cells[pos_i - world.map.
length
- !ind])
|| ( pos.x > 0
&& type == world.map.cells[pos_i - 1])
|| ( pos.x > 0
&& type == world.map.cells[pos_i - 1])
- || ( pos.y < world.map.
size.y
- 1 && diag_west
- && type == world.map.cells[pos_i + world.map.
size.x
- !ind]))
+ || ( pos.y < world.map.
length
- 1 && diag_west
+ && type == world.map.cells[pos_i + world.map.
length
- !ind]))
{
return 1;
}
{
return 1;
}
@@
-75,11
+76,11
@@
static uint8_t is_neighbor(struct yx_uint8 pos, char type)
static void make_sea()
{
uint16_t y, x;
static void make_sea()
{
uint16_t y, x;
- for (y = 0; y < world.map.
size.y
; y++)
+ for (y = 0; y < world.map.
length
; y++)
{
for (x = 0;
{
for (x = 0;
- x < world.map.
size.x
;
- world.map.cells[(y * world.map.
size.x
) + x] = '~', x++);
+ x < world.map.
length
;
+ world.map.cells[(y * world.map.
length
) + x] = '~', x++);
}
}
}
}
@@
-88,20
+89,20
@@
static void make_sea()
static void make_island()
{
char type = '.';
static void make_island()
{
char type = '.';
- uint8_t add_half_width = !(world.map.
size.y % 2) * (world.map.size.x
/ 2);
- uint32_t size = world.map.
size.x * world.map.size.y
;
+ uint8_t add_half_width = !(world.map.
length % 2) * (world.map.length
/ 2);
+ uint32_t size = world.map.
length * world.map.length
;
world.map.cells[(size / 2) + add_half_width] = type;
struct yx_uint8 pos;
iter_limit(1);
while (iter_limit(0))
{
world.map.cells[(size / 2) + add_half_width] = type;
struct yx_uint8 pos;
iter_limit(1);
while (iter_limit(0))
{
- pos.y = rrand() % world.map.
size.y
;
- pos.x = rrand() % world.map.
size.x
;
- uint16_t pos_i = (pos.y * world.map.
size.x
) + pos.x;
+ pos.y = rrand() % world.map.
length
;
+ pos.x = rrand() % world.map.
length
;
+ uint16_t pos_i = (pos.y * world.map.
length
) + pos.x;
if ('~' == world.map.cells[pos_i] && is_neighbor(pos, type))
{
if ('~' == world.map.cells[pos_i] && is_neighbor(pos, type))
{
- if ( pos.y == 0 || pos.y == world.map.
size.y
- 1
- || pos.x == 0 || pos.x == world.map.
size.x
- 1)
+ if ( pos.y == 0 || pos.y == world.map.
length
- 1
+ || pos.x == 0 || pos.x == world.map.
length
- 1)
{
break;
}
{
break;
}
@@
-116,15
+117,15
@@
static void make_trees()
{
char type = 'X';
struct yx_uint8 pos;
{
char type = 'X';
struct yx_uint8 pos;
- uint16_t n_trees = (world.map.
size.x * world.map.size.y
) / 16;
+ uint16_t n_trees = (world.map.
length * world.map.length
) / 16;
uint16_t i_trees = 0;
iter_limit(1);
while (i_trees <= n_trees && iter_limit(0))
{
uint8_t single_allowed = rrand() % 32;
uint16_t i_trees = 0;
iter_limit(1);
while (i_trees <= n_trees && iter_limit(0))
{
uint8_t single_allowed = rrand() % 32;
- pos.y = rrand() % world.map.
size.y
;
- pos.x = rrand() % world.map.
size.x
;
- uint16_t pos_i = (pos.y * world.map.
size.x
) + pos.x;
+ pos.y = rrand() % world.map.
length
;
+ pos.x = rrand() % world.map.
length
;
+ uint16_t pos_i = (pos.y * world.map.
length
) + pos.x;
if ('.' == world.map.cells[pos_i]
&& (!single_allowed || is_neighbor(pos, type)))
{
if ('.' == world.map.cells[pos_i]
&& (!single_allowed || is_neighbor(pos, type)))
{
@@
-136,13
+137,17
@@
static void make_trees()
-extern void
init
_map()
+extern void
remake
_map()
{
char * f_name = "init_map()";
{
char * f_name = "init_map()";
- world.map.cells = try_malloc(world.map.size.x * world.map.size.y, f_name);
+ free(world.map.cells);
+ world.map.cells = try_malloc(world.map.length * world.map.length, f_name);
+ uint32_t store_seed = world.seed;
+ world.seed = world.seed_map;
make_sea();
make_island();
make_trees();
make_sea();
make_island();
make_trees();
+ world.seed = store_seed;
}
}
@@
-150,9
+155,16
@@
extern void init_map()
extern uint8_t is_passable(struct yx_uint8 pos)
{
uint8_t passable = 0;
extern uint8_t is_passable(struct yx_uint8 pos)
{
uint8_t passable = 0;
- if (pos.x < world.map.
size.x && pos.y < world.map.size.y
)
+ if (pos.x < world.map.
length && pos.y < world.map.length
)
{
{
- passable = ('.' == world.map.cells[(pos.y * world.map.
size.x
) + pos.x]);
+ passable = ('.' == world.map.cells[(pos.y * world.map.
length
) + pos.x]);
}
return passable;
}
}
return passable;
}
+
+
+
+extern uint16_t yx_to_map_pos(struct yx_uint8 * yx)
+{
+ return (yx->y * world.map.length) + yx->x;
+}