X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmap_objects.h;h=29bae854045e4ad04d5a51ec2cae53dbff3bba98;hb=fb8ddca6abc66eb7e52a007850689309b4cda938;hp=9eb055c156ebd3d94090460d1ad8d228216ecdee;hpb=1afe61cf5429407b416177893c7c86424ba31ff4;p=plomrogue
diff --git a/src/map_objects.h b/src/map_objects.h
index 9eb055c..29bae85 100644
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -10,6 +10,7 @@
#include /* for FILE typedef */
+#include /* for uint8_t */
#include "yx_uint16.h" /* for yx_uint16 coordinates */
struct World;
@@ -19,82 +20,67 @@ struct World;
struct Player
{
struct yx_uint16 pos;
- unsigned char hitpoints;
+ uint8_t hitpoints;
};
-/* Structs for standard map objects. */
-
struct MapObj
{
- void * next;
- char type; /* Map object type identifier (see MapObjDef.id). */
- struct yx_uint16 pos; /* Coordinate of object on map. */
-};
-
-struct Item
-{
- struct MapObj map_obj;
-};
-
-struct Monster
-{
- struct MapObj map_obj;
- unsigned char hitpoints;
+ struct MapObj * next; /* pointer to next one in map object chain */
+ uint8_t id; /* individual map object's unique identifier */
+ uint8_t type; /* ID of appropriate map object definition */
+ uint8_t lifepoints; /* 0: object is inanimate; >0: hitpoints */
+ struct yx_uint16 pos; /* coordinate on map */
};
-/* Structs for map object *type* definitions. Values common to all members of
- * a single monster or item type are harvested from these.
- */
-
struct MapObjDef
{
struct MapObjDef * next;
- char m_or_i; /* Is it item or monster? "i" for items, "m" for monsters. */
- char id; /* Unique identifier of the map object type to describe. */
- char mapchar; /* Map object symbol to appear on map.*/
- char * desc; /* String describing map object in the game log. */
+ uint8_t id; /* unique identifier of map object type */
+ uint8_t corpse_id; /* id of type to change into upon destruction */
+ char char_on_map; /* map object symbol to appear on map */
+ char * name; /* string to describe object in game log*/
+ uint8_t lifepoints; /* default value for map object lifepoints member */
};
-struct ItemDef
-{
- struct MapObjDef map_obj_def;
-};
-struct MonsterDef
-{
- struct MapObjDef map_obj_def;
- unsigned char hitpoints_start; /* Hitpoints each monster starts with. */
-};
+/* Initialize map object defnitions chain from file at path "filename". */
+extern void init_map_object_defs(struct World * world, char * filename);
-/* Initialize map object type definitions from file at path "filename". */
-extern void init_map_object_defs(struct World * world, char * filename);
+/* Free map object definitions chain starting at "mod_start". */
+extern void free_map_object_defs(struct MapObjDef * mod_start);
-/* Build into memory starting at "start" chain of "n" map objects of type
- * "def_id".
- */
-extern void * build_map_objects(struct World * world, void * start, char def_id,
- unsigned char n);
+/* Build chain of "n" map objects of "tpye" to start at "mo_ptr_ptr". */
+extern struct MapObj ** build_map_objects(struct World * w,
+ struct MapObj ** mo_ptr_ptr,
+ uint8_t type, uint8_t n);
+/* Write map objects chain to "file". */
+extern void write_map_objects(struct World * world, FILE * file);
-/* Write to/read from file chain of map objects starting/to start in memory at
- * "start".
+/* Read from "file" map objects chain; use "line" as char array for fgets() and
+ * expect strings of max. "linemax" length.
*/
-extern void write_map_objects(struct World * world, void * start, FILE * file);
-extern void read_map_objects(struct World * world, void * start, FILE * file);
+extern void read_map_objects(struct World * world, FILE * file,
+ char * line, int linemax);
+
+
+
+/* Free map objects in map object chain starting at "mo_start. */
+extern void free_map_objects(struct MapObj * mo_start);
/* Get pointer to the map object definition of identifier "def_id". */
-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);