X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmap_objects.c;h=8d08ae04db1832e3222799df73278984aff731fb;hb=550d22ec0c3f530f5d317746f3f7e75251a1de4b;hp=28d9b146864e70ece8f99ebd3c0c81255c3ed1b6;hpb=2409e8ab623f8ef1452508b0fb4a4293692ed6a7;p=plomrogue diff --git a/src/map_objects.c b/src/map_objects.c index 28d9b14..8d08ae0 100644 --- a/src/map_objects.c +++ b/src/map_objects.c @@ -1,12 +1,14 @@ /* 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() */ @@ -14,10 +16,9 @@ /* 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. - * - * Returns NULL instead of MapObj pointer if malloc() failed. */ -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); @@ -32,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; @@ -90,25 +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; - char * err = "Trouble in init_map_object_defs() with fopen()."; - FILE * file = fopen(filename, "r"); - exit_err(NULL == file, world, err); - uint16_t linemax; - err = "Trouble in init_map_object_defs() with textfile_sizes()."; - exit_err(textfile_sizes(file, &linemax, NULL), world, err); + 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; - err = "Trouble in init_map_object_defs() with malloc() or calloc()."; - char * defline = malloc(linemax); - exit_err(NULL == defline, world, err); + 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)); @@ -124,29 +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)); - exit_err(NULL == mod.desc, world, err); + 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)); - exit_err(NULL == p_p_id, world, err); + * 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)); - exit_err(NULL == p_p_md, world, err); + * 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); - err = "Trouble in init_map_object_defs() with fclose()."; - exit_err(fclose(file), world, err); + try_fclose(file, world, f_name); } @@ -205,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; @@ -212,7 +206,6 @@ extern uint8_t read_map_objects(struct World * world, void * start, FILE * file) char first = 1; long pos; uint16_t read_uint16 = 0; - char * err = "Trouble in read_map_objects() with get_next_map_obj()."; while (1) { pos = ftell(file); @@ -238,7 +231,7 @@ 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) @@ -268,12 +261,12 @@ 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; struct MapObjDef * mod = get_map_obj_def(world, def_id); size_t size = 0; - char * err = "Trouble in build_map_objects() with get_next_map_obj()."; if ('i' == mod->m_or_i) { size = sizeof(struct Item); @@ -284,7 +277,7 @@ 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) @@ -308,10 +301,11 @@ extern void * build_map_objects(struct World * world, void * start, char def_id, extern void free_items(struct Item * item) { - if (0 != item->map_obj.next) + if (0 == item) { - free_items((struct Item *) item->map_obj.next); + return; } + free_items((struct Item *) item->map_obj.next); free(item); } @@ -319,10 +313,11 @@ extern void free_items(struct Item * item) extern void free_monsters(struct Monster * monster) { - if (0 != monster->map_obj.next) + if (0 == monster) { - free_monsters((struct Monster *) monster->map_obj.next); + return; } + free_monsters((struct Monster *) monster->map_obj.next); free(monster); }