X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmap_objects.h;h=29bae854045e4ad04d5a51ec2cae53dbff3bba98;hb=fb8ddca6abc66eb7e52a007850689309b4cda938;hp=6f3772e5272fd858760d6d4218032a6784c163ce;hpb=8661a8acfacc7cdd2935732fe5ead7d279a200b0;p=plomrogue
diff --git a/src/map_objects.h b/src/map_objects.h
index 6f3772e..29bae85 100644
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -1,41 +1,87 @@
-#ifndef ACTORS_H
-#define ACTORS_H
+/* map_objects.h
+ *
+ * Structs for objects on the map and their type definitions, and routines to
+ * initialize these and load and save them from/to files.
+ */
-#include
-#include "yx_uint16.h"
+#ifndef MAP_OBJECTS_H
+#define MAP_OBJECTS_H
+
+
+#include /* for FILE typedef */
+#include /* for uint8_t */
+#include "yx_uint16.h" /* for yx_uint16 coordinates */
struct World;
-struct Map;
-
-struct Player {
- struct yx_uint16 pos;
- unsigned char hitpoints; };
-
-struct ChainMapObject {
- void * next;
- unsigned char name;
- struct yx_uint16 pos; };
-
-struct Item {
- struct ChainMapObject cmo; };
-
-struct Monster {
- struct ChainMapObject cmo;
- unsigned char hitpoints; };
-
-extern void readwrite_map_objects_dummy (void *, FILE *);
-extern void write_map_objects_monsterdata (void *, FILE *);
-extern void write_map_objects (void * start, FILE *, void (*) (void *, FILE *) );
-extern void read_map_objects_monsterdata (void *, FILE *);
-extern void read_map_objects (void *, FILE *, size_t, void (*) (void *, FILE *) );
-extern void build_map_objects_monsterdata (void *);
-extern void build_map_objects_itemdata (void *);
-extern void build_map_objects (void *, unsigned char, size_t, void (*) (void *), struct Map *);
-
-extern struct yx_uint16 find_passable_pos (struct Map *);
-extern char is_passable (struct Map *, struct yx_uint16);
-extern void move_monster (struct World *, struct Monster *);
-extern void move_player (struct World *, char);
-extern void player_wait(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 */
+ 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 */
+};
+
+
+
+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 */
+ 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 */
+};
+
+
+
+/* Initialize map object defnitions chain from file at path "filename". */
+extern void init_map_object_defs(struct World * world, 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);
+
+/* 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);
+
+
+
+/* Free map objects in map object chain starting at "mo_start. */
+extern void free_map_objects(struct MapObj * mo_start);
+
+
+
+/* Get pointer to the map object definition of identifier "def_id". */
+extern struct MapObjDef * get_map_object_def(struct World * w, uint8_t id);
+
+
#endif