Fix crash on attaching player to entity

[minetest.git] / src / mapgen_v5.h

diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index dd5ca0a317b9bae7a1a4b2ad98f9f25b365d82b5..ddb090a9c4a06af16bd3ace7d5e93de82bb9045f 100644 (file)
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -30,7 +30,7 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_v5[];
 
 
-struct MapgenV5Params : public MapgenSpecificParams {
+struct MapgenV5Params : public MapgenParams {
        u32 spflags;
        float cave_width;
        NoiseParams np_filler_depth;
@@ -50,39 +50,19 @@ struct MapgenV5Params : public MapgenSpecificParams {
 
 class MapgenV5 : public MapgenBasic {
 public:
-       u32 spflags;
-       Noise *noise_factor;
-       Noise *noise_height;
-       Noise *noise_ground;
-
-       content_t c_lava_source;
-       content_t c_ice;
-
-       content_t c_cobble;
-       content_t c_stair_cobble;
-       content_t c_mossycobble;
-       content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
-
-       MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge);
        ~MapgenV5();
 
+       virtual MapgenType getType() const { return MAPGEN_V5; }
+
        virtual void makeChunk(BlockMakeData *data);
        int getSpawnLevelAtPoint(v2s16 p);
        int generateBaseTerrain();
-};
-
-
-struct MapgenFactoryV5 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenV5(mgid, params, emerge);
-       };
 
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenV5Params();
-       };
+private:
+       Noise *noise_factor;
+       Noise *noise_height;
+       Noise *noise_ground;
 };
 
 #endif