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_v7.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/mapgen/mapgen_v7.h')
| -rw-r--r-- | src/mapgen/mapgen_v7.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mapgen/mapgen_v7.h b/src/mapgen/mapgen_v7.h index 4020cd935..b51ff10ce 100644 --- a/src/mapgen/mapgen_v7.h +++ b/src/mapgen/mapgen_v7.h @@ -23,18 +23,18 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen.h" ///////////// Mapgen V7 flags -#define MGV7_MOUNTAINS 0x01 -#define MGV7_RIDGES 0x02 -#define MGV7_FLOATLANDS 0x04 -#define MGV7_CAVERNS 0x08 +#define MGV7_MOUNTAINS 0x01 +#define MGV7_RIDGES 0x02 +#define MGV7_FLOATLANDS 0x04 +#define MGV7_CAVERNS 0x08 #define MGV7_BIOMEREPEAT 0x10 // Now unused class BiomeManager; extern FlagDesc flagdesc_mapgen_v7[]; - -struct MapgenV7Params : public MapgenParams { +struct MapgenV7Params : public MapgenParams +{ s16 mount_zero_level = 0; s16 floatland_ymin = 1024; s16 floatland_ymax = 4096; @@ -79,8 +79,8 @@ struct MapgenV7Params : public MapgenParams { void setDefaultSettings(Settings *settings); }; - -class MapgenV7 : public MapgenBasic { +class MapgenV7 : public MapgenBasic +{ public: MapgenV7(MapgenV7Params *params, EmergeParams *emerge); ~MapgenV7(); |