diff options
| author | Weblate <42@minetest.ru> | 2013-02-08 16:29:19 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-02-08 16:29:19 +0100 |
| commit | a27857e9382fb65140748dbbefb73a463827d4d6 (patch) | |
| tree | 72bf4dfbd030f04d94573d793aa150574eb9839d /src/mapgen.h | |
| parent | 0cda2d5193a80b32d3cae8a54d5866cbd3308592 (diff) | |
| parent | 9b2044351fb3a18e47eec01e9b574aa86485c101 (diff) | |
| download | minetest-a27857e9382fb65140748dbbefb73a463827d4d6.tar.gz minetest-a27857e9382fb65140748dbbefb73a463827d4d6.tar.bz2 minetest-a27857e9382fb65140748dbbefb73a463827d4d6.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/mapgen.h')
| -rw-r--r-- | src/mapgen.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mapgen.h b/src/mapgen.h index 728290ffc..4f1ab4ebd 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MG_DUNGEONS 0x04 #define MGV6_FORESTS 0x08 #define MGV6_BIOME_BLEND 0x10 +#define MG_FLAT 0x20 class BiomeDefManager; class Biome; @@ -121,8 +122,9 @@ public: Mapgen *getMapgen(); void addBlockToQueue(); - bool registerMapgen(std::string name, MapgenFactory *mgfactory); + void registerMapgen(std::string name, MapgenFactory *mgfactory); MapgenParams *getParamsFromSettings(Settings *settings); + void setParamsToSettings(Settings *settings); //mapgen helper methods Biome *getBiomeAtPoint(v3s16 p); |