home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server: Fix buggy handling of ID sizes in TT_ID/TA_ID/T_ID commands.
[plomrogue]
/
src
/
server
/
map.c
diff --git
a/src/server/map.c
b/src/server/map.c
index 059a7133134cea14f0c4343241f05fba373daf84..8ed37d9b50cbd017baf0cb2c0464e5e547aebeab 100644
(file)
--- a/
src/server/map.c
+++ b/
src/server/map.c
@@
-139,9
+139,8
@@
static void make_trees()
extern void remake_map()
{
extern void remake_map()
{
- char * f_name = "init_map()";
free(world.map.cells);
free(world.map.cells);
- world.map.cells = try_malloc(world.map.length * world.map.length,
f_name
);
+ world.map.cells = try_malloc(world.map.length * world.map.length,
__func__
);
uint32_t store_seed = world.seed;
world.seed = world.seed_map;
make_sea();
uint32_t store_seed = world.seed;
world.seed = world.seed_map;
make_sea();
@@
-161,10
+160,3
@@
extern uint8_t is_passable(struct yx_uint8 pos)
}
return passable;
}
}
return passable;
}
-
-
-
-extern uint16_t yx_to_map_pos(struct yx_uint8 * yx)
-{
- return (yx->y * world.map.length) + yx->x;
-}