LocalPlayer::accelerateHorizontal: cleanups

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

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index 20b0bf92ecc6a89af65ec3f4905c51f8ec95f98c..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
@@ -53,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;
@@ -123,8 +126,9 @@ 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; }
@@ -159,6 +163,8 @@ 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);