From f060d9f9b099494df889bb4258362753bbca7ed6 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Tue, 15 Dec 2015 18:04:40 +0100 Subject: PieceStructures generator: Fixed wrong merge conflict resolution. Also improved reporting messages. Ref.: http://forum.mc-server.org/showthread.php?tid=2256 --- src/Generating/ComposableGenerator.cpp | 8 ++++---- src/Generating/PieceStructuresGen.cpp | 2 +- 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(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; -- cgit v1.2.3