Client: Fit interface_conf to new config file style. Also, refactorings.

[plomrogue] / src / server / map_objects.h

diff --git a/src/server/map_objects.h b/src/server/map_objects.h
index 7b6c6b2ed220cd42dedaa3f224b2bb51d368a05e..fdd11f91c9180cc4226e199ac3d1a0abba28cc8c 100644 (file)
--- a/src/server/map_objects.h
+++ b/src/server/map_objects.h
@@ -8,7 +8,7 @@
 #define MAP_OBJECTS_H
 
 #include <stdint.h> /* uint8_t */
-#include "../common/yx_uint16.h" /* yx_uint16 structs */
+#include "../common/yx_uint8.h" /* yx_uint8 structs */
 
 
 
@@ -16,7 +16,7 @@ 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 */
@@ -27,19 +27,17 @@ struct MapObj
 
 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 */
 };
 
 
 
-/* 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 +60,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);