1
0

Both the LoadWorlds() function and cAuthenticator now use the cIniFile object from the Root::Start() function.

This commit is contained in:
STRWarrior
2013-10-26 17:08:28 +02:00
parent c875b88758
commit 77661f4c59
4 changed files with 9 additions and 17 deletions

View File

@@ -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() );