MSVC: Generate debug information for release builds (#4674)

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index aee171b48c84178a4bf6f5a800fc0b5209ad64d5..3a6bc0801c86238a9bb7cab7d4ff08bcafb6b350 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -32,7 +32,7 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_v7[];
 
 
-struct MapgenV7Params : public MapgenSpecificParams {
+struct MapgenV7Params : public MapgenParams {
        u32 spflags;
        float cave_width;
        NoiseParams np_terrain_base;
@@ -56,9 +56,11 @@ struct MapgenV7Params : public MapgenSpecificParams {
 
 class MapgenV7 : public MapgenBasic {
 public:
-       MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
        ~MapgenV7();
 
+       virtual MapgenType getType() const { return MAPGEN_V7; }
+
        virtual void makeChunk(BlockMakeData *data);
        int getSpawnLevelAtPoint(v2s16 p);
 
@@ -78,24 +80,6 @@ class MapgenV7 : public MapgenBasic {
        Noise *noise_ridge_uwater;
        Noise *noise_mountain;
        Noise *noise_ridge;
-
-       content_t c_cobble;
-       content_t c_stair_cobble;
-       content_t c_mossycobble;
-       content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
-};
-
-struct MapgenFactoryV7 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenV7(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenV7Params();
-       };
 };
 
 #endif