Remove blank default values for emergequeue_limit_* settings

[dragonfireclient.git] / src / mapgen.cpp

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 3d5c7b3ccb2a3261eec2317c3dd869e6f058786a..d97c3e609020a26bb6ae1fbb982058b92e164c11 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -39,12 +39,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/serialize.h"
 #include "filesys.h"
 
+
 FlagDesc flagdesc_mapgen[] = {
        {"trees",          MG_TREES},
        {"caves",          MG_CAVES},
        {"dungeons",       MG_DUNGEONS},
-       {"v6_jungles",     MGV6_JUNGLES},
-       {"v6_biome_blend", MGV6_BIOME_BLEND},
        {"flat",           MG_FLAT},
        {"nolight",        MG_NOLIGHT},
        {NULL,             0}
@@ -788,6 +787,7 @@ bool DecoSchematic::loadSchematicFile() {
        Version changes:
        1 - Initial version
        2 - Fixed messy never/always place; 0 probability is now never, 0xFF is always
+       3 - Added y-slice probabilities; this allows for variable height structures
 */
 void DecoSchematic::saveSchematicFile(INodeDefManager *ndef) {
        std::ostringstream ss(std::ios_base::binary);
@@ -1122,71 +1122,3 @@ void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax) {
                vm->spreadLight(bank, light_sources, ndef);
        }
 }
-
-
-//////////////////////// Mapgen V6 parameter read/write
-
-bool MapgenV6Params::readParams(Settings *settings) {
-       freq_desert = settings->getFloat("mgv6_freq_desert");
-       freq_beach  = settings->getFloat("mgv6_freq_beach");
-
-       bool success =
-               settings->getNoiseParams("mgv6_np_terrain_base",   np_terrain_base)   &&
-               settings->getNoiseParams("mgv6_np_terrain_higher", np_terrain_higher) &&
-               settings->getNoiseParams("mgv6_np_steepness",      np_steepness)      &&
-               settings->getNoiseParams("mgv6_np_height_select",  np_height_select)  &&
-               settings->getNoiseParams("mgv6_np_mud",            np_mud)            &&
-               settings->getNoiseParams("mgv6_np_beach",          np_beach)          &&
-               settings->getNoiseParams("mgv6_np_biome",          np_biome)          &&
-               settings->getNoiseParams("mgv6_np_cave",           np_cave)           &&
-               settings->getNoiseParams("mgv6_np_humidity",       np_humidity)       &&
-               settings->getNoiseParams("mgv6_np_trees",          np_trees)          &&
-               settings->getNoiseParams("mgv6_np_apple_trees",    np_apple_trees);
-       return success;
-}
-
-
-void MapgenV6Params::writeParams(Settings *settings) {
-       settings->setFloat("mgv6_freq_desert", freq_desert);
-       settings->setFloat("mgv6_freq_beach",  freq_beach);
-
-       settings->setNoiseParams("mgv6_np_terrain_base",   np_terrain_base);
-       settings->setNoiseParams("mgv6_np_terrain_higher", np_terrain_higher);
-       settings->setNoiseParams("mgv6_np_steepness",      np_steepness);
-       settings->setNoiseParams("mgv6_np_height_select",  np_height_select);
-       settings->setNoiseParams("mgv6_np_mud",            np_mud);
-       settings->setNoiseParams("mgv6_np_beach",          np_beach);
-       settings->setNoiseParams("mgv6_np_biome",          np_biome);
-       settings->setNoiseParams("mgv6_np_cave",           np_cave);
-       settings->setNoiseParams("mgv6_np_humidity",       np_humidity);
-       settings->setNoiseParams("mgv6_np_trees",          np_trees);
-       settings->setNoiseParams("mgv6_np_apple_trees",    np_apple_trees);
-}
-
-
-bool MapgenV7Params::readParams(Settings *settings) {
-       bool success =
-               settings->getNoiseParams("mgv7_np_terrain_base",    np_terrain_base)    &&
-               settings->getNoiseParams("mgv7_np_terrain_alt",     np_terrain_alt)     &&
-               settings->getNoiseParams("mgv7_np_terrain_persist", np_terrain_persist) &&
-               settings->getNoiseParams("mgv7_np_height_select",   np_height_select)   &&
-               settings->getNoiseParams("mgv7_np_filler_depth",    np_filler_depth)    &&
-               settings->getNoiseParams("mgv7_np_mount_height",    np_mount_height)    &&
-               settings->getNoiseParams("mgv7_np_ridge_uwater",    np_ridge_uwater)    &&
-               settings->getNoiseParams("mgv7_np_mountain",        np_mountain)        &&
-               settings->getNoiseParams("mgv7_np_ridge",           np_ridge);
-       return success;
-}
-
-
-void MapgenV7Params::writeParams(Settings *settings) {
-       settings->setNoiseParams("mgv7_np_terrain_base",    np_terrain_base);
-       settings->setNoiseParams("mgv7_np_terrain_alt",     np_terrain_alt);
-       settings->setNoiseParams("mgv7_np_terrain_persist", np_terrain_persist);
-       settings->setNoiseParams("mgv7_np_height_select",   np_height_select);
-       settings->setNoiseParams("mgv7_np_filler_depth",    np_filler_depth);
-       settings->setNoiseParams("mgv7_np_mount_height",    np_mount_height);
-       settings->setNoiseParams("mgv7_np_ridge_uwater",    np_ridge_uwater);
-       settings->setNoiseParams("mgv7_np_mountain",        np_mountain);
-       settings->setNoiseParams("mgv7_np_ridge",           np_ridge);
-}