flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2751 from cuberite/PieceStructuresFix 

PieceStructures generator: Fixed wrong merge conflict resolution.
This commit is contained in:
Mattes D 2015-12-17 19:33:28 +01:00
parent 1395ff3ca4 f060d9f9b0
commit a7d0abcdc1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Generating/ComposableGenerator.cpp
View File

@ -415,9 +415,9 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
} }
else if (NoCaseCompare(*itr, "NetherForts") == 0) 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); 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); m_FinishGens.push_back(gen);
} }
@ -438,11 +438,11 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
m_FinishGens.push_back(gen); m_FinishGens.push_back(gen);
} }
} }
else if (NoCaseCompare(finisher, "POCPieces") == 0) else if (NoCaseCompare(finisher, "PieceStructures") == 0)
{ {
if (split.size() < 2) 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; continue;
} }

2
src/Generating/PieceStructuresGen.cpp
View File

@ -49,7 +49,7 @@ bool cPieceStructuresGen::Initialize(const AString & a_Prefabs, int a_SeaLevel,
// Report a warning if no generators available: // Report a warning if no generators available:
if (m_Gens.empty()) 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 false;
} }
return true; return true;