X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmap_objects.c;h=0407352e8e494ebf95078eeac1401cb971e0b964;hb=10680a2398daf76e6a0cd261c2b247e6902f2ad0;hp=c4b90485068f1580b2d85f53f17b4bb8d6ecb017;hpb=b9082c113c43afe5c6a11c2b72f845ee2f8c6aea;p=plomrogue

diff --git a/src/map_objects.c b/src/map_objects.c
index c4b9048..0407352 100644
--- a/src/map_objects.c
+++ b/src/map_objects.c
@@ -1,263 +1,311 @@
 /* map_objects.c */
 
 #include "map_objects.h"
-#include <stdlib.h> /* for malloc(), calloc(), free(), atoi() */
+#include <stdlib.h> /* for free(), atoi() */
+#include <stdint.h> /* for uint8_t */
 #include <stdio.h> /* for FILE typedef */
-#include <string.h> /* for strchr(), strlen(), memcpy()  */
-#include "readwrite.h" /* for [read/write]_uint[8/16/23][_bigendian]() */
-#include "misc.h" /* for textfile_sizes(), find_passable_pos() */
-#include "main.h" /* for World struct */
+#include <string.h> /* for strchr(), strlen(), memcpy(), strtok() */
+#include "readwrite.h" /* for textfile_sizes(), try_fopen(), try_fclose(),
+                        * try_fgets()
+                        */
+#include "misc.h" /* for try_malloc(), find_passable_pos() */
+#include "main.h" /* for world global */
+#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);
+/* Write representation of "mo" and all of the map objects it owns to "file". */
+static void write_map_object(FILE * file, struct MapObj * mo);
 
+/* Return pointer to map object of "id" in chain starting at "ptr". */
+static struct MapObj * get_map_object(struct MapObj * ptr, uint8_t id);
 
 
-/* Map-object-type-specific helpers to (build|write|read)_map_objects(). */
-static void build_map_objects_itemdata(struct MapObjDef * map_obj_def,
-                                       void * start);
-static void build_map_objects_monsterdata(struct MapObjDef * map_obj_def,
-                                          void * start);
-static uint8_t write_map_objects_monsterdata(void * start, FILE * file);
-static uint8_t read_map_objects_monsterdata( void * start, FILE * file);
 
-
-
-static struct MapObj * get_next_map_obj(void * start, char * first,
-                                        size_t size, struct MapObj * map_obj)
+static void write_map_object(FILE * file, struct MapObj * mo)
 {
-    if (* first)
+    char * f_name = "write_map_object()";
+    struct MapObj * mo_ptr = mo->owns;
+    uint8_t i = 0;
+    for (; NULL != mo_ptr; mo_ptr = mo_ptr->next, i++);
+    uint8_t size = 3+1 + 3+1 + 3+1 + 5+1 + 5 + ((1+3)*i) + 1 + 1;
+    char line[size];
+    sprintf(line, "%d %d %d %d %d %d %d %d",
+                  mo->id, mo->type, mo->lifepoints, mo->pos.y, mo->pos.x,
+                  mo->command, mo->arg, mo->progress);
+    for (mo_ptr = mo->owns; NULL != mo_ptr; mo_ptr = mo_ptr->next)
     {
-        struct MapObj * * z = start;
-        map_obj = malloc(size);
-        * z = map_obj;
-        * first = 0;
+        sprintf(line + strlen(line), " %d", mo_ptr->id);
     }
-    else
+    line[strlen(line) + 1] = '\0';
+    line[strlen(line)] = '\n';
+    try_fwrite(line, strlen(line), 1, file, f_name);
+    for (mo_ptr = mo->owns; NULL != mo_ptr; mo_ptr = mo_ptr->next)
     {
-        map_obj->next = malloc(size);
-        map_obj = map_obj->next;
+        write_map_object(file, mo_ptr);
     }
-    return map_obj;
 }
 
 
 
-static void build_map_objects_itemdata(struct MapObjDef * map_obj_def,
-                                       void * start)
+static struct MapObj * get_map_object(struct MapObj * ptr, uint8_t id)
 {
-  struct Item * i = (struct Item *) start;
-  i->map_obj.type = map_obj_def->id;
+    while (1)
+    {
+        if (NULL == ptr || id == ptr->id)
+        {
+            return ptr;
+        }
+        struct MapObj * owned_object = get_map_object(ptr->owns, id);
+        if (NULL != owned_object)
+        {
+            return ptr;
+        }
+        ptr = ptr->next;
+    }
 }
 
 
 
-static void build_map_objects_monsterdata(struct MapObjDef * map_obj_def,
-                                          void * start)
+extern void init_map_object_defs(char * filename)
 {
-    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;
+    char * f_name = "init_map_object_defs()";
+    FILE * file = try_fopen(filename, "r", f_name);
+    uint16_t linemax = textfile_sizes(file, NULL);
+    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))
+    {
+        struct MapObjDef * mod;
+        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);
+        * last_mod_ptr_ptr = mod;
+        last_mod_ptr_ptr = &mod->next;
+    }
+    try_fclose(file, f_name);
 }
 
 
 
-static uint8_t write_map_objects_monsterdata(void * start, FILE * file)
+extern void free_map_object_defs(struct MapObjDef * mod_start)
 {
-    struct Monster * m = (struct Monster *) start;
-    return write_uint8(m->hitpoints, file);
+    if (NULL == mod_start)
+    {
+        return;
+    }
+    free_map_object_defs(mod_start->next);
+    free(mod_start->name);
+    free(mod_start);
 }
 
 
 
-static uint8_t read_map_objects_monsterdata (void * start, FILE * file)
+extern void write_map_objects(FILE * file)
 {
-    struct Monster * m = (struct Monster *) start;
-    return read_uint8(file, &m->hitpoints);
+    struct MapObj * mo = world.map_objs;
+    while (NULL != mo)
+    {
+        write_map_object(file, mo);
+        mo = mo->next;
+    }
 }
 
 
 
-extern void init_map_object_defs(struct World * world, char * filename)
+extern void read_map_objects(FILE * file, char * line, int linemax)
 {
-    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;
-    while (fgets(defline, linemax, file))
+    char * f_name = "read_map_objects()";
+    struct MapObj ** mo_ptr_ptr = &world.map_objs;
+    char * delim = " ";
+    struct MapObj * mo;
+    fpos_t pos;
+    exit_err(-1 == fgetpos(file, &pos), f_name);
+    while (try_fgets(line, linemax + 1, file, f_name))
     {
-        mod.next    = 0;
-        mod.id      = atoi(defline);
-        line_p      = strchr(defline, ' ') + 1;
-        mod.m_or_i  = * line_p;
-        mod.mapchar = * (line_p + 2);
-        if ('i' == mod.m_or_i)
-        {
-            line_p = line_p + 5;
-        }
-        else
+        mo = try_malloc(sizeof(struct MapObj), f_name);
+        mo->next       = NULL;
+        mo->id         = atoi(strtok(line, delim));
+        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->command    = atoi(strtok(NULL, delim));;
+        mo->arg        = atoi(strtok(NULL, delim));;
+        mo->progress   = atoi(strtok(NULL, delim));;
+        mo->owns       = NULL;
+        if (mo->id > world.map_obj_count)
         {
-            md.hitpoints_start = atoi   (line_p + 4);
-            line_p             = strchr (line_p + 4, ' ') + 1;
+            world.map_obj_count = mo->id;
         }
-        mod.desc = calloc (strlen (line_p), sizeof(char));
-        memcpy (mod.desc, line_p, strlen(line_p) - 1);
-        if ('i' == mod.m_or_i)
+        * mo_ptr_ptr = mo;
+        mo_ptr_ptr = &mo->next;
+    }
+    exit_err(-1 == fsetpos(file, &pos), f_name);
+    while (try_fgets(line, linemax + 1, file, f_name))
+    {
+        uint8_t id = atoi(strtok(line, delim));
+        uint8_t i;
+        for (i = 0; i < 7; 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;
+            strtok(NULL, delim);
         }
-        else
+        char * owned = strtok(NULL, "\n");
+        if (NULL != owned)
         {
-            md.map_obj_def = mod;
-            * p_p_md       = malloc(sizeof(struct MonsterDef));
-            * * p_p_md     = md;
-            p_p_md         = (struct MonsterDef * *) * p_p_md;
+            mo = get_map_object(world.map_objs, id);
+            char * owned_id = "";
+            owned_id = strtok(owned, delim);
+            while (NULL != owned_id)
+            {
+                own_map_object(&mo->owns, &world.map_objs,
+                               (uint8_t) atoi(owned_id));
+                owned_id = strtok(NULL, delim);
+            }
         }
     }
-    free(defline);
-    fclose(file);
-};
+}
 
 
 
-extern uint8_t write_map_objects(struct World * world, void * start,
-                                 FILE * file)
+extern void add_map_object(uint8_t type)
 {
-    struct MapObj * map_obj;
-    struct MapObjDef * mod;
-    uint8_t fail = 0;
-    for (map_obj = start; map_obj != 0; map_obj = map_obj->next)
+    char * f_name = "add_map_object()";
+    struct MapObjDef * mod = get_map_object_def(type);
+    struct MapObj * mo = try_malloc(sizeof(struct MapObj), f_name);
+    mo->id = world.map_obj_count;
+    world.map_obj_count++;
+    mo->type = mod->id;
+    mo->lifepoints = mod->lifepoints;
+    while (1)
     {
-        fail = fail | write_uint8(map_obj->type, file);
-        fail = fail | write_uint16_bigendian(map_obj->pos.y + 1, file);
-        fail = fail | write_uint16_bigendian(map_obj->pos.x + 1, file);
-        mod = get_map_obj_def(world, map_obj->type);
-        if ('m' == mod->m_or_i)
+        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)
         {
-            fail = fail | write_map_objects_monsterdata(map_obj, file);
+            if (yx_uint16_cmp(&pos, &mo_ptr->pos) && 0 != mo_ptr->lifepoints)
+            {
+                clear = 0;
+                break;
+            }
         }
+        if (1 == clear)
+        {
+            mo->pos = pos;
+            break;
+        }
+    }
+    mo->progress = 0;
+    mo->command = 0;
+    mo->arg = 0;
+    mo->owns = NULL;
+    mo->next = NULL;
+    struct MapObj ** last_ptr_ptr = &world.map_objs;
+    struct MapObj * mo_ptr;
+    while (NULL != * last_ptr_ptr)
+    {
+        mo_ptr = * last_ptr_ptr;
+        last_ptr_ptr = & mo_ptr->next;
     }
-    return (fail | write_uint16_bigendian(0, file));
+    * last_ptr_ptr = mo;
 }
 
 
 
-extern uint8_t read_map_objects(struct World * world, void * start, FILE * file)
+extern void add_map_objects(uint8_t type, uint8_t n)
 {
-    struct MapObj * map_obj;
-    struct MapObjDef * mod;
-    size_t size;
-    uint8_t type;
-    char first = 1;
-    long pos;
-    uint16_t read_uint16 = 0;
-    uint8_t fail = 0;
-    while (1)
+    uint8_t i;
+    for (i = 0; i < n; i++)
     {
-        pos = ftell(file);
-        fail = fail | read_uint16_bigendian(file, &read_uint16);
-        if (0 == read_uint16)
-        {
-            break;
-        }
-        fseek(file, pos, SEEK_SET);
-        fail = fail | read_uint8(file, &type);
-        mod = get_map_obj_def(world, type);
-        if ('m' == mod->m_or_i)
-        {
-            size = sizeof(struct Monster);
-        }
-        else
-        {
-            size = sizeof(struct Item);
-        }
-        map_obj = get_next_map_obj(start, &first, size, map_obj);
-        map_obj->type = type;
-        fail = fail | read_uint16_bigendian(file, &map_obj->pos.y);
-        fail = fail | read_uint16_bigendian(file, &map_obj->pos.x);
-        map_obj->pos.y--;
-        map_obj->pos.x--;
-        if ('m' == mod->m_or_i)
-        {
-            fail = fail | read_map_objects_monsterdata(map_obj, file);
-        }
+        add_map_object(type);
     }
-    if (!first)
+}
+
+
+
+extern void free_map_objects(struct MapObj * mo_start)
+{
+    if (NULL == mo_start)
     {
-        map_obj->next = 0;
+        return;
     }
-    return fail;
+    free_map_objects(mo_start->owns);
+    free_map_objects(mo_start->next);
+    free(mo_start);
 }
 
 
 
-extern void * build_map_objects(struct World * world, void * start, char def_id,
-                                unsigned char n)
+extern void own_map_object(struct MapObj ** target, struct MapObj ** source,
+                           uint8_t id)
 {
-    unsigned char i;
     struct MapObj * mo;
-    char first = 1;
-    struct MapObjDef * mod = get_map_obj_def(world, def_id);
-    size_t size = 0;
-    if ('i' == mod->m_or_i)
+    if (id == (*source)->id)
     {
-        size = sizeof(struct Item);
+        mo = * source;
+        * source = mo->next;
     }
     else
     {
-        size = sizeof(struct Monster);
-    }
-    for (i = 0; i < n; i++)
-    {
-        mo = get_next_map_obj(start, &first, size, mo);
-        mo->pos = find_passable_pos(world->map);
-        if ('i' == mod->m_or_i)
+        struct MapObj * penult = * source;
+        while (1)
         {
-            build_map_objects_itemdata(mod, mo);
+            if (id == penult->next->id)
+            {
+                break;
+            }
+            penult = penult->next;
         }
-        else
-        {
-            build_map_objects_monsterdata(mod, mo);
-        }
-
+        mo = penult->next;
+        penult->next = mo->next;
+    }
+    struct MapObj ** last_ptr_ptr = target;
+    struct MapObj * mo_ptr;
+    while (NULL != * last_ptr_ptr)
+    {
+        mo_ptr = * last_ptr_ptr;
+        last_ptr_ptr = & mo_ptr->next;
     }
-    if (!first)
+    * last_ptr_ptr = mo;
+    mo->next = NULL;
+}
+
+
+
+extern struct MapObj * get_player()
+{
+    return get_map_object(world.map_objs, 0);
+}
+
+
+
+extern struct MapObjDef * get_map_object_def(uint8_t id)
+{
+    struct MapObjDef * mod = world.map_obj_defs;
+    while (id != mod->id)
     {
-        mo->next = 0;
+        mod = mod->next;
     }
-    return &mo->next;
+    return mod;
 }
 
 
 
-extern struct MapObjDef * get_map_obj_def (struct World * world, char def_id)
+extern void set_object_position(struct MapObj * mo, struct yx_uint16 pos)
 {
-    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)
+    mo->pos = pos;
+    struct MapObj * owned = mo->owns;
+    for (; owned != NULL; owned = owned->next)
     {
-        for (d = (struct MapObjDef *) world->item_def;
-             d->id != def_id && 0 != d->next;
-             d = d->next);
+        set_object_position(owned, pos);
     }
-    return d;
 }