X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fmap_objects.h;h=d18e3c259f4df1f422420dc77da12a34c4ee74e2;hb=639a12151eeb7ce0d18de330b4bb8d9d8094c4d3;hp=0796c3c02d4db02f476922ee5bb88d7622607b69;hpb=6052be616897d692fc57ab15b56266b4b3f4668b;p=plomrogue
diff --git a/src/server/map_objects.h b/src/server/map_objects.h
index 0796c3c..d18e3c2 100644
--- a/src/server/map_objects.h
+++ b/src/server/map_objects.h
@@ -8,7 +8,7 @@
#define MAP_OBJECTS_H
#include /* uint8_t */
-#include "../common/yx_uint16.h" /* yx_uint16 structs */
+#include "../common/yx_uint8.h" /* yx_uint8 structs */
@@ -16,30 +16,29 @@ struct MapObj
{
struct MapObj * next; /* pointer to next one in map object chain */
struct MapObj * owns; /* chain of map objects owned / in inventory */
- struct yx_uint16 pos; /* coordinate on map */
+ struct yx_uint8 pos; /* coordinate on map */
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 */
- uint8_t command; /* map object's current action */
+ uint8_t command; /* map object's current action; 0 if none */
uint8_t arg; /* optional field for .command argument */
uint8_t progress; /* turns already passed to realize .command */
};
struct MapObjDef
{
+ uint8_t id; /* map object definition identifier / sets .type */
struct MapObjDef * next;
char char_on_map; /* map object symbol to appear on map */
char * name; /* string to describe object in game log */
- uint8_t id; /* map object definition identifier / sets .type */
uint8_t corpse_id; /* type to change map object into upon destruction */
uint8_t lifepoints; /* default start value for map object's .lifepoints */
+ uint8_t consumable; /* can be eaten if !0, for so much hitpoint win */
+ uint8_t start_n; /* how many of these does the map start with? */
};
-/* Initialize map object definitions chain. */
-extern void init_map_object_defs();
-
/* Free map object definitions chain starting at "mod_start". */
extern void free_map_object_defs(struct MapObjDef * mod_start);
@@ -62,7 +61,7 @@ extern struct MapObj * get_player();
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);
+extern void set_object_position(struct MapObj * mo, struct yx_uint8 pos);