diff options
author | HaoTNN <haotnn@gmail.com> | 2015-05-19 23:22:27 +0200 |
---|---|---|
committer | HaoTNN <haotnn@gmail.com> | 2015-05-19 23:22:27 +0200 |
commit | ac1bfd967153cee45b1ffc93655fbb4833faa531 (patch) | |
tree | 7ca3aef2a46a272ae815912af66dea0afe06e63b /src/Root.h | |
parent | Fixes lit furnace issue in #2051 (diff) | |
parent | Merge pull request #2076 from mc-server/Cert-disable (diff) | |
download | cuberite-ac1bfd967153cee45b1ffc93655fbb4833faa531.tar cuberite-ac1bfd967153cee45b1ffc93655fbb4833faa531.tar.gz cuberite-ac1bfd967153cee45b1ffc93655fbb4833faa531.tar.bz2 cuberite-ac1bfd967153cee45b1ffc93655fbb4833faa531.tar.lz cuberite-ac1bfd967153cee45b1ffc93655fbb4833faa531.tar.xz cuberite-ac1bfd967153cee45b1ffc93655fbb4833faa531.tar.zst cuberite-ac1bfd967153cee45b1ffc93655fbb4833faa531.zip |
Diffstat (limited to 'src/Root.h')
-rw-r--r-- | src/Root.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Root.h b/src/Root.h index e0b6cf26c..2b30afaff 100644 --- a/src/Root.h +++ b/src/Root.h @@ -24,6 +24,7 @@ class cWorld; class cPlayer; class cCommandOutputCallback; class cCompositeChat; +class cSettingsRepositoryInterface; typedef cItemCallback<cPlayer> cPlayerListCallback; typedef cItemCallback<cWorld> cWorldListCallback; @@ -53,7 +54,7 @@ public: cRoot(void); ~cRoot(); - void Start(void); + void Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo); // tolua_begin cServer * GetServer(void) { return m_Server; } @@ -204,7 +205,7 @@ private: void LoadGlobalSettings(); /// Loads the worlds from settings.ini, creates the worldmap - void LoadWorlds(cIniFile & IniFile); + void LoadWorlds(cSettingsRepositoryInterface & a_Settings); /// Starts each world's life void StartWorlds(void); |