1 files changed, 63 insertions, 59 deletions

diff --git a/src/control/OnscreenTimer.cpp b/src/control/OnscreenTimer.cpp
index 8cc1ae69..08c68cb5 100644
--- a/src/control/OnscreenTimer.cpp
+++ b/src/control/OnscreenTimer.cpp
@@ -8,112 +8,111 @@
 #include "Script.h"
 #include "OnscreenTimer.h"
 
-void COnscreenTimer::Init() {
+void
+COnscreenTimer::Init()
+{
 	m_bDisabled = false;
 	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
 		m_sEntries[i].m_nTimerOffset = 0;
 		m_sEntries[i].m_nCounterOffset = 0;
 
 		for(uint32 j = 0; j < 10; j++) {
-			m_sEntries[i].m_aTimerText[j] = 0;
-			m_sEntries[i].m_aCounterText[j] = 0;
+			m_sEntries[i].m_aTimerText[j] = '\0';
+			m_sEntries[i].m_aCounterText[j] = '\0';
 		}
 
 		m_sEntries[i].m_nType = COUNTER_DISPLAY_NUMBER;
-		m_sEntries[i].m_bTimerProcessed = 0;
-		m_sEntries[i].m_bCounterProcessed = 0;
+		m_sEntries[i].m_bTimerProcessed = false;
+		m_sEntries[i].m_bCounterProcessed = false;
 	}
 }
 
-void COnscreenTimer::Process() {
-	if(!CReplay::IsPlayingBack() && !m_bDisabled) {
-		for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
+void
+COnscreenTimer::Process()
+{
+	if(!CReplay::IsPlayingBack() && !m_bDisabled)
+		for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++)
 			m_sEntries[i].Process();
-		}
-	}
 }
 
-void COnscreenTimer::ProcessForDisplay() {
+void
+COnscreenTimer::ProcessForDisplay()
+{
 	if(CHud::m_Wants_To_Draw_Hud) {
 		m_bProcessed = false;
-		for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
-			if(m_sEntries[i].ProcessForDisplay()) {
+		for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++)
+			if(m_sEntries[i].ProcessForDisplay())
 				m_bProcessed = true;
-			}
-		}
 	}
 }
 
-void COnscreenTimer::ClearCounter(uint32 offset) {
+void
+COnscreenTimer::ClearCounter(uint32 offset)
+{
 	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
 		if(offset == m_sEntries[i].m_nCounterOffset) {
 			m_sEntries[i].m_nCounterOffset = 0;
-			m_sEntries[i].m_aCounterText[0] = 0;
+			m_sEntries[i].m_aCounterText[0] = '\0';
 			m_sEntries[i].m_nType = COUNTER_DISPLAY_NUMBER;
-			m_sEntries[i].m_bCounterProcessed = 0;
+			m_sEntries[i].m_bCounterProcessed = false;
 		}
 	}
 }
 
-void COnscreenTimer::ClearClock(uint32 offset) {
-	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
+void
+COnscreenTimer::ClearClock(uint32 offset)
+{
+	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++)
 		if(offset == m_sEntries[i].m_nTimerOffset) {
 			m_sEntries[i].m_nTimerOffset = 0;
-			m_sEntries[i].m_aTimerText[0] = 0;
-			m_sEntries[i].m_bTimerProcessed = 0;
+			m_sEntries[i].m_aTimerText[0] = '\0';
+			m_sEntries[i].m_bTimerProcessed = false;
 		}
-	}
 }
 
-void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) {
-	uint32 i = 0;
-	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
+void
+COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text)
+{
+	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++)
 		if(m_sEntries[i].m_nCounterOffset == 0) {
+			m_sEntries[i].m_nCounterOffset = offset;
+			if (text)
+				strncpy(m_sEntries[i].m_aCounterText, text, 10);
+			else
+				m_sEntries[i].m_aCounterText[0] = '\0';
+			m_sEntries[i].m_nType = type;
 			break;
 		}
-		return;
-	}
-
-	m_sEntries[i].m_nCounterOffset = offset;
-	if(text) {
-		strncpy(m_sEntries[i].m_aCounterText, text, 10);
-	} else {
-		m_sEntries[i].m_aCounterText[0] = 0;
-	}
-
-	m_sEntries[i].m_nType = type;
 }
 
-void COnscreenTimer::AddClock(uint32 offset, char* text) {
-	uint32 i = 0;
-	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
+void
+COnscreenTimer::AddClock(uint32 offset, char* text)
+{
+	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++)
 		if(m_sEntries[i].m_nTimerOffset == 0) {
+			m_sEntries[i].m_nTimerOffset = offset;
+			if (text)
+				strncpy(m_sEntries[i].m_aTimerText, text, 10);
+			else
+				m_sEntries[i].m_aTimerText[0] = '\0';
 			break;
 		}
-		return;
-	}
-
-	m_sEntries[i].m_nTimerOffset = offset;
-	if(text) {
-		strncpy(m_sEntries[i].m_aTimerText, text, 10);
-	} else {
-		m_sEntries[i].m_aTimerText[0] = 0;
-	}
 }
 
-void COnscreenTimerEntry::Process() {
-	if(m_nTimerOffset == 0) {
+void
+COnscreenTimerEntry::Process()
+{
+	if(m_nTimerOffset == 0) 
 		return;
-	}
 
 	int32* timerPtr = CTheScripts::GetPointerToScriptVariable(m_nTimerOffset);
 	int32 oldTime = *timerPtr;
 	int32 newTime = oldTime - int32(CTimer::GetTimeStepInMilliseconds());
 	if(newTime < 0) {
 		*timerPtr = 0;
-		m_bTimerProcessed = 0;
+		m_bTimerProcessed = false;
 		m_nTimerOffset = 0;
-		m_aTimerText[0] = 0;
+		m_aTimerText[0] = '\0';
 	} else {
 		*timerPtr = newTime;
 		int32 oldTimeSeconds = oldTime / 1000;
@@ -123,13 +122,14 @@ void COnscreenTimerEntry::Process() {
 	}
 }
 
-bool COnscreenTimerEntry::ProcessForDisplay() {
+bool
+COnscreenTimerEntry::ProcessForDisplay()
+{
 	m_bTimerProcessed = false;
 	m_bCounterProcessed = false;
 
-	if(m_nTimerOffset == 0 && m_nCounterOffset == 0) {
+	if(m_nTimerOffset == 0 && m_nCounterOffset == 0)
 		return false;
-	}
 
 	if(m_nTimerOffset != 0) {
 		m_bTimerProcessed = true;
@@ -143,13 +143,17 @@ bool COnscreenTimerEntry::ProcessForDisplay() {
 	return true;
 }
 
-void COnscreenTimerEntry::ProcessForDisplayClock() {
+void
+COnscreenTimerEntry::ProcessForDisplayClock()
+{
 	uint32 time = *CTheScripts::GetPointerToScriptVariable(m_nTimerOffset);
 	sprintf(m_bTimerBuffer, "%02d:%02d", time / 1000 / 60,
 				   time / 1000 % 60);
 }
 
-void COnscreenTimerEntry::ProcessForDisplayCounter() {
+void
+COnscreenTimerEntry::ProcessForDisplayCounter()
+{
 	uint32 counter = *CTheScripts::GetPointerToScriptVariable(m_nCounterOffset);
 	sprintf(m_bCounterBuffer, "%d", counter);
 }