X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmap.c;h=94def7631c69527f0163847db13027eef0f54e84;hb=550d22ec0c3f530f5d317746f3f7e75251a1de4b;hp=a9750434281c32d97ac2679b6ba074747ae7b631;hpb=111279ad59a25bc548c47d38c1a52c3036eff87a;p=plomrogue diff --git a/src/map.c b/src/map.c index a975043..94def76 100644 --- a/src/map.c +++ b/src/map.c @@ -1,22 +1,23 @@ #include "map.h" -#include /* for malloc() */ #include /* for uint16_t, uint32_t */ -#include "misc.h" /* for center_offset() */ +#include "misc.h" /* for try_malloc(), center_offset() */ #include "map_objects.h" /* for Player struct */ #include "yx_uint16.h" /* for yx_uint16 and dir enums */ #include "rrand.h" /* for rrand() */ +struct World; -struct Map init_map () +struct Map init_map(struct World * world) { + char * f_name = "init_map()"; struct Map map; map.size.x = 64; map.size.y = 64; map.offset.x = 0; map.offset.y = 0; uint32_t size = map.size.x * map.size.y; - map.cells = malloc(size); + map.cells = try_malloc(size, world, f_name); uint16_t y, x; for (y = 0; y < map.size.y; y++) {