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_valleys.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/mapgen/mapgen_valleys.h')
| -rw-r--r-- | src/mapgen/mapgen_valleys.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/mapgen/mapgen_valleys.h b/src/mapgen/mapgen_valleys.h index 34a923dfa..fb544e51b 100644 --- a/src/mapgen/mapgen_valleys.h +++ b/src/mapgen/mapgen_valleys.h @@ -24,23 +24,22 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #pragma once #include "mapgen.h" -#define MGVALLEYS_ALT_CHILL 0x01 -#define MGVALLEYS_HUMID_RIVERS 0x02 +#define MGVALLEYS_ALT_CHILL 0x01 +#define MGVALLEYS_HUMID_RIVERS 0x02 #define MGVALLEYS_VARY_RIVER_DEPTH 0x04 -#define MGVALLEYS_ALT_DRY 0x08 +#define MGVALLEYS_ALT_DRY 0x08 class BiomeManager; class BiomeGenOriginal; extern FlagDesc flagdesc_mapgen_valleys[]; - -struct MapgenValleysParams : public MapgenParams { +struct MapgenValleysParams : public MapgenParams +{ u16 altitude_chill = 90; u16 river_depth = 4; u16 river_size = 5; @@ -79,12 +78,10 @@ struct MapgenValleysParams : public MapgenParams { void setDefaultSettings(Settings *settings); }; - -class MapgenValleys : public MapgenBasic { +class MapgenValleys : public MapgenBasic +{ public: - - MapgenValleys(MapgenValleysParams *params, - EmergeParams *emerge); + MapgenValleys(MapgenValleysParams *params, EmergeParams *emerge); ~MapgenValleys(); virtual MapgenType getType() const { return MAPGEN_VALLEYS; } |