diff options
| author | Alexander Harkness <me@bearbin.net> | 2015-06-12 12:00:47 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2015-06-12 12:00:47 +0200 |
| commit | 001305247fa28e78d0f3d9d565ff7aff25864edc (patch) | |
| tree | 9f1e41fa0e6afee7ce9f90f3778f02e7a770ebf7 /src/Root.h | |
| parent | Update gratipay (diff) | |
| parent | SelfTests are registered and executed after logging framework init. (diff) | |
| download | cuberite-001305247fa28e78d0f3d9d565ff7aff25864edc.tar cuberite-001305247fa28e78d0f3d9d565ff7aff25864edc.tar.gz cuberite-001305247fa28e78d0f3d9d565ff7aff25864edc.tar.bz2 cuberite-001305247fa28e78d0f3d9d565ff7aff25864edc.tar.lz cuberite-001305247fa28e78d0f3d9d565ff7aff25864edc.tar.xz cuberite-001305247fa28e78d0f3d9d565ff7aff25864edc.tar.zst cuberite-001305247fa28e78d0f3d9d565ff7aff25864edc.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 + + + + + |