Network protocol documentation: Add 'can_zoom' to version 36

[dragonfireclient.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index f5f21388ce5faacc1553c89d3a58b5c849aad1e5..8c34a9719bb106c4f676c640c6ee0ad204fbfd26 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -19,12 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPGEN_HEADER
-#define MAPGEN_HEADER
+#pragma once
 
 #include "noise.h"
 #include "nodedef.h"
-#include "mapnode.h"
 #include "util/string.h"
 #include "util/container.h"
 
@@ -79,11 +77,11 @@ enum GenNotifyType {
        NUM_GENNOTIFY_TYPES
 };
 
-// TODO(hmmmm/paramat): make stone type selection dynamic
 enum MgStoneType {
        MGSTONE_STONE,
        MGSTONE_DESERT_STONE,
        MGSTONE_SANDSTONE,
+       MGSTONE_OTHER,
 };
 
 struct GenNotifyEvent {
@@ -94,7 +92,7 @@ struct GenNotifyEvent {
 
 class GenerateNotifier {
 public:
-       GenerateNotifier();
+       GenerateNotifier() = default;
        GenerateNotifier(u32 notify_on, std::set<u32> *notify_on_deco_ids);
 
        void setNotifyOn(u32 notify_on);
@@ -105,7 +103,7 @@ class GenerateNotifier {
                bool peek_events=false);
 
 private:
-       u32 m_notify_on;
+       u32 m_notify_on = 0;
        std::set<u32> *m_notify_on_deco_ids;
        std::list<GenNotifyEvent> m_notify_events;
 };
@@ -118,45 +116,38 @@ enum MapgenType {
        MAPGEN_FRACTAL,
        MAPGEN_VALLEYS,
        MAPGEN_SINGLENODE,
+       MAPGEN_CARPATHIAN,
        MAPGEN_INVALID,
 };
 
 struct MapgenParams {
-       MapgenType mgtype;
-       s16 chunksize;
-       u64 seed;
-       s16 water_level;
-       s16 mapgen_limit;
-       u32 flags;
-
-       BiomeParams *bparams;
-
-       MapgenParams() :
-               mgtype(MAPGEN_DEFAULT),
-               chunksize(5),
-               seed(0),
-               water_level(1),
-               mapgen_limit(MAX_MAP_GENERATION_LIMIT),
-               flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS),
-               bparams(NULL),
-               m_sao_limit_min(MAX_MAP_GENERATION_LIMIT * BS),
-               m_sao_limit_max(MAX_MAP_GENERATION_LIMIT * BS),
-               m_sao_limit_calculated(false)
-       {
-       }
-
+       MapgenParams() = default;
        virtual ~MapgenParams();
 
+       MapgenType mgtype = MAPGEN_DEFAULT;
+       s16 chunksize = 5;
+       u64 seed = 0;
+       s16 water_level = 1;
+       s16 mapgen_limit = MAX_MAP_GENERATION_LIMIT;
+       u32 flags = MG_CAVES | MG_LIGHT | MG_DECORATIONS;
+
+       BiomeParams *bparams = nullptr;
+
+       s16 mapgen_edge_min = -MAX_MAP_GENERATION_LIMIT;
+       s16 mapgen_edge_max = MAX_MAP_GENERATION_LIMIT;
+
        virtual void readParams(const Settings *settings);
        virtual void writeParams(Settings *settings) const;
 
        bool saoPosOverLimit(const v3f &p);
+       s32 getSpawnRangeMax();
+
 private:
        void calcMapgenEdges();
 
-       float m_sao_limit_min;
-       float m_sao_limit_max;
-       bool m_sao_limit_calculated;
+       float m_sao_limit_min = -MAX_MAP_GENERATION_LIMIT * BS;
+       float m_sao_limit_max = MAX_MAP_GENERATION_LIMIT * BS;
+       bool m_mapgen_edges_calculated = false;
 };
 
 
@@ -171,27 +162,27 @@ struct MapgenParams {
 */
 class Mapgen {
 public:
-       s32 seed;
-       int water_level;
-       int mapgen_limit;
-       u32 flags;
-       bool generating;
-       int id;
+       s32 seed = 0;
+       int water_level = 0;
+       int mapgen_limit = 0;
+       u32 flags = 0;
+       bool generating = false;
+       int id = -1;
 
-       MMVManip *vm;
-       INodeDefManager *ndef;
+       MMVManip *vm = nullptr;
+       INodeDefManager *ndef = nullptr;
 
        u32 blockseed;
-       s16 *heightmap;
-       biome_t *biomemap;
+       s16 *heightmap = nullptr;
+       biome_t *biomemap = nullptr;
        v3s16 csize;
 
-       BiomeGen *biomegen;
+       BiomeGen *biomegen = nullptr;
        GenerateNotifier gennotify;
 
-       Mapgen();
+       Mapgen() = default;
        Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-       virtual ~Mapgen();
+       virtual ~Mapgen() = default;
        DISABLE_CLASS_COPY(Mapgen);
 
        virtual MapgenType getType() const { return MAPGEN_INVALID; }
@@ -257,8 +248,10 @@ class MapgenBasic : public Mapgen {
 
        virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
        virtual bool generateCaverns(s16 max_stone_y);
-       virtual void generateDungeons(s16 max_stone_y, MgStoneType stone_type);
-       virtual MgStoneType generateBiomes();
+       virtual void generateDungeons(s16 max_stone_y,
+               MgStoneType stone_type, content_t biome_stone);
+       virtual void generateBiomes(MgStoneType *mgstone_type,
+               content_t *biome_stone, s16 biome_zero_level);
        virtual void dustTopNodes();
 
 protected:
@@ -302,6 +295,5 @@ class MapgenBasic : public Mapgen {
        float cavern_limit;
        float cavern_taper;
        float cavern_threshold;
+       int lava_depth;
 };
-
-#endif