Each map object action now take different numbers of turns to complete. Re-wrote...

[plomrogue] / src / map_objects.h

diff --git a/src/map_objects.h b/src/map_objects.h
index 5cbab7bc3e44effce04aa7a124eb0809b696156a..2bd1bec775dafb89dae35060479374bb95fc381f 100644 (file)
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -7,26 +7,25 @@
 #ifndef MAP_OBJECTS_H
 #define MAP_OBJECTS_H
 
-
-
 #include <stdio.h> /* for FILE typedef */
 #include <stdint.h> /* for uint8_t */
 #include "yx_uint16.h" /* for yx_uint16 coordinates */
-struct World;
 
 
 
 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 */
     struct yx_uint16 pos;        /* coordinate on map */
+    uint8_t command;             /* command map object tries to realize now*/
+    uint8_t arg;                 /* optional field for command argument */
+    uint8_t progress;            /* turns already passed to realize .command */
 };
 
-
-
 struct MapObjDef
 {
     struct MapObjDef * next;
@@ -40,47 +39,41 @@ struct MapObjDef
 
 
 /* Initialize map object defnitions chain from file at path "filename". */
-extern void init_map_object_defs(struct World * world, char * filename);
-
-
+extern void init_map_object_defs(char * filename);
 
 /* Free map object definitions chain starting at "mod_start". */
 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).
  * 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);
-
-
+extern void add_map_object(uint8_t type);
+extern void add_map_objects(uint8_t type, uint8_t n);
 
 /* Write map objects chain to "file". */
-extern void write_map_objects(struct World * world, FILE * file);
+extern void write_map_objects(FILE * file);
 
 /* Read from "file" map objects chain; use "line" as char array for fgets() and
  * expect strings of max. "linemax" length.
  */
-extern void read_map_objects(struct World * world, FILE * file,
-                             char * line, int linemax);
-
-
+extern void read_map_objects(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);
 
-
+/* 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);
-
-
+extern struct MapObj * get_player();
 
 /* Get pointer to the map object definition of identifier "def_id". */
-extern struct MapObjDef * get_map_object_def(struct World * w, uint8_t id);
+extern struct MapObjDef * get_map_object_def(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);