summaryrefslogtreecommitdiffstats
path: root/source/Generating/ComposableGenerator.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-24 17:08:20 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-24 17:08:20 +0100
commitae371e891f4035551e8c5baebb3cc0ba1a845ac2 (patch)
treef624d50390164d2c999f8ef8fa80f9099d4e4c6a /source/Generating/ComposableGenerator.cpp
parentFixed rounding error in MultiStepMap BioGen, introduced in rev 1289. (diff)
downloadcuberite-ae371e891f4035551e8c5baebb3cc0ba1a845ac2.tar
cuberite-ae371e891f4035551e8c5baebb3cc0ba1a845ac2.tar.gz
cuberite-ae371e891f4035551e8c5baebb3cc0ba1a845ac2.tar.bz2
cuberite-ae371e891f4035551e8c5baebb3cc0ba1a845ac2.tar.lz
cuberite-ae371e891f4035551e8c5baebb3cc0ba1a845ac2.tar.xz
cuberite-ae371e891f4035551e8c5baebb3cc0ba1a845ac2.tar.zst
cuberite-ae371e891f4035551e8c5baebb3cc0ba1a845ac2.zip
Diffstat (limited to 'source/Generating/ComposableGenerator.cpp')
-rw-r--r--source/Generating/ComposableGenerator.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/Generating/ComposableGenerator.cpp b/source/Generating/ComposableGenerator.cpp
index 214b587af..b809b249d 100644
--- a/source/Generating/ComposableGenerator.cpp
+++ b/source/Generating/ComposableGenerator.cpp
@@ -135,8 +135,8 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
AString BiomeGenName = a_IniFile.GetValueSet("Generator", "BiomeGen", "");
if (BiomeGenName.empty())
{
- LOGWARN("[Generator]::BiomeGen value not found in world.ini, using \"DistortedVoronoi\".");
- BiomeGenName = "DistortedVoronoi";
+ LOGWARN("[Generator]::BiomeGen value not found in world.ini, using \"MultiStepMap\".");
+ BiomeGenName = "MultiStepMap";
}
int Seed = m_ChunkGenerator.GetSeed();
@@ -155,17 +155,17 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
{
m_BiomeGen = new cBioGenVoronoi(Seed);
}
- else if (NoCaseCompare(BiomeGenName, "multistepmap") == 0)
+ else if (NoCaseCompare(BiomeGenName, "distortedvoronoi") == 0)
{
- m_BiomeGen = new cBioGenMultiStepMap(Seed);
+ m_BiomeGen = new cBioGenDistortedVoronoi(Seed);
}
else
{
- if (NoCaseCompare(BiomeGenName, "distortedvoronoi") != 0)
+ if (NoCaseCompare(BiomeGenName, "multistepmap") != 0)
{
- LOGWARNING("Unknown BiomeGen \"%s\", using \"DistortedVoronoi\" instead.", BiomeGenName.c_str());
+ LOGWARNING("Unknown BiomeGen \"%s\", using \"MultiStepMap\" instead.", BiomeGenName.c_str());
}
- m_BiomeGen = new cBioGenDistortedVoronoi(Seed);
+ m_BiomeGen = new cBioGenMultiStepMap(Seed);
}
// Add a cache, if requested:
@@ -302,7 +302,7 @@ void cComposableGenerator::InitCompositionGen(cIniFile & a_IniFile)
void cComposableGenerator::InitStructureGens(cIniFile & a_IniFile)
{
- AString Structures = a_IniFile.GetValueSet("Generator", "Structures", "Ravines,WormNestCaves,OreNests,Trees");
+ AString Structures = a_IniFile.GetValueSet("Generator", "Structures", "Ravines, WormNestCaves, WaterLakes, LavaLakes, OreNests, Trees");
int Seed = m_ChunkGenerator.GetSeed();
AStringVector Str = StringSplitAndTrim(Structures, ",");