Restructured chained objects on map via new ChainMapObject struct, allowing for great...

[plomrogue] / src / objects_on_map.h

diff --git a/src/objects_on_map.h b/src/objects_on_map.h
index ac3795dee4428d9b4ffefe74f5a15870b468f3e2..e9c7c65c6a11a7327b76d349a81ec1d021637d72 100644 (file)
--- a/src/objects_on_map.h
+++ b/src/objects_on_map.h
@@ -9,15 +9,17 @@ struct Map;
 struct Player {
   struct yx_uint16 pos; };
 
-struct Item {
-  struct Item * next;
-  char name;
+struct ChainMapObject {
+  void * next;
+  unsigned char name;
   struct yx_uint16 pos; };
 
+struct Item {
+  struct ChainMapObject cmo; };
+
 struct Monster {
-  struct Monster * next;
-  char name;
-  struct yx_uint16 pos; };
+  struct ChainMapObject cmo;
+  unsigned char hitpoints; };
 
 extern char is_passable (struct Map *, struct yx_uint16);
 extern struct yx_uint16 find_passable_pos (struct Map *);