diff options
author | archshift <admin@archshift.com> | 2014-07-19 23:50:01 +0200 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-07-19 23:50:01 +0200 |
commit | ed01e12ed732fc9e3516ed263ebb73978b6f82f6 (patch) | |
tree | bb529fde4d140f170d2ac258b3b2195808885bb5 /src/main.cpp | |
parent | Monsters: Made IsUndead overridable by the respective mob classes (diff) | |
download | cuberite-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 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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... |