m_active_object_messages is used like a queue. Use std::queue instead of std::list...

[minetest.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index 5bbdd724dd139fbb6c4934575c34adcce19970d9..ee7e8227e98162727cb3d80e025d37e99dea9626 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -95,8 +95,8 @@ class GenerateNotifier {
 };
 
 struct MapgenSpecificParams {
-       virtual void readParams(Settings *settings) = 0;
-       virtual void writeParams(Settings *settings) = 0;
+       virtual void readParams(const Settings *settings) = 0;
+       virtual void writeParams(Settings *settings) const = 0;
        virtual ~MapgenSpecificParams() {}
 };
 
@@ -112,17 +112,19 @@ struct MapgenParams {
 
        MapgenSpecificParams *sparams;
 
-       MapgenParams()
-       {
-               mg_name     = DEFAULT_MAPGEN;
-               seed        = 0;
-               water_level = 1;
-               chunksize   = 5;
-               flags       = MG_TREES | MG_CAVES | MG_LIGHT;
-               sparams     = NULL;
-               np_biome_heat     = NoiseParams(50, 50, v3f(500.0, 500.0, 500.0), 5349, 3, 0.5, 2.0);
-               np_biome_humidity = NoiseParams(50, 50, v3f(500.0, 500.0, 500.0), 842, 3, 0.5, 2.0);
-       }
+       MapgenParams() :
+               mg_name(DEFAULT_MAPGEN),
+               chunksize(5),
+               seed(0),
+               water_level(1),
+               flags(MG_TREES | MG_CAVES | MG_LIGHT),
+               np_biome_heat(NoiseParams(50, 50, v3f(500.0, 500.0, 500.0), 5349, 3, 0.5, 2.0)),
+               np_biome_humidity(NoiseParams(50, 50, v3f(500.0, 500.0, 500.0), 842, 3, 0.5, 2.0)),
+               sparams(NULL)
+       {}
+
+       void load(const Settings &settings);
+       void save(Settings &settings) const;
 };
 
 class Mapgen {
@@ -177,34 +179,69 @@ struct MapgenFactory {
        virtual ~MapgenFactory() {}
 };
 
-class GenElement {
+typedef std::map<std::string, std::string> StringMap;
+typedef u32 ObjDefHandle;
+
+#define OBJDEF_INVALID_INDEX ((u32)(-1))
+#define OBJDEF_INVALID_HANDLE 0
+#define OBJDEF_HANDLE_SALT 0x00585e6fu
+#define OBJDEF_MAX_ITEMS (1 << 18)
+#define OBJDEF_UID_MASK ((1 << 7) - 1)
+
+enum ObjDefType {
+       OBJDEF_GENERIC,
+       OBJDEF_BIOME,
+       OBJDEF_ORE,
+       OBJDEF_DECORATION,
+       OBJDEF_SCHEMATIC,
+};
+
+class ObjDef {
 public:
-       virtual ~GenElement() {}
-       u32 id;
+       virtual ~ObjDef() {}
+
+       u32 index;
+       u32 uid;
+       ObjDefHandle handle;
        std::string name;
 };
 
-class GenElementManager {
+class ObjDefManager {
 public:
-       static const char *ELEMENT_TITLE;
-       static const size_t ELEMENT_LIMIT = -1;
-
-       GenElementManager(IGameDef *gamedef);
-       virtual ~GenElementManager();
+       ObjDefManager(IGameDef *gamedef, ObjDefType type);
+       virtual ~ObjDefManager();
 
-       virtual GenElement *create(int type) = 0;
+       virtual const char *getObjectTitle() const = 0;
 
-       virtual u32 add(GenElement *elem);
-       virtual GenElement *get(u32 id);
-       virtual GenElement *update(u32 id, GenElement *elem);
-       virtual GenElement *remove(u32 id);
        virtual void clear();
+       virtual ObjDef *getByName(const std::string &name) const;
+
+       //// Add new/get/set object definitions by handle
+       virtual ObjDefHandle add(ObjDef *obj);
+       virtual ObjDef *get(ObjDefHandle handle) const;
+       virtual ObjDef *set(ObjDefHandle handle, ObjDef *obj);
+
+       //// Raw variants that work on indexes
+       virtual u32 addRaw(ObjDef *obj);
+
+       // It is generally assumed that getRaw() will always return a valid object
+       // This won't be true if people do odd things such as call setRaw() with NULL
+       virtual ObjDef *getRaw(u32 index) const;
+       virtual ObjDef *setRaw(u32 index, ObjDef *obj);
+
+       size_t getNumObjects() const { return m_objects.size(); }
+       ObjDefType getType() const { return m_objtype; }
+       INodeDefManager *getNodeDef() const { return m_ndef; }
 
-       virtual GenElement *getByName(const std::string &name);
+       u32 validateHandle(ObjDefHandle handle) const;
+       static ObjDefHandle createHandle(u32 index, ObjDefType type, u32 uid);
+       static bool decodeHandle(ObjDefHandle handle, u32 *index,
+               ObjDefType *type, u32 *uid);
 
 protected:
        INodeDefManager *m_ndef;
-       std::vector<GenElement *> m_elements;
+       std::vector<ObjDef *> m_objects;
+       ObjDefType m_objtype;
 };
 
 #endif