diff options
author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/mapgen/mapgen_v7.h | |
parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.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 b51ff10ce..4020cd935 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(); |