summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-12-17 19:33:28 +0100
committerMattes D <github@xoft.cz>2015-12-17 19:33:28 +0100
commita7d0abcdc1f62038094f22805b2ffaab860aad08 (patch)
treef79825371243dfcde128bc8bbcef8c222a952b67
parentMerge pull request #2761 from cuberite/fixed_warnings (diff)
parentPieceStructures generator: Fixed wrong merge conflict resolution. (diff)
downloadcuberite-a7d0abcdc1f62038094f22805b2ffaab860aad08.tar
cuberite-a7d0abcdc1f62038094f22805b2ffaab860aad08.tar.gz
cuberite-a7d0abcdc1f62038094f22805b2ffaab860aad08.tar.bz2
cuberite-a7d0abcdc1f62038094f22805b2ffaab860aad08.tar.lz
cuberite-a7d0abcdc1f62038094f22805b2ffaab860aad08.tar.xz
cuberite-a7d0abcdc1f62038094f22805b2ffaab860aad08.tar.zst
cuberite-a7d0abcdc1f62038094f22805b2ffaab860aad08.zip
-rw-r--r--src/Generating/ComposableGenerator.cpp8
-rw-r--r--src/Generating/PieceStructuresGen.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index e5e1b0477..478404d45 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -415,9 +415,9 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
}
else if (NoCaseCompare(*itr, "NetherForts") == 0)
{
- LOGINFO("The NetherForts finisher is obsolete, you should use \"PieceStructures: NetherForts\" instead.");
+ LOGINFO("The NetherForts finisher is obsolete, you should use \"PieceStructures: NetherFort\" instead.");
auto gen = std::make_shared<cPieceStructuresGen>(Seed);
- if (gen->Initialize("NetherForts", seaLevel, m_BiomeGen, m_CompositedHeightCache))
+ if (gen->Initialize("NetherFort", seaLevel, m_BiomeGen, m_CompositedHeightCache))
{
m_FinishGens.push_back(gen);
}
@@ -438,11 +438,11 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
m_FinishGens.push_back(gen);
}
}
- else if (NoCaseCompare(finisher, "POCPieces") == 0)
+ else if (NoCaseCompare(finisher, "PieceStructures") == 0)
{
if (split.size() < 2)
{
- LOGWARNING("The PieceStructures generator needs the structures to use. Example: \"PieceStructures: NetherForts\".");
+ LOGWARNING("The PieceStructures generator needs the structures to use. Example: \"PieceStructures: NetherFort\".");
continue;
}
diff --git a/src/Generating/PieceStructuresGen.cpp b/src/Generating/PieceStructuresGen.cpp
index 4cbf8b032..e35048cb0 100644
--- a/src/Generating/PieceStructuresGen.cpp
+++ b/src/Generating/PieceStructuresGen.cpp
@@ -49,7 +49,7 @@ bool cPieceStructuresGen::Initialize(const AString & a_Prefabs, int a_SeaLevel,
// Report a warning if no generators available:
if (m_Gens.empty())
{
- LOGWARNING("The PieceStructures generator was asked to generate \"%s\", but none of them are valid.", a_Prefabs.c_str());
+ LOGWARNING("The PieceStructures generator was asked to generate \"%s\", but none of the prefabs are valid.", a_Prefabs.c_str());
return false;
}
return true;