Set server_announce to world.mt and respect modes when changing subgame

[minetest.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index c061c5d8a143fe166448196458f744cde9e361a7..b0758ba417ba809d0e0f4b724a3f382a302d8ae9 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -70,6 +70,13 @@ enum GenNotifyType {
        NUM_GENNOTIFY_TYPES
 };
 
+// TODO(hmmmm/paramat): make stone type selection dynamic
+enum MgStoneType {
+       STONE,
+       DESERT_STONE,
+       SANDSTONE,
+};
+
 struct GenNotifyEvent {
        GenNotifyType type;
        v3s16 pos;
@@ -91,7 +98,7 @@ class GenerateNotifier {
 private:
        u32 m_notify_on;
        std::set<u32> *m_notify_on_deco_ids;
-       std::vector<GenNotifyEvent> m_notify_events;
+       std::list<GenNotifyEvent> m_notify_events;
 };
 
 struct MapgenSpecificParams {
@@ -108,7 +115,9 @@ struct MapgenParams {
        u32 flags;
 
        NoiseParams np_biome_heat;
+       NoiseParams np_biome_heat_blend;
        NoiseParams np_biome_humidity;
+       NoiseParams np_biome_humidity_blend;
 
        MapgenSpecificParams *sparams;
 
@@ -118,8 +127,10 @@ struct MapgenParams {
                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)),
+               np_biome_heat(NoiseParams(50, 50, v3f(1000.0, 1000.0, 1000.0), 5349, 3, 0.5, 2.0)),
+               np_biome_heat_blend(NoiseParams(0, 1.5, v3f(8.0, 8.0, 8.0), 13, 2, 1.0, 2.0)),
+               np_biome_humidity(NoiseParams(50, 50, v3f(1000.0, 1000.0, 1000.0), 842, 3, 0.5, 2.0)),
+               np_biome_humidity_blend(NoiseParams(0, 1.5, v3f(8.0, 8.0, 8.0), 90003, 2, 1.0, 2.0)),
                sparams(NULL)
        {}
 
@@ -141,6 +152,8 @@ class Mapgen {
        u32 blockseed;
        s16 *heightmap;
        u8 *biomemap;
+       float *heatmap;
+       float *humidmap;
        v3s16 csize;
 
        GenerateNotifier gennotify;
@@ -179,34 +192,4 @@ struct MapgenFactory {
        virtual ~MapgenFactory() {}
 };
 
-class GenElement {
-public:
-       virtual ~GenElement() {}
-       u32 id;
-       std::string name;
-};
-
-class GenElementManager {
-public:
-       static const char *ELEMENT_TITLE;
-       static const size_t ELEMENT_LIMIT = -1;
-
-       GenElementManager(IGameDef *gamedef);
-       virtual ~GenElementManager();
-
-       virtual GenElement *create(int type) = 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 GenElement *getByName(const std::string &name);
-
-protected:
-       INodeDefManager *m_ndef;
-       std::vector<GenElement *> m_elements;
-};
-
 #endif