Strongly overhauled keybinding managemment. Window-specific keybindings and a window...

[plomrogue] / src / map_objects.h

diff --git a/src/map_objects.h b/src/map_objects.h
index 7fcf1c7df63087df887c2076cffb3cbe7a99c223..bddd5ffc5f96e655180bcb4ad1b0f9e0d8c42a29 100644 (file)
--- 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;
 };
 
 
@@ -41,7 +42,7 @@ struct Item
 struct Monster
 {
     struct MapObj map_obj;
-    unsigned char hitpoints;
+    uint8_t hitpoints;
 };
 
 
@@ -67,7 +68,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,11 +79,19 @@ 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);
 
 
 
@@ -90,9 +100,13 @@ extern void * build_map_objects(struct World * world, void * start, char def_id,
  */
 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);
+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);