X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap_objects.c;h=50f372f966792e3579bde4d7c8f742aa257f7e2b;hb=1d09b2399527569b3a8cea18abf44cad33248719;hp=abcb6acfc35da8b10c64b942752ebe5c85e07a90;hpb=651c99ff66ae4704021ee15136707c892ed243d6;p=plomrogue diff --git a/src/server/map_objects.c b/src/server/map_objects.c index abcb6ac..50f372f 100644 --- a/src/server/map_objects.c +++ b/src/server/map_objects.c @@ -5,17 +5,21 @@ #include /* FILE typedef */ #include /* uint8_t, uint16_t */ #include /* free(), atoi() */ -#include /* strlen(), memcpy(), strtok(), memset() */ -#include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets(), - * textfile_sizes() +#include /* strlen(), memcpy(), memset() */ +#include "../common/err_try_fgets.h" /* err_try_fgets(), err_line(), + * reset_err_try_fgets_counter() + */ +#include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgetc(), + * textfile_width() */ +#include "../common/rexit.h" /* exit_err(), exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ -#include "../common/yx_uint16.h" /* yx_uint16 struct */ +#include "../common/yx_uint8.h" /* yx_uint8 struct */ #include "cleanup.h" /* set_cleanup_flag() */ #include "map.h" /* is_passable() */ #include "rrand.h" /* rrand() */ #include "world.h" /* global world */ -#include "yx_uint16.h" /* yx_uint16_cmp() */ +#include "yx_uint8.h" /* yx_uint8_cmp() */ @@ -23,7 +27,7 @@ static struct MapObj * get_map_object(struct MapObj * ptr, uint8_t id); /* Return random passable (as by is_passable()) position on world.map. */ -static struct yx_uint16 find_passable_pos(); +static struct yx_uint8 find_passable_pos(); /* Add object of "type" to map on random position. Don't place actor on actor.*/ static void add_map_object(uint8_t type); @@ -49,9 +53,9 @@ static struct MapObj * get_map_object(struct MapObj * ptr, uint8_t id) -static struct yx_uint16 find_passable_pos() +static struct yx_uint8 find_passable_pos() { - struct yx_uint16 pos; + struct yx_uint8 pos; for (pos.y = pos.x = 0; 0 == is_passable(pos);) { pos.y = rrand() % world.map.size.y; @@ -73,12 +77,12 @@ static void add_map_object(uint8_t type) mo->lifepoints = mod->lifepoints; while (1) { - struct yx_uint16 pos = find_passable_pos(world.map); + struct yx_uint8 pos = find_passable_pos(world.map); struct MapObj * mo_ptr; uint8_t clear = 1; for (mo_ptr = world.map_objs; mo_ptr != NULL; mo_ptr = mo_ptr->next) { - if (yx_uint16_cmp(&pos, &mo_ptr->pos) && 0 != mo_ptr->lifepoints) + if (yx_uint8_cmp(&pos, &mo_ptr->pos) && 0 != mo_ptr->lifepoints) { clear = 0; break; @@ -97,27 +101,48 @@ static void add_map_object(uint8_t type) -extern void init_map_object_defs(char * filename) +extern void init_map_object_defs() { char * f_name = "init_map_object_defs()"; - FILE * file = try_fopen(filename, "r", f_name); - uint16_t linemax = textfile_sizes(file, NULL); + char * context = "Failed reading map object definitions file. "; + char * err_uniq = "Declaration of ID already used."; + FILE * file = try_fopen(world.path_map_obj_defs, "r", f_name); + uint32_t linemax = textfile_width(file); struct MapObjDef ** last_mod_ptr_ptr = &world.map_obj_defs; - char * delim = " "; char line[linemax + 1]; - while (try_fgets(line, linemax + 1, file, f_name)) + reset_err_try_fgets_counter(); + while (1) { + int test_for_end = try_fgetc(file, f_name); + if (EOF == test_for_end || '\n' == test_for_end) + { + break; + } + exit_trouble(EOF == ungetc(test_for_end, file), f_name, "ungetc()"); struct MapObjDef * mod = try_malloc(sizeof(struct MapObjDef), f_name); mod->next = NULL; - mod->id = atoi(strtok(line, delim)); - mod->corpse_id = atoi(strtok(NULL, delim)); - mod->char_on_map = * strtok(NULL, delim); - mod->lifepoints = atoi(strtok(NULL, delim)); - char * name = strtok(NULL, "\n"); - mod->name = try_malloc(strlen(name) + 1, f_name); - memcpy(mod->name, name, strlen(name) + 1); + err_try_fgets(line, linemax, file, context, "nfi8"); + mod->id = atoi(line); + struct MapObjDef * mod_test = world.map_obj_defs; + for (; NULL != mod_test; mod_test = mod_test->next) + { + err_line(mod->id == mod_test->id, line, context, err_uniq); + } + err_try_fgets(line, linemax, file, context, "0nfi8"); + mod->corpse_id = atoi(line); + err_try_fgets(line, linemax, file, context, "0nfs"); + mod->char_on_map = line[0]; + err_try_fgets(line, linemax, file, context, "0nfi8"); + mod->lifepoints = atoi(line); + err_try_fgets(line, linemax, file, context, "0nf"); + line[strlen(line) - 1] = '\0'; + mod->name = try_malloc(strlen(line) + 1, f_name); + memcpy(mod->name, line, strlen(line) + 1); + err_try_fgets(line, linemax, file, context, "0nfi8"); + mod->consumable = atoi(line); * last_mod_ptr_ptr = mod; last_mod_ptr_ptr = &mod->next; + err_try_fgets(line, linemax, file, context, "d"); } try_fclose(file, f_name); set_cleanup_flag(CLEANUP_MAP_OBJECT_DEFS); @@ -134,7 +159,6 @@ extern void free_map_object_defs(struct MapObjDef * mod_start) free_map_object_defs(mod_start->next); free(mod_start->name); free(mod_start); - mod_start = NULL; } @@ -159,10 +183,10 @@ extern void free_map_objects(struct MapObj * mo_start) free_map_objects(mo_start->owns); free_map_objects(mo_start->next); free(mo_start); - if (mo_start == world.map_objs) - { - world.map_objs = NULL; - } + if (mo_start == world.map_objs) /* So add_map_objects()' NULL-delimited */ + { /* map object iteration loop does not */ + world.map_objs = NULL; /* iterate over freed memory when called */ + } /* the 1st time after world re-seeding. */ } @@ -208,13 +232,17 @@ extern struct MapObj * get_player() extern struct MapObjDef * get_map_object_def(uint8_t id) { struct MapObjDef * mod = world.map_obj_defs; - for (; id != mod->id; mod = mod->next); + for (; NULL != mod && id != mod->id; mod = mod->next); + char * err_intro = "Requested map object definition of unused ID "; + char err[strlen(err_intro) + 3 + 1 + 1]; + sprintf(err, "%s%d.", err_intro, id); + exit_err(NULL == mod, err); return mod; } -extern void set_object_position(struct MapObj * mo, struct yx_uint16 pos) +extern void set_object_position(struct MapObj * mo, struct yx_uint8 pos) { mo->pos = pos; struct MapObj * owned = mo->owns;