summaryrefslogtreecommitdiffstats
path: root/src/Root.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2015-06-17 16:38:00 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2015-08-20 17:15:23 +0200
commit4315a113935902bbbb82047e3f43695b4d76fff2 (patch)
treed57b5ebb021faa3f52b5cbf78d9a275d1ae7be1a /src/Root.h
parentMerge pull request #2391 from SamJBarney/CropGrowthFix (diff)
downloadcuberite-4315a113935902bbbb82047e3f43695b4d76fff2.tar
cuberite-4315a113935902bbbb82047e3f43695b4d76fff2.tar.gz
cuberite-4315a113935902bbbb82047e3f43695b4d76fff2.tar.bz2
cuberite-4315a113935902bbbb82047e3f43695b4d76fff2.tar.lz
cuberite-4315a113935902bbbb82047e3f43695b4d76fff2.tar.xz
cuberite-4315a113935902bbbb82047e3f43695b4d76fff2.tar.zst
cuberite-4315a113935902bbbb82047e3f43695b4d76fff2.zip
Diffstat (limited to '')
-rw-r--r--src/Root.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Root.h b/src/Root.h
index b29fe0a5e..772d858d9 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -7,6 +7,7 @@
#include "Defines.h"
#include "RankManager.h"
#include <thread>
+#include <atomic>
@@ -48,13 +49,12 @@ public:
static bool m_TerminateEventRaised;
static bool m_RunAsService;
- static bool m_ShouldStop;
cRoot(void);
~cRoot();
- void Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo);
+ void Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo);
// tolua_begin
cServer * GetServer(void) { return m_Server; }
@@ -200,6 +200,8 @@ private:
cCommandQueue m_PendingCommands;
std::thread m_InputThread;
+ cEvent m_StopEvent;
+ std::atomic_flag m_InputThreadRunFlag;
cServer * m_Server;
cMonsterConfig * m_MonsterConfig;
@@ -213,9 +215,7 @@ private:
std::unique_ptr<cRankManager> m_RankManager;
- cHTTPServer m_HTTPServer;
-
- bool m_bRestart;
+ cHTTPServer m_HTTPServer;
void LoadGlobalSettings();