diff options
| author | Mattes D <github@xoft.cz> | 2015-06-11 22:20:04 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-06-11 22:20:04 +0200 |
| commit | d390214929f4b280cc66cdbc170694ec9b1fa8c4 (patch) | |
| tree | 3c49c75771ffd8931f47b895b2bd31014f7885d8 /src/Root.h | |
| parent | Merge pull request #2162 from lkolbly/master (diff) | |
| download | cuberite-d390214929f4b280cc66cdbc170694ec9b1fa8c4.tar cuberite-d390214929f4b280cc66cdbc170694ec9b1fa8c4.tar.gz cuberite-d390214929f4b280cc66cdbc170694ec9b1fa8c4.tar.bz2 cuberite-d390214929f4b280cc66cdbc170694ec9b1fa8c4.tar.lz cuberite-d390214929f4b280cc66cdbc170694ec9b1fa8c4.tar.xz cuberite-d390214929f4b280cc66cdbc170694ec9b1fa8c4.tar.zst cuberite-d390214929f4b280cc66cdbc170694ec9b1fa8c4.zip | |
Diffstat (limited to 'src/Root.h')
| -rw-r--r-- | src/Root.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Root.h b/src/Root.h index 81551a503..a484db657 100644 --- a/src/Root.h +++ b/src/Root.h @@ -38,7 +38,7 @@ namespace Json -/// The root of the object hierarchy +/** The root of the object hierarchy */ // tolua_begin class cRoot { @@ -217,6 +217,7 @@ private: bool m_bRestart; + void LoadGlobalSettings(); /// Loads the worlds from settings.ini, creates the worldmap @@ -238,3 +239,8 @@ private: static void InputThread(cRoot & a_Params); }; // tolua_export + + + + + |