X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fmap_objects.h;h=80e7c0f0cdad7795c06ba46a4fee0ab200b98381;hb=d165f8ae619c78fd1ef98a9ba2abdaeeceff853e;hp=6f3772e5272fd858760d6d4218032a6784c163ce;hpb=8661a8acfacc7cdd2935732fe5ead7d279a200b0;p=plomrogue

diff --git a/src/map_objects.h b/src/map_objects.h
index 6f3772e..80e7c0f 100644
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -1,5 +1,5 @@
-#ifndef ACTORS_H
-#define ACTORS_H
+#ifndef MAP_OBJECTS_H
+#define MAP_OBJECTS_H
 
 #include <stdio.h>
 #include "yx_uint16.h"
@@ -11,26 +11,41 @@ struct Player {
   struct yx_uint16 pos;
   unsigned char hitpoints; };
 
-struct ChainMapObject {
+struct MapObj {
   void * next;
-  unsigned char name;
+  char type;
   struct yx_uint16 pos; };
 
+struct MapObjDef {
+  struct MapObjDef * next;
+  char id;
+  char mapchar;
+  char * desc; };
+
 struct Item {
-  struct ChainMapObject cmo; };
+  struct MapObj map_obj; };
 
 struct Monster {
-  struct ChainMapObject cmo;
+  struct MapObj map_obj;
   unsigned char hitpoints; };
 
+struct ItemDef {
+  struct MapObjDef map_obj_def; };
+
+struct MonsterDef {
+  struct MapObjDef map_obj_def;
+  unsigned char hitpoints_start; };
+
 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 void build_map_objects_monsterdata (struct MapObjDef *, void *);
+extern void build_map_objects_itemdata (struct MapObjDef *, void *);
+extern void * build_map_objects (struct World *, void *, char, unsigned char, size_t,
+                                 void (*) (struct MapObjDef *, void *));
+extern struct MapObjDef * get_map_obj_def (struct World *, char);
 
 extern struct yx_uint16 find_passable_pos (struct Map *);
 extern char is_passable (struct Map *, struct yx_uint16);