diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/mapgen/mapgen_v6.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/mapgen/mapgen_v6.h')
| -rw-r--r-- | src/mapgen/mapgen_v6.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/mapgen/mapgen_v6.h b/src/mapgen/mapgen_v6.h index ff565edec..a0abbb010 100644 --- a/src/mapgen/mapgen_v6.h +++ b/src/mapgen/mapgen_v6.h @@ -33,17 +33,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MGV6_FREQ_JUNGLE 0.5 //////////// Mapgen V6 flags -#define MGV6_JUNGLES 0x01 +#define MGV6_JUNGLES 0x01 #define MGV6_BIOMEBLEND 0x02 -#define MGV6_MUDFLOW 0x04 +#define MGV6_MUDFLOW 0x04 #define MGV6_SNOWBIOMES 0x08 -#define MGV6_FLAT 0x10 -#define MGV6_TREES 0x20 - +#define MGV6_FLAT 0x10 +#define MGV6_TREES 0x20 extern FlagDesc flagdesc_mapgen_v6[]; - enum BiomeV6Type { BT_NORMAL, @@ -53,8 +51,8 @@ enum BiomeV6Type BT_TAIGA, }; - -struct MapgenV6Params : public MapgenParams { +struct MapgenV6Params : public MapgenParams +{ float freq_desert = 0.45f; float freq_beach = 0.15f; s16 dungeon_ymin = -31000; @@ -80,8 +78,8 @@ struct MapgenV6Params : public MapgenParams { void setDefaultSettings(Settings *settings); }; - -class MapgenV6 : public Mapgen { +class MapgenV6 : public Mapgen +{ public: EmergeParams *m_emerge; @@ -142,8 +140,8 @@ public: int getGroundLevelAtPoint(v2s16 p); int getSpawnLevelAtPoint(v2s16 p); - float baseTerrainLevel(float terrain_base, float terrain_higher, - float steepness, float height_select); + float baseTerrainLevel(float terrain_base, float terrain_higher, float steepness, + float height_select); virtual float baseTerrainLevelFromNoise(v2s16 p); virtual float baseTerrainLevelFromMap(v2s16 p); virtual float baseTerrainLevelFromMap(int index); @@ -168,8 +166,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 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); |