summaryrefslogtreecommitdiffstats
path: root/source/Root.cpp
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2013-10-26 17:08:28 +0200
committerSTRWarrior <niels.breuker@hotmail.nl>2013-10-26 17:08:28 +0200
commit77661f4c594190ff93de4924d62aaac9e112e8a2 (patch)
treec33b45332ea90dd706d13ca9b1daf847a56c22e6 /source/Root.cpp
parentAPIDump: Documented cMonster. (diff)
downloadcuberite-77661f4c594190ff93de4924d62aaac9e112e8a2.tar
cuberite-77661f4c594190ff93de4924d62aaac9e112e8a2.tar.gz
cuberite-77661f4c594190ff93de4924d62aaac9e112e8a2.tar.bz2
cuberite-77661f4c594190ff93de4924d62aaac9e112e8a2.tar.lz
cuberite-77661f4c594190ff93de4924d62aaac9e112e8a2.tar.xz
cuberite-77661f4c594190ff93de4924d62aaac9e112e8a2.tar.zst
cuberite-77661f4c594190ff93de4924d62aaac9e112e8a2.zip
Diffstat (limited to '')
-rw-r--r--source/Root.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/Root.cpp b/source/Root.cpp
index 1f6437784..df98c3537 100644
--- a/source/Root.cpp
+++ b/source/Root.cpp
@@ -149,7 +149,7 @@ void cRoot::Start(void)
m_FurnaceRecipe = new cFurnaceRecipe();
LOGD("Loading worlds...");
- LoadWorlds();
+ LoadWorlds(IniFile);
LOGD("Loading plugin manager...");
m_PluginManager = new cPluginManager();
@@ -160,7 +160,7 @@ void cRoot::Start(void)
// This sets stuff in motion
LOGD("Starting Authenticator...");
- m_Authenticator.Start();
+ m_Authenticator.Start(IniFile);
LOGD("Starting worlds...");
StartWorlds();
@@ -245,10 +245,8 @@ void cRoot::LoadGlobalSettings()
-void cRoot::LoadWorlds(void)
+void cRoot::LoadWorlds(cIniFile IniFile)
{
- cIniFile IniFile("settings.ini"); IniFile.ReadFile();
-
// First get the default world
AString DefaultWorldName = IniFile.GetValueSet("Worlds", "DefaultWorld", "world");
m_pDefaultWorld = new cWorld( DefaultWorldName.c_str() );