#include "map_objects.h"
#include <stdlib.h> /* for malloc(), calloc(), 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 all the map object (def) loading/saving */
+#include <string.h> /* 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 "main.h" /* for World struct */
+/* 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 build_map_objects_itemdata(struct MapObjDef * map_obj_def,
+ void * start)
+{
+ struct Item * i = (struct Item *) start;
+ i->map_obj.type = map_obj_def->id;
+}
+
+
+
+static void build_map_objects_monsterdata(struct MapObjDef * map_obj_def,
+ void * start)
+{
+ 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;
+}
+
+
+
+static uint8_t write_map_objects_monsterdata(void * start, FILE * file)
+{
+ struct Monster * m = (struct Monster *) start;
+ return write_uint8(m->hitpoints, file);
+}
+
+
+
+static uint8_t read_map_objects_monsterdata (void * start, FILE * file)
+{
+ struct Monster * m = (struct Monster *) start;
+ return read_uint8(file, &m->hitpoints);
+}
+
+
+
extern void init_map_object_defs(struct World * world, char * filename)
{
- world->item_def = 0;
+ world->item_def = 0;
world->monster_def = 0;
- FILE * file = fopen(filename, "r");
- uint16_t linemax;
+ FILE * file = fopen(filename, "r");
+ uint16_t linemax;
textfile_sizes (file, &linemax, NULL);
- struct MapObjDef mod;
- struct ItemDef id;
- struct MonsterDef md;
+ 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;
+ char * defline = malloc(linemax);
+ char * line_p;
+ char * delim = " ";
while (fgets(defline, linemax, file))
{
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)
+ mod.id = atoi(strtok(defline, delim));
+ mod.m_or_i = * strtok(NULL, delim);
+ mod.mapchar = * strtok(NULL, delim);
+ if ('i' == mod.m_or_i)
{
- line_p = line_p + 5;
+ line_p = strtok(NULL, delim);
}
else
{
- md.hitpoints_start = atoi (line_p + 4);
- line_p = strchr (line_p + 4, ' ') + 1;
+ md.corpse_id = atoi(strtok(NULL, delim));
+ md.hitpoints_start = atoi(strtok(NULL, delim));
+ line_p = strtok(NULL, delim);
}
- mod.desc = calloc (strlen (line_p), sizeof(char));
- memcpy (mod.desc, line_p, strlen(line_p) - 1);
- if ('i' == m_or_i)
+ mod.desc = calloc(strlen(line_p), sizeof(char));
+ 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));
}
free(defline);
fclose(file);
-};
+}
-extern void write_map_objects(void * start, FILE * file,
- void (* w_typedata) (void *, FILE *) )
+extern uint8_t write_map_objects(struct World * world, void * start,
+ FILE * file)
{
struct MapObj * map_obj;
+ struct MapObjDef * mod;
for (map_obj = start; map_obj != 0; map_obj = map_obj->next)
{
- 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)
+ if ( write_uint8(map_obj->type, file)
+ || write_uint16_bigendian(map_obj->pos.y + 1, file)
+ || write_uint16_bigendian(map_obj->pos.x + 1, file))
+ {
+ return 1;
+ }
+ mod = get_map_obj_def(world, map_obj->type);
+ if ('m' == mod->m_or_i)
{
- w_typedata (map_obj, file);
+ if (write_map_objects_monsterdata(map_obj, file))
+ {
+ return 1;
+ }
}
}
- write_uint16_bigendian(0, file);
+ return write_uint16_bigendian(0, file);
}
-extern void read_map_objects (void * start, FILE * file, size_t size,
- void (* r_typedata) (void *, FILE *) )
+extern uint8_t read_map_objects(struct World * world, void * start, FILE * file)
{
struct MapObj * map_obj;
- uint16_t test;
+ struct MapObjDef * mod;
+ size_t size;
+ uint8_t type;
char first = 1;
+ long pos;
+ uint16_t read_uint16 = 0;
while (1)
{
- test = read_uint16_bigendian(file);
- if (0 == test)
+ pos = ftell(file);
+ if (read_uint16_bigendian(file, &read_uint16))
+ {
+ return 1;
+ }
+ if (0 == read_uint16)
{
break;
}
+ fseek(file, pos, SEEK_SET);
+ if (read_uint8(file, &type))
+ {
+ return 1;
+ }
+ 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->pos.y = test - 1;
- map_obj->pos.x = read_uint16_bigendian(file) - 1;
- map_obj->type = fgetc(file);
- if (r_typedata)
+ map_obj->type = type;
+ if ( read_uint16_bigendian(file, &map_obj->pos.y)
+ || read_uint16_bigendian(file, &map_obj->pos.x))
+ {
+ return 1;
+ }
+ map_obj->pos.y--;
+ map_obj->pos.x--;
+ if ('m' == mod->m_or_i)
{
- r_typedata(map_obj, file);
+ if (read_map_objects_monsterdata(map_obj, file))
+ {
+ return 1;
+ }
}
}
if (!first)
{
map_obj->next = 0;
}
-}
-
-
-
-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);
+ return 0;
}
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 *))
+ uint8_t n)
{
- unsigned char i;
+ uint8_t 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)
+ {
+ size = sizeof(struct Item);
+ }
+ 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);
- b_typedata(mod, mo);
+ if ('i' == mod->m_or_i)
+ {
+ build_map_objects_itemdata(mod, mo);
+ }
+ else
+ {
+ build_map_objects_monsterdata(mod, mo);
+ }
+
}
if (!first)
{
-extern void build_map_objects_itemdata(struct MapObjDef * map_obj_def,
- void * start)
-{
- struct Item * i = (struct Item *) start;
- i->map_obj.type = map_obj_def->id;
-}
-
-
-
-extern void build_map_objects_monsterdata(struct MapObjDef * map_obj_def,
- void * start)
-{
- 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;
-}
-
-
-
extern struct MapObjDef * get_map_obj_def (struct World * world, char def_id)
{
struct MapObjDef * d = NULL;
d->id != def_id && 0 != d->next;
d = d->next);
}
- return d;
+ return d;
}
projects / plomrogue / blobdiff