Mgv6 mudflow: Avoid partially removed stacked decorations

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

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index a55fc6d534083dd458a6f38f26f1b05692c65397..9d36804d0a179526a826e4e53957aaa99d96bebd 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -1,6 +1,8 @@
 /*
 Minetest
 Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2017 paramat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -53,7 +55,7 @@ enum BiomeV6Type
 };
 
 
-struct MapgenV6Params : public MapgenSpecificParams {
+struct MapgenV6Params : public MapgenParams {
        u32 spflags;
        float freq_desert;
        float freq_beach;
@@ -123,10 +125,13 @@ public:
        content_t c_cobble;
        content_t c_mossycobble;
        content_t c_stair_cobble;
+       content_t c_stair_desert_stone;
 
-       MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
        ~MapgenV6();
 
+       virtual MapgenType getType() const { return MAPGEN_V6; }
+
        void makeChunk(BlockMakeData *data);
        int getGroundLevelAtPoint(v2s16 p);
        int getSpawnLevelAtPoint(v2s16 p);
@@ -157,23 +162,11 @@ public:
        int generateGround();
        void addMud();
        void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos);
+       void moveMud(u32 remove_index, u32 place_index,
+               u32 above_remove_index, v2s16 pos, v3s16 em);
        void growGrass();
        void placeTreesAndJungleGrass();
        virtual void generateCaves(int max_stone_y);
 };
 
-
-struct MapgenFactoryV6 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenV6(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenV6Params();
-       };
-};
-
-
 #endif