Modernize client code (#6250)

[oweals/minetest.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index 9369a6c357f9b8898a94b9bce3ef283ebdc6b977..931622d3cb5b61d09554113db1e42f1576db25ad 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -79,11 +79,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 {
@@ -118,6 +118,7 @@ enum MapgenType {
        MAPGEN_FRACTAL,
        MAPGEN_VALLEYS,
        MAPGEN_SINGLENODE,
+       MAPGEN_CARPATHIAN,
        MAPGEN_INVALID,
 };
 
@@ -249,8 +250,10 @@ public:
 
        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: