Fix alpha for liquid nodes (#5494)

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

diff --git a/src/mapgen_flat.h b/src/mapgen_flat.h
index ffec4b92482a66bf80dc638dbbcbd68ebd59d845..7a669632933f146d2fc9a82829bb8ea3b574f01d 100644 (file)
--- a/src/mapgen_flat.h
+++ b/src/mapgen_flat.h
@@ -31,8 +31,8 @@ class BiomeManager;
 
 extern FlagDesc flagdesc_mapgen_flat[];
 
-
-struct MapgenFlatParams : public MapgenSpecificParams {
+struct MapgenFlatParams : public MapgenParams
+{
        u32 spflags;
        s16 ground_level;
        s16 large_cave_depth;
@@ -53,11 +53,14 @@ struct MapgenFlatParams : public MapgenSpecificParams {
        void writeParams(Settings *settings) const;
 };
 
-class MapgenFlat : public MapgenBasic {
+class MapgenFlat : public MapgenBasic
+{
 public:
-       MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge);
        ~MapgenFlat();
 
+       virtual MapgenType getType() const { return MAPGEN_FLAT; }
+
        virtual void makeChunk(BlockMakeData *data);
        int getSpawnLevelAtPoint(v2s16 p);
        s16 generateTerrain();
@@ -70,24 +73,6 @@ private:
        float hill_threshold;
        float hill_steepness;
        Noise *noise_terrain;
-
-       content_t c_cobble;
-       content_t c_stair_cobble;
-       content_t c_mossycobble;
-       content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
-};
-
-struct MapgenFactoryFlat : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenFlat(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenFlatParams();
-       };
 };
 
 #endif