X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmap_objects.h;h=2307fb51fe776bb09f52e816b7294be86554dd49;hb=1ae2dac3529b3ead75c5bef1d02d958adcbcc581;hp=9eb055c156ebd3d94090460d1ad8d228216ecdee;hpb=1afe61cf5429407b416177893c7c86424ba31ff4;p=plomrogue

diff --git a/src/map_objects.h b/src/map_objects.h
index 9eb055c..2307fb5 100644
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -10,6 +10,7 @@
 
 
 #include <stdio.h> /* for FILE typedef */
+#include <stdint.h> /* for uint8_t */
 #include "yx_uint16.h" /* for yx_uint16 coordinates */
 struct World;
 
@@ -19,7 +20,7 @@ struct World;
 struct Player
 {
     struct yx_uint16 pos;
-    unsigned char hitpoints;
+    uint8_t hitpoints;
 };
 
 
@@ -29,6 +30,7 @@ struct Player
 struct MapObj
 {
     void * next;
+    uint8_t id;           /* Unique identifier of individual map object. */
     char type;            /* Map object type identifier (see MapObjDef.id). */
     struct yx_uint16 pos; /* Coordinate of object on map. */
 };
@@ -41,7 +43,7 @@ struct Item
 struct Monster
 {
     struct MapObj map_obj;
-    unsigned char hitpoints;
+    uint8_t hitpoints;
 };
 
 
@@ -67,7 +69,8 @@ struct ItemDef
 struct MonsterDef
 {
     struct MapObjDef map_obj_def;
-    unsigned char hitpoints_start; /* Hitpoints each monster starts with. */
+    uint8_t corpse_id;       /* ID of object type killed monster changes to. */
+    uint8_t hitpoints_start; /* Hitpoints each monster starts with. */
 };
 
 
@@ -77,21 +80,34 @@ extern void init_map_object_defs(struct World * world, char * filename);
 
 
 
+/* Free item / monster definitions in map object chain starting at "md_start" /
+ * "id_start".
+ */
+extern void free_item_defs(struct ItemDef * id_start);
+extern void free_monster_defs(struct MonsterDef * md_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);
+                                uint8_t n);
 
 
 
 /* Write to/read from file chain of map objects starting/to start in memory at
  * "start".
  */
-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 uint8_t write_map_objects(struct World * world, void * start,
+                                 FILE * file);
+extern uint8_t read_map_objects(struct World * world, void * start,
+                                FILE * file);
 
 
+/* Free items / monsters in map object chain starting at "item" / "monster". */
+extern void free_items(struct Item * item);
+extern void free_monsters(struct Monster * monster);
 
 /* Get pointer to the map object definition of identifier "def_id". */
 extern struct MapObjDef * get_map_obj_def(struct World * world, char def_id);