X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmap_objects.c;h=93f46841447aec667f1ddd0322268a0a330c0d6d;hb=2c2521789dc5c8bb77eb36362d4244606f878420;hp=4fc9f1c44d24cb80829bdd6d74cf87d19021d117;hpb=c7cc7fe6896f27762e2dd9b65de57f81bd1f33d4;p=plomrogue
diff --git a/src/map_objects.c b/src/map_objects.c
index 4fc9f1c..93f4684 100644
--- a/src/map_objects.c
+++ b/src/map_objects.c
@@ -1,217 +1,198 @@
/* 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() */
-#include "readwrite.h" /* for all the map object (def) loading/saving */
-#include "misc.h" /* for textfile_sizes(), find_passable_pos() */
+#include /* for strchr(), strlen(), memcpy(), strtok() */
+#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() */
+#include "yx_uint16.h" /* for yx_uint16 struct, yx_uint16_cmp() */
-/* 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,
- size_t size, struct MapObj * map_obj);
+extern void init_map_object_defs(struct World * world, char * filename)
+{
+ 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 ** last_mod_ptr_ptr = &world->map_obj_defs;
+ char * delim = " ";
+ char line[linemax + 1];
+ while (try_fgets(line, linemax + 1, file, world, f_name))
+ {
+ struct MapObjDef * mod;
+ mod = try_malloc(sizeof(struct MapObjDef), world, 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, world, f_name);
+ memcpy(mod->name, name, strlen(name) + 1);
+ * last_mod_ptr_ptr = mod;
+ last_mod_ptr_ptr = &mod->next;
+ }
+ try_fclose(file, world, f_name);
+}
-static struct MapObj * get_next_map_obj(void * start, char * first,
- size_t size, struct MapObj * map_obj)
+extern void free_map_object_defs(struct MapObjDef * mod_start)
{
- if (* first)
- {
- struct MapObj * * z = start;
- map_obj = malloc(size);
- * z = map_obj;
- * first = 0;
- }
- else
+ if (NULL == mod_start)
{
- map_obj->next = malloc(size);
- map_obj = map_obj->next;
+ return;
}
- return map_obj;
+ free_map_object_defs(mod_start->next);
+ free(mod_start->name);
+ free(mod_start);
}
-extern void init_map_object_defs(struct World * world, char * filename)
+extern void write_map_objects(struct World * world, FILE * file)
{
- world->item_def = 0;
- world->monster_def = 0;
- FILE * file = fopen(filename, "r");
- uint16_t linemax;
- textfile_sizes (file, &linemax, NULL);
- struct MapObjDef mod;
- struct ItemDef id;
- struct MonsterDef md;
- struct ItemDef * * p_p_id = &world->item_def;
- struct MonsterDef * * p_p_md = &world->monster_def;
- char * defline = malloc(linemax);
- char * line_p;
- char m_or_i;
- while (fgets(defline, linemax, file))
+ char * f_name = "write_map_objects()";
+ struct MapObj * mo = world->map_objs;
+ uint8_t size = 3 + 1 + 3 + 1 + 3 + 1 + 5 + 1 + 5 + 1;
+ char line[size];
+ while (NULL != mo)
{
- mod.next = 0;
- mod.id = atoi(defline);
- line_p = strchr(defline, ' ') + 1;
- m_or_i = * line_p;
- mod.mapchar = * (line_p + 2);
- if ('i' == m_or_i)
- {
- line_p = line_p + 5;
- }
- else
- {
- md.hitpoints_start = atoi (line_p + 4);
- line_p = strchr (line_p + 4, ' ') + 1;
- }
- mod.desc = calloc (strlen (line_p), sizeof(char));
- memcpy (mod.desc, line_p, strlen(line_p) - 1);
- if ('i' == m_or_i)
- {
- id.map_obj_def = mod;
- * p_p_id = malloc(sizeof(struct ItemDef));
- * * 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 = md;
- p_p_md = (struct MonsterDef * *) * p_p_md;
- }
+ sprintf(line, "%d %d %d %d %d\n",
+ mo->id, mo->type, mo->lifepoints, mo->pos.y, mo->pos.x);
+ try_fwrite(line, strlen(line), 1, file, world, f_name);
+ mo = mo->next;
}
- free(defline);
- fclose(file);
-};
+}
-extern void write_map_objects(void * start, FILE * file,
- void (* w_typedata) (void *, FILE *) )
+extern void read_map_objects(struct World * world, FILE * file, char * line,
+ int linemax)
{
- struct MapObj * map_obj;
- for (map_obj = start; map_obj != 0; map_obj = map_obj->next)
+ char * f_name = "read_map_objects()";
+ struct MapObj ** mo_ptr_ptr = &world->map_objs;
+ char * delim = " ";
+ struct MapObj * mo;
+ while (try_fgets(line, linemax + 1, file, world, f_name))
{
- write_uint16_bigendian(map_obj->pos.y + 1, file);
- write_uint16_bigendian(map_obj->pos.x + 1, file);
- fputc(map_obj->type, file);
- if (w_typedata)
+ mo = malloc(sizeof(struct MapObj));
+ mo->next = NULL;
+ mo->id = atoi(strtok(line, delim));
+ if (mo->id > world->map_obj_count)
{
- w_typedata (map_obj, file);
+ world->map_obj_count = mo->id;
}
+ mo->type = atoi(strtok(NULL, delim));
+ mo->lifepoints = atoi(strtok(NULL, delim));
+ mo->pos.y = atoi(strtok(NULL, delim));
+ mo->pos.x = atoi(strtok(NULL, delim));
+ * mo_ptr_ptr = mo;
+ mo_ptr_ptr = &mo->next;
}
- write_uint16_bigendian(0, file);
+ world->last_map_obj = mo;
}
-extern void read_map_objects(void * start, FILE * file, size_t size,
- void (* r_typedata) (void *, FILE *) )
+extern void add_map_object(struct World * world, uint8_t type)
{
- struct MapObj * map_obj;
- uint16_t test;
- char first = 1;
+ char * f_name = "add_map_object";
+ struct MapObjDef * mod = get_map_object_def(world, type);
+ struct MapObj * mo = try_malloc(sizeof(struct MapObj), world, f_name);
+ mo->id = world->map_obj_count;
+ world->map_obj_count++;
+ mo->type = mod->id;
+ mo->lifepoints = mod->lifepoints;
while (1)
{
- test = read_uint16_bigendian(file);
- if (0 == test)
+ struct yx_uint16 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)
{
- break;
+ if (yx_uint16_cmp(&pos, &mo_ptr->pos) && 0 != mo_ptr->lifepoints)
+ {
+ clear = 0;
+ break;
+ }
}
- map_obj = get_next_map_obj(start, &first, size, map_obj);
- map_obj->pos.y = test - 1;
- map_obj->pos.x = read_uint16_bigendian(file) - 1;
- map_obj->type = fgetc(file);
- if (r_typedata)
+ if (1 == clear)
{
- r_typedata(map_obj, file);
+ mo->pos = pos;
+ break;
}
}
- if (!first)
+ mo->next = NULL;
+ if (NULL == world->last_map_obj)
{
- map_obj->next = 0;
+ world->map_objs = mo;
}
+ else
+ {
+ world->last_map_obj->next = mo;
+ }
+ world->last_map_obj = mo;
}
-extern void write_map_objects_monsterdata(void * start, FILE * file)
-{
- struct Monster * m = (struct Monster *) start;
- fputc(m->hitpoints, file);
-}
-
-
-
-extern void read_map_objects_monsterdata (void * start, FILE * file)
-{
- struct Monster * m = (struct Monster *) start;
- m->hitpoints = fgetc(file);
-}
-
-
-
-extern void * build_map_objects(struct World * world, void * start, char def_id,
- unsigned char n, size_t size,
- void (* b_typedata) (struct MapObjDef *,
- void *))
+extern void add_map_objects(struct World * world, uint8_t type, uint8_t n)
{
- unsigned char i;
- struct MapObj * mo;
- char first = 1;
- struct MapObjDef * mod = get_map_obj_def(world, def_id);
+ uint8_t i;
for (i = 0; i < n; i++)
{
- mo = get_next_map_obj(start, &first, size, mo);
- mo->pos = find_passable_pos(world->map);
- b_typedata(mod, mo);
+ add_map_object(world, type);
}
- if (!first)
- {
- mo->next = 0;
- }
- return &mo->next;
}
-extern void build_map_objects_itemdata(struct MapObjDef * map_obj_def,
- void * start)
+extern void free_map_objects(struct MapObj * mo_start)
{
- struct Item * i = (struct Item *) start;
- i->map_obj.type = map_obj_def->id;
+ if (NULL == mo_start)
+ {
+ return;
+ }
+ free_map_objects(mo_start->next);
+ free(mo_start);
}
-extern void build_map_objects_monsterdata(struct MapObjDef * map_obj_def,
- void * start)
+extern struct MapObj * get_player(struct World * world)
{
- struct Monster * m = (struct Monster *) start;
- m->map_obj.type = map_obj_def->id;
- struct MonsterDef * md = (struct MonsterDef *) map_obj_def;
- m->hitpoints = md->hitpoints_start;
+ struct MapObj * ptr = world->map_objs;
+ while (1)
+ {
+ if (NULL == ptr)
+ {
+ return ptr;
+ }
+ if (0 == ptr->id)
+ {
+ return ptr;
+ }
+ ptr = ptr->next;
+ }
}
-extern struct MapObjDef * get_map_obj_def (struct World * world, char def_id)
+extern struct MapObjDef * get_map_object_def(struct World * w, uint8_t id)
{
- struct MapObjDef * d = NULL;
- for (d = (struct MapObjDef *) world->monster_def;
- d->id != def_id && 0 != d->next;
- d = d->next);
- if (d->id != def_id)
+ struct MapObjDef * mod = w->map_obj_defs;
+ while (id != mod->id)
{
- for (d = (struct MapObjDef *) world->item_def;
- d->id != def_id && 0 != d->next;
- d = d->next);
+ mod = mod->next;
}
- return d;
+ return mod;
}