Fixed bug that led to endless loop in nearest_enemy_dir().

[plomrogue] / src / map_objects.h

diff --git a/src/map_objects.h b/src/map_objects.h
index 29bae854045e4ad04d5a51ec2cae53dbff3bba98..fd7a8191739ccb9d8d69214972e06007d4b455b4 100644 (file)
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -7,80 +7,72 @@
 #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;
-
-
-
-/* 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 */
     struct yx_uint16 pos;        /* coordinate on map */
+    uint8_t command;             /* map object's current action */
+    uint8_t arg;                 /* optional field for .command argument */
+    uint8_t progress;            /* turns already passed to realize .command */
 };
 
-
-
 struct MapObjDef
 {
     struct MapObjDef * next;
-    uint8_t id;         /* unique identifier of map object type */
-    uint8_t corpse_id;  /* id of type to change into upon destruction */
+    uint8_t id;         /* map object definition identifier / sets .type */
+    uint8_t corpse_id;  /* type to change map object 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 */
+    char * name;        /* string to describe object in game log */
+    uint8_t lifepoints; /* default start value for map object's .lifepoints */
 };
 
 
 
-/* Initialize map object defnitions chain from file at path "filename". */
-extern void init_map_object_defs(struct World * world, char * filename);
-
-
+/* Initialize map object definitions chain from file at path "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);
 
-
-/* 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);
+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.
+/* Read map objects chain from "file"; use "line" as char array for fgets() and
+ * expect line strings of max. "linemax" length to be read by it.
  */
-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);
 
+/* Add 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 animate ones.
+ */
+extern void add_map_object(uint8_t type);
+extern void add_map_objects(uint8_t type, uint8_t n);
 
 /* 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();
 
 /* 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);