1 files changed, 11 insertions, 13 deletions

diff --git a/src/Root.cpp b/src/Root.cpp
index ec1351ef1..ba25b97eb 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -30,8 +30,6 @@
 	#include <mach/mach.h>
 #endif
 
-extern bool g_TERMINATE_EVENT_RAISED;
-
 
 
 
@@ -79,17 +77,17 @@ void cRoot::InputThread(void * a_Params)
 
 	cLogCommandOutputCallback Output;
 	
-	while (!self.m_bStop && !self.m_bRestart && !g_TERMINATE_EVENT_RAISED && std::cin.good())
+	while (!self.m_bStop && !self.m_bRestart && !m_TerminateEventRaised && std::cin.good())
 	{
 		AString Command;
 		std::getline(std::cin, Command);
 		if (!Command.empty())
-		{			
+		{
 			self.ExecuteConsoleCommand(TrimString(Command), Output);
 		}
 	}
 
-	if (g_TERMINATE_EVENT_RAISED || !std::cin.good())
+	if (m_TerminateEventRaised || !std::cin.good())
 	{
 		// We have come here because the std::cin has received an EOF / a terminate signal has been sent, and the server is still running; stop the server:
 		self.m_bStop = true;
@@ -105,7 +103,7 @@ void cRoot::Start(void)
 	#ifdef _WIN32
 	HWND hwnd = GetConsoleWindow();
 	HMENU hmenu = GetSystemMenu(hwnd, FALSE);
-	EnableMenuItem(hmenu, SC_CLOSE, MF_GRAYED); // Disable close button when starting up; it causes problems with our CTRL-CLOSE handling
+	EnableMenuItem(hmenu, SC_CLOSE, MF_GRAYED);  // Disable close button when starting up; it causes problems with our CTRL-CLOSE handling
 	#endif
 
 	cDeadlockDetect dd;
@@ -194,7 +192,7 @@ void cRoot::Start(void)
 		#if !defined(ANDROID_NDK)
 		LOGD("Starting InputThread...");
 		m_InputThread = new cThread( InputThread, this, "cRoot::InputThread" );
-		m_InputThread->Start( false );	// We should NOT wait? Otherwise we can't stop the server from other threads than the input thread
+		m_InputThread->Start( false );  // We should NOT wait? Otherwise we can't stop the server from other threads than the input thread
 		#endif
 
 		long long finishmseconds = Time.GetNowTime();
@@ -202,15 +200,15 @@ void cRoot::Start(void)
 
 		LOG("Startup complete, took %lld ms!", finishmseconds);
 		#ifdef _WIN32
-		EnableMenuItem(hmenu, SC_CLOSE, MF_ENABLED); // Re-enable close button
+		EnableMenuItem(hmenu, SC_CLOSE, MF_ENABLED);  // Re-enable close button
 		#endif
 
-		while (!m_bStop && !m_bRestart && !g_TERMINATE_EVENT_RAISED)  // These are modified by external threads
+		while (!m_bStop && !m_bRestart && !m_TerminateEventRaised)  // These are modified by external threads
 		{
 			cSleep::MilliSleep(1000);
 		}
 
-		if (g_TERMINATE_EVENT_RAISED)
+		if (m_TerminateEventRaised)
 		{
 			m_bStop = true;
 		}
@@ -607,7 +605,7 @@ bool cRoot::FindAndDoWithPlayer(const AString & a_PlayerName, cPlayerListCallbac
 				m_BestRating = Rating;
 				++m_NumMatches;
 			}
-			if (Rating == m_NameLength) // Perfect match
+			if (Rating == m_NameLength)  // Perfect match
 			{
 				return true;
 			}
@@ -687,7 +685,7 @@ int cRoot::GetVirtualRAMUsage(void)
 			&t_info_count
 		))
 		{
-		    return (int)(t_info.virtual_size / 1024);
+			return (int)(t_info.virtual_size / 1024);
 		}
 		return -1;
 	#else
@@ -739,7 +737,7 @@ int cRoot::GetPhysicalRAMUsage(void)
 			&t_info_count
 		))
 		{
-		    return (int)(t_info.resident_size / 1024);
+			return (int)(t_info.resident_size / 1024);
 		}
 		return -1;
 	#else