Added primitive inventory system. Any objects may now own/contain/carry other objects.

[plomrogue] / src / map_objects.h

diff --git a/src/map_objects.h b/src/map_objects.h
index ced2ab3f161b4cc237d642bc0fabd28effe1ce14..1489711279bb4d9e96cf9ce21e16c8e31cb69a7f 100644 (file)
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -16,18 +16,10 @@ struct World;
 
 
 
-/* Player is non-standard: single and of a hard-coded type. */
-struct Player
-{
-    struct yx_uint16 pos;
-    uint8_t hitpoints;
-};
-
-
-
 struct MapObj
 {
     struct MapObj * next;        /* pointer to next one in map object chain */
+    struct MapObj * owns;        /* chain of map objects owned / in inventory */
     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 */
@@ -58,7 +50,10 @@ extern void free_map_object_defs(struct MapObjDef * mod_start);
 
 
 
-/* Add new object(s) ("n": how many?) of "type" to map on random position(s). */
+/* Add new object(s) ("n": how many?) of "type" to map on random position(s).
+ * New animate objects are never placed in the same square with other animated
+ * ones.
+ */
 extern void add_map_object(struct World * world, uint8_t type);
 extern void add_map_objects(struct World * world, uint8_t type, uint8_t n);
 
@@ -80,9 +75,25 @@ extern void free_map_objects(struct MapObj * mo_start);
 
 
 
+/* Move object of "id" from "source" inventory to "target" inventory. */
+extern void own_map_object(struct MapObj ** target, struct MapObj ** source,
+                           uint8_t id);
+
+
+
+/* Get pointer to the MapObj struct that represents the player. */
+extern struct MapObj * get_player(struct World * world);
+
+
+
 /* Get pointer to the map object definition of identifier "def_id". */
 extern struct MapObjDef * get_map_object_def(struct World * w, uint8_t id);
 
 
 
+/* Move not only "mo" to "pos", but also all map objects owned by it. */
+extern void set_object_position(struct MapObj * mo, struct yx_uint16 pos);
+
+
+
 #endif