summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-19 23:50:01 +0200
committerarchshift <admin@archshift.com>2014-07-19 23:50:01 +0200
commited01e12ed732fc9e3516ed263ebb73978b6f82f6 (patch)
treebb529fde4d140f170d2ac258b3b2195808885bb5
parentMonsters: Made IsUndead overridable by the respective mob classes (diff)
downloadcuberite-ed01e12ed732fc9e3516ed263ebb73978b6f82f6.tar
cuberite-ed01e12ed732fc9e3516ed263ebb73978b6f82f6.tar.gz
cuberite-ed01e12ed732fc9e3516ed263ebb73978b6f82f6.tar.bz2
cuberite-ed01e12ed732fc9e3516ed263ebb73978b6f82f6.tar.lz
cuberite-ed01e12ed732fc9e3516ed263ebb73978b6f82f6.tar.xz
cuberite-ed01e12ed732fc9e3516ed263ebb73978b6f82f6.tar.zst
cuberite-ed01e12ed732fc9e3516ed263ebb73978b6f82f6.zip
Diffstat (limited to '')
-rw-r--r--src/Root.cpp2
-rw-r--r--src/Root.h2
-rw-r--r--src/main.cpp8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index 6347adcf0..d727e34a3 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -30,8 +30,6 @@
#include <mach/mach.h>
#endif
-extern bool g_TERMINATE_EVENT_RAISED;
-
diff --git a/src/Root.h b/src/Root.h
index acd3e9754..b31059e71 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -40,6 +40,8 @@ namespace Json
class cRoot
{
public:
+ static bool g_TERMINATE_EVENT_RAISED;
+
static cRoot * Get() { return s_Root; }
// tolua_end
diff --git a/src/main.cpp b/src/main.cpp
index 0ff9361be..d8b14cacc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,8 +12,8 @@
#endif // _MSC_VER
// Here, we have some ALL CAPS variables, to give the impression that this is deeeep, gritty programming :P
-bool g_TERMINATE_EVENT_RAISED = false; // If something has told the server to stop; checked periodically in cRoot
-bool g_SERVER_TERMINATED = false; // Set to true when the server terminates, so our CTRL handler can then tell Windows to close the console
+bool cRoot::g_TERMINATE_EVENT_RAISED = false; // If something has told the server to stop; checked periodically in cRoot
+static bool g_SERVER_TERMINATED = false; // Set to true when the server terminates, so our CTRL handler can then tell the OS to close the console
@@ -52,7 +52,7 @@ bool g_ShouldLogCommOut;
void NonCtrlHandler(int a_Signal)
{
LOGD("Terminate event raised from std::signal");
- g_TERMINATE_EVENT_RAISED = true;
+ cRoot::g_TERMINATE_EVENT_RAISED = true;
switch (a_Signal)
{
@@ -155,7 +155,7 @@ LONG WINAPI LastChanceExceptionFilter(__in struct _EXCEPTION_POINTERS * a_Except
// Handle CTRL events in windows, including console window close
BOOL CtrlHandler(DWORD fdwCtrlType)
{
- g_TERMINATE_EVENT_RAISED = true;
+ cRoot::g_TERMINATE_EVENT_RAISED = true;
LOGD("Terminate event raised from the Windows CtrlHandler");
if (fdwCtrlType == CTRL_CLOSE_EVENT) // Console window closed via 'x' button, Windows will try to close immediately, therefore...