diff options
| author | madmaxoft <github@xoft.cz> | 2013-10-27 09:04:39 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-10-27 09:04:39 +0100 |
| commit | f032a2ff742f408a0400b4267ab67d6dae86ead2 (patch) | |
| tree | e1e6d9233fa8354d4ef0dc4666f4e4ddc90d3880 /source/Root.cpp | |
| parent | APIDump: Documented cPickup. (diff) | |
| parent | Changed "cIniFile IniFile" to cIniFile & IniFile" (diff) | |
| download | cuberite-f032a2ff742f408a0400b4267ab67d6dae86ead2.tar cuberite-f032a2ff742f408a0400b4267ab67d6dae86ead2.tar.gz cuberite-f032a2ff742f408a0400b4267ab67d6dae86ead2.tar.bz2 cuberite-f032a2ff742f408a0400b4267ab67d6dae86ead2.tar.lz cuberite-f032a2ff742f408a0400b4267ab67d6dae86ead2.tar.xz cuberite-f032a2ff742f408a0400b4267ab67d6dae86ead2.tar.zst cuberite-f032a2ff742f408a0400b4267ab67d6dae86ead2.zip | |
Diffstat (limited to 'source/Root.cpp')
| -rw-r--r-- | source/Root.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/Root.cpp b/source/Root.cpp index f47de972c..2397fc875 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,11 +245,8 @@ void cRoot::LoadGlobalSettings() -void cRoot::LoadWorlds(void) +void cRoot::LoadWorlds(cIniFile & IniFile) { - cIniFile IniFile; - IniFile.ReadFile("settings.ini"); // Doesn't matter if success or not - // First get the default world AString DefaultWorldName = IniFile.GetValueSet("Worlds", "DefaultWorld", "world"); m_pDefaultWorld = new cWorld( DefaultWorldName.c_str() ); |