X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmap_objects.c;h=8d08ae04db1832e3222799df73278984aff731fb;hb=550d22ec0c3f530f5d317746f3f7e75251a1de4b;hp=4cd6cb0d8cae2a682196861a18e8a3292d3cd615;hpb=c1a7e6cdb13cd7d883424afdf0fe08e9a10fbc28;p=plomrogue diff --git a/src/map_objects.c b/src/map_objects.c index 4cd6cb0..8d08ae0 100644 --- a/src/map_objects.c +++ b/src/map_objects.c @@ -1,20 +1,24 @@ /* map_objects.c */ #include "map_objects.h" -#include /* for malloc(), calloc(), free(), atoi() */ +#include /* for free(), atoi() */ #include /* for uint8_t */ #include /* for FILE typedef */ #include /* for strchr(), strlen(), memcpy(), strtok() */ -#include "readwrite.h" /* for [read/write]_uint[8/16/23][_bigendian]() */ -#include "misc.h" /* for textfile_sizes(), find_passable_pos() */ +#include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose() + * [read/write]_uint[8/16/23][_bigendian]() + */ +#include "misc.h" /* for try_malloc(), try_calloc(), find_passable_pos() */ #include "main.h" /* for World struct */ +#include "rexit.h" /* for err_exit() */ /* Return pointer to newly allocated map object struct of size "size". If first * in map object chain ("first" pointing to !0), point "start" to it. */ -static struct MapObj * get_next_map_obj(void * start, char * first, +static struct MapObj * get_next_map_obj(struct World * world, + void * start, char * first, size_t size, struct MapObj * map_obj); @@ -29,19 +33,21 @@ static uint8_t read_map_objects_monsterdata( void * start, FILE * file); -static struct MapObj * get_next_map_obj(void * start, char * first, +static struct MapObj * get_next_map_obj(struct World * world, + void * start, char * first, size_t size, struct MapObj * map_obj) { + char * f_name = "get_next_map_obj()"; if (* first) { struct MapObj * * z = start; - map_obj = malloc(size); + map_obj = try_malloc(size, world, f_name); * z = map_obj; * first = 0; } else { - map_obj->next = malloc(size); + map_obj->next = try_malloc(size, world, f_name); map_obj = map_obj->next; } return map_obj; @@ -87,20 +93,20 @@ static uint8_t read_map_objects_monsterdata (void * start, FILE * file) extern void init_map_object_defs(struct World * world, char * filename) { - world->item_def = 0; - world->monster_def = 0; - FILE * file = fopen(filename, "r"); - uint16_t linemax; - textfile_sizes (file, &linemax, NULL); + char * f_name = "init_map_object_defs()"; + FILE * file = try_fopen(filename, "r", world, f_name); + uint16_t linemax = get_linemax(file, world, f_name); struct MapObjDef mod; struct ItemDef id; struct MonsterDef md; + world->item_def = 0; + world->monster_def = 0; struct ItemDef * * p_p_id = &world->item_def; struct MonsterDef * * p_p_md = &world->monster_def; - char * defline = malloc(linemax); + char defline[linemax + 1]; char * line_p; char * delim = " "; - while (fgets(defline, linemax, file)) + while (fgets(defline, linemax + 1, file)) { mod.next = 0; mod.id = atoi(strtok(defline, delim)); @@ -116,25 +122,24 @@ extern void init_map_object_defs(struct World * world, char * filename) md.hitpoints_start = atoi(strtok(NULL, delim)); line_p = strtok(NULL, delim); } - mod.desc = calloc(strlen(line_p), sizeof(char)); + mod.desc = try_calloc(strlen(line_p), sizeof(char), world, f_name); memcpy(mod.desc, line_p, strlen(line_p) - 1); if ('i' == mod.m_or_i) { id.map_obj_def = mod; - * p_p_id = malloc(sizeof(struct ItemDef)); + * p_p_id = try_malloc(sizeof(struct ItemDef), world, f_name); * * p_p_id = id; p_p_id = (struct ItemDef * *) * p_p_id; } else { md.map_obj_def = mod; - * p_p_md = malloc(sizeof(struct MonsterDef)); + * p_p_md = try_malloc(sizeof(struct MonsterDef), world, f_name); * * p_p_md = md; p_p_md = (struct MonsterDef * *) * p_p_md; } } - free(defline); - fclose(file); + try_fclose(file, world, f_name); } @@ -193,6 +198,7 @@ extern uint8_t write_map_objects(struct World * world, void * start, extern uint8_t read_map_objects(struct World * world, void * start, FILE * file) { + char * err = "Trouble in read_map_objects() with get_next_map_obj()."; struct MapObj * map_obj; struct MapObjDef * mod; size_t size; @@ -225,7 +231,8 @@ extern uint8_t read_map_objects(struct World * world, void * start, FILE * file) { size = sizeof(struct Item); } - map_obj = get_next_map_obj(start, &first, size, map_obj); + map_obj = get_next_map_obj(world, start, &first, size, map_obj); + exit_err(NULL == map_obj, world, err); map_obj->type = type; if ( read_uint16_bigendian(file, &map_obj->pos.y) || read_uint16_bigendian(file, &map_obj->pos.x)) @@ -254,6 +261,7 @@ extern uint8_t read_map_objects(struct World * world, void * start, FILE * file) extern void * build_map_objects(struct World * world, void * start, char def_id, uint8_t n) { + char * err = "Trouble in build_map_objects() with get_next_map_obj()."; uint8_t i; struct MapObj * mo; char first = 1; @@ -269,7 +277,8 @@ extern void * build_map_objects(struct World * world, void * start, char def_id, } for (i = 0; i < n; i++) { - mo = get_next_map_obj(start, &first, size, mo); + mo = get_next_map_obj(world, start, &first, size, mo); + exit_err(NULL == mo, world, err); mo->pos = find_passable_pos(world->map); if ('i' == mod->m_or_i) { @@ -290,7 +299,31 @@ extern void * build_map_objects(struct World * world, void * start, char def_id, -extern struct MapObjDef * get_map_obj_def (struct World * world, char def_id) +extern void free_items(struct Item * item) +{ + if (0 == item) + { + return; + } + free_items((struct Item *) item->map_obj.next); + free(item); +} + + + +extern void free_monsters(struct Monster * monster) +{ + if (0 == monster) + { + return; + } + free_monsters((struct Monster *) monster->map_obj.next); + free(monster); +} + + + +extern struct MapObjDef * get_map_obj_def(struct World * world, char def_id) { struct MapObjDef * d = NULL; for (d = (struct MapObjDef *) world->monster_def;