X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmap_objects.h;h=5cbab7bc3e44effce04aa7a124eb0809b696156a;hb=2c2521789dc5c8bb77eb36362d4244606f878420;hp=4804033d1002fe17499242046fdd5ff804d12f30;hpb=e9282787cecf5439513dbfaedeac235cdc841e91;p=plomrogue
diff --git a/src/map_objects.h b/src/map_objects.h
index 4804033..5cbab7b 100644
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -16,89 +16,71 @@ struct World;
-/* Player is non-standard: single and of a hard-coded type. */
-struct Player
+struct MapObj
{
- struct yx_uint16 pos;
- uint8_t hitpoints;
+ 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 */
};
-/* Structs for standard map objects. */
-
-struct MapObj
-{
- void * next;
- char type; /* Map object type identifier (see MapObjDef.id). */
- struct yx_uint16 pos; /* Coordinate of object on map. */
-};
-
-struct Item
+struct MapObjDef
{
- struct MapObj map_obj;
+ 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 */
};
-struct Monster
-{
- struct MapObj map_obj;
- uint8_t hitpoints;
-};
+/* Initialize map object defnitions chain from file at path "filename". */
+extern void init_map_object_defs(struct World * world, char * filename);
-/* Structs for map object *type* definitions. Values common to all members of
- * a single monster or item type are harvested from these.
- */
-struct MapObjDef
-{
- struct MapObjDef * next;
- char m_or_i; /* Is it item or monster? "i" for items, "m" for monsters. */
- char id; /* Unique identifier of the map object type to describe. */
- char mapchar; /* Map object symbol to appear on map.*/
- char * desc; /* String describing map object in the game log. */
-};
-struct ItemDef
-{
- struct MapObjDef map_obj_def;
-};
+/* Free map object definitions chain starting at "mod_start". */
+extern void free_map_object_defs(struct MapObjDef * mod_start);
-struct MonsterDef
-{
- struct MapObjDef map_obj_def;
- uint8_t corpse_id; /* ID of object type killed monster changes to. */
- uint8_t hitpoints_start; /* Hitpoints each monster starts with. */
-};
+/* 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);
-/* Initialize map object type definitions from file at path "filename". */
-extern void init_map_object_defs(struct World * world, char * filename);
+/* Write map objects chain to "file". */
+extern void write_map_objects(struct World * world, FILE * file);
-/* Build into memory starting at "start" chain of "n" map objects of type
- * "def_id".
+/* Read from "file" map objects chain; use "line" as char array for fgets() and
+ * expect strings of max. "linemax" length.
*/
-extern void * build_map_objects(struct World * world, void * start, char def_id,
- uint8_t n);
+extern void read_map_objects(struct World * world, FILE * file,
+ char * line, int linemax);
-/* Write to/read from file chain of map objects starting/to start in memory at
- * "start".
- */
-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);
+/* Free map objects in map object chain starting at "mo_start. */
+extern void free_map_objects(struct MapObj * mo_start);
+
+
+
+/* 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_obj_def(struct World * world, char def_id);
+extern struct MapObjDef * get_map_object_def(struct World * w, uint8_t id);