summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-14 23:26:15 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-14 23:26:15 +0200
commitd4f8a057ddfef83d364f3fd6557b8159f5b38390 (patch)
tree0c82254c770e8287b64de674b9f3120a927fb723 /source
parentOkay, changed to xoft's partial fix (diff)
downloadcuberite-d4f8a057ddfef83d364f3fd6557b8159f5b38390.tar
cuberite-d4f8a057ddfef83d364f3fd6557b8159f5b38390.tar.gz
cuberite-d4f8a057ddfef83d364f3fd6557b8159f5b38390.tar.bz2
cuberite-d4f8a057ddfef83d364f3fd6557b8159f5b38390.tar.lz
cuberite-d4f8a057ddfef83d364f3fd6557b8159f5b38390.tar.xz
cuberite-d4f8a057ddfef83d364f3fd6557b8159f5b38390.tar.zst
cuberite-d4f8a057ddfef83d364f3fd6557b8159f5b38390.zip
Diffstat (limited to 'source')
-rw-r--r--source/Generating/ComposableGenerator.cpp12
-rw-r--r--source/World.cpp4
2 files changed, 8 insertions, 8 deletions
diff --git a/source/Generating/ComposableGenerator.cpp b/source/Generating/ComposableGenerator.cpp
index 94f822420..0852f559e 100644
--- a/source/Generating/ComposableGenerator.cpp
+++ b/source/Generating/ComposableGenerator.cpp
@@ -147,10 +147,10 @@ void cComposableGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a
void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
{
- AString BiomeGenName = a_IniFile.GetValueSet("Generator", "BiomeGen", "MultiStepMap");
+ AString BiomeGenName = a_IniFile.GetValueSet("Generator", "BiomeGen", "");
if (BiomeGenName.empty())
{
- LOGWARN("[Generator]::BiomeGen value not found in world.ini, using \"MultiStepMap\".");
+ LOGWARN("[Generator] BiomeGen value not set in world.ini, using \"MultiStepMap\".");
BiomeGenName = "MultiStepMap";
}
@@ -220,10 +220,10 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
void cComposableGenerator::InitHeightGen(cIniFile & a_IniFile)
{
- AString HeightGenName = a_IniFile.GetValueSet("Generator", "HeightGen", "Biomal");
+ AString HeightGenName = a_IniFile.GetValueSet("Generator", "HeightGen", "");
if (HeightGenName.empty())
{
- LOGWARN("[Generator]::HeightGen value not found in world.ini, using \"Biomal\".");
+ LOGWARN("[Generator] HeightGen value not set in world.ini, using \"Biomal\".");
HeightGenName = "Biomal";
}
@@ -306,10 +306,10 @@ void cComposableGenerator::InitHeightGen(cIniFile & a_IniFile)
void cComposableGenerator::InitCompositionGen(cIniFile & a_IniFile)
{
- AString CompoGenName = a_IniFile.GetValueSet("Generator", "CompositionGen", "Biomal");
+ AString CompoGenName = a_IniFile.GetValueSet("Generator", "CompositionGen", "");
if (CompoGenName.empty())
{
- LOGWARN("[Generator]::CompositionGen value not found in world.ini, using \"Biomal\".");
+ LOGWARN("[Generator] CompositionGen value not set in world.ini, using \"Biomal\".");
CompoGenName = "Biomal";
}
if (NoCaseCompare(CompoGenName, "sameblock") == 0)
diff --git a/source/World.cpp b/source/World.cpp
index 77bfc0e2f..f2b353d32 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -2476,10 +2476,10 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c
Printf(SimulatorNameKey, "%sSimulator", a_FluidName);
AString SimulatorSectionName;
Printf(SimulatorSectionName, "%sSimulator", a_FluidName);
- AString SimulatorName = a_IniFile.GetValueSet("Physics", SimulatorNameKey, "Floody");
+ AString SimulatorName = a_IniFile.GetValueSet("Physics", SimulatorNameKey, "");
if (SimulatorName.empty())
{
- LOGWARNING("%s [Physics]:%s not present or empty, using the default of \"Floody\".", GetIniFileName().c_str(), SimulatorNameKey.c_str());
+ LOGWARNING("[Physics] %s not present or empty in %s, using the default of \"Floody\".", SimulatorNameKey.c_str(), GetIniFileName().c_str());
SimulatorName = "Floody";
}