LocalPlayer::accelerateHorizontal: cleanups

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

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index dec92ab48bbaec778f417777f606c95923f9ed5b..4a885e2c564cadf78e347b4c3782a5a013b2162d 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
@@ -37,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MGV6_MUDFLOW    0x04
 #define MGV6_SNOWBIOMES 0x08
 #define MGV6_FLAT       0x10
+#define MGV6_TREES      0x20
 
 
 extern FlagDesc flagdesc_mapgen_v6[];
@@ -52,10 +55,11 @@ enum BiomeV6Type
 };
 
 
-struct MapgenV6Params : public MapgenSpecificParams {
-       u32 spflags;
-       float freq_desert;
-       float freq_beach;
+struct MapgenV6Params : public MapgenParams {
+       u32 spflags = MGV6_JUNGLES | MGV6_SNOWBIOMES | MGV6_TREES |
+               MGV6_BIOMEBLEND | MGV6_MUDFLOW;
+       float freq_desert = 0.45f;
+       float freq_beach = 0.15f;
        NoiseParams np_terrain_base;
        NoiseParams np_terrain_higher;
        NoiseParams np_steepness;
@@ -122,12 +126,16 @@ 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);
 
        float baseTerrainLevel(float terrain_base, float terrain_higher,
                float steepness, float height_select);
@@ -155,23 +163,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