summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Root.cpp43
1 files changed, 0 insertions, 43 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index e2d4f71c3..8b8df817d 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -41,7 +41,6 @@
#include "Logger.h"
#include "ClientHandle.h"
#include "BlockTypePalette.h"
-#include "Protocol/ProtocolPalettes.h"
@@ -398,48 +397,6 @@ void cRoot::LoadGlobalSettings()
-void cRoot::LoadPalettes(const AString & aProtocolFolder)
-{
- LOG("Loading UpgradeBlockTypePalette...");
- try
- {
- auto paletteStr = cFile::ReadWholeFile(aProtocolFolder + cFile::PathSeparator() + "UpgradeBlockTypePalette.txt");
- if (paletteStr.empty())
- {
- throw std::runtime_error("File is empty");
- }
- m_UpgradeBlockTypePalette.reset(new BlockTypePalette);
- m_UpgradeBlockTypePalette->loadFromString(paletteStr);
- }
- catch (const std::exception & exc)
- {
- LOGERROR("Failed to load the Upgrade block type palette from %s/UpgradeBlockTypePalette.txt: %s\nAborting",
- aProtocolFolder, exc.what()
- );
- throw;
- }
-
- // Note: This can take a lot of time in MSVC debug builds
- // If impatient, edit the settings.ini: [Folders] ProtocolPalettes=DummyDir; copy only one palette to DummyDir
- LOG("Loading per-protocol palettes...");
- m_ProtocolPalettes.reset(new ProtocolPalettes);
- m_ProtocolPalettes->load(aProtocolFolder);
- auto versions = m_ProtocolPalettes->protocolVersions();
- if (versions.empty())
- {
- LOGWARNING("No per-protocol palettes were loaded");
- }
- else
- {
- std::sort(versions.begin(), versions.end());
- LOG("Loaded palettes for protocol versions: %s", StringJoin(versions, ", "));
- }
-}
-
-
-
-
-
void cRoot::LoadWorlds(cDeadlockDetect & a_dd, cSettingsRepositoryInterface & a_Settings, bool a_IsNewIniFile)
{
if (a_IsNewIniFile)