Style refactor omni/system components (#974)

* Style refactor omni/system components

* Fix

* Fix

LEGO1/omni/src/audio/mxmusicmanager.cpp

@@ -1,8 +1,8 @@
 #include "mxmusicmanager.h"
 
 #include "mxmisc.h"
-#include "mxthread.h"
 #include "mxticklemanager.h"
+#include "mxticklethread.h"
 
 #include <windows.h>
 

LEGO1/omni/src/audio/mxsoundmanager.cpp

@@ -5,8 +5,8 @@
 #include "mxmisc.h"
 #include "mxomni.h"
 #include "mxpresenter.h"
-#include "mxthread.h"
 #include "mxticklemanager.h"
+#include "mxticklethread.h"
 #include "mxwavepresenter.h"
 
 DECOMP_SIZE_ASSERT(MxSoundManager, 0x3c);

LEGO1/omni/src/event/mxeventmanager.cpp

@@ -2,8 +2,8 @@
 
 #include "mxcriticalsection.h"
 #include "mxmisc.h"
-#include "mxthread.h"
 #include "mxticklemanager.h"
+#include "mxticklethread.h"
 
 // FUNCTION: LEGO1 0x100c0360
 MxEventManager::MxEventManager()

LEGO1/omni/src/system/mxautolock.cpp

@@ -5,16 +5,17 @@
 // FUNCTION: LEGO1 0x100b8ed0
 MxAutoLock::MxAutoLock(MxCriticalSection* p_criticalSection)
 {
-	this->m_criticalSection = p_criticalSection;
-	if (this->m_criticalSection != 0) {
-		this->m_criticalSection->Enter();
+	m_criticalSection = p_criticalSection;
+
+	if (m_criticalSection != NULL) {
+		m_criticalSection->Enter();
 	}
 }
 
 // FUNCTION: LEGO1 0x100b8ef0
 MxAutoLock::~MxAutoLock()
 {
-	if (this->m_criticalSection != 0) {
-		this->m_criticalSection->Leave();
+	if (m_criticalSection != NULL) {
+		m_criticalSection->Leave();
 	}
 }

LEGO1/omni/src/system/mxcriticalsection.cpp

@@ -4,35 +4,35 @@
 
 #include <stdio.h>
 
-DECOMP_SIZE_ASSERT(MxCriticalSection, 0x1c);
+DECOMP_SIZE_ASSERT(MxCriticalSection, 0x1c)
 
 // GLOBAL: LEGO1 0x10101e78
-int g_useMutex = 0;
+BOOL g_useMutex = FALSE;
 
 // FUNCTION: LEGO1 0x100b6d20
 MxCriticalSection::MxCriticalSection()
 {
 	HANDLE mutex;
 
-	if (g_useMutex != 0) {
+	if (g_useMutex) {
 		mutex = CreateMutexA(NULL, FALSE, NULL);
-		this->m_mutex = mutex;
-		return;
+		m_mutex = mutex;
+	}
+	else {
+		InitializeCriticalSection(&m_criticalSection);
+		m_mutex = NULL;
 	}
-
-	InitializeCriticalSection(&this->m_criticalSection);
-	this->m_mutex = NULL;
 }
 
 // FUNCTION: LEGO1 0x100b6d60
 MxCriticalSection::~MxCriticalSection()
 {
-	if (this->m_mutex != NULL) {
-		CloseHandle(this->m_mutex);
-		return;
+	if (m_mutex != NULL) {
+		CloseHandle(m_mutex);
+	}
+	else {
+		DeleteCriticalSection(&m_criticalSection);
 	}
-
-	DeleteCriticalSection(&this->m_criticalSection);
 }
 
 // FUNCTION: LEGO1 0x100b6d80
@@ -41,8 +41,8 @@ void MxCriticalSection::Enter()
 	DWORD result;
 	FILE* file;
 
-	if (this->m_mutex != NULL) {
-		result = WaitForSingleObject(this->m_mutex, 5000);
+	if (m_mutex != NULL) {
+		result = WaitForSingleObject(m_mutex, 5000);
 		if (result == WAIT_FAILED) {
 			file = fopen("C:\\DEADLOCK.TXT", "a");
 			if (file != NULL) {
@@ -54,23 +54,23 @@ void MxCriticalSection::Enter()
 		}
 	}
 	else {
-		EnterCriticalSection(&this->m_criticalSection);
+		EnterCriticalSection(&m_criticalSection);
 	}
 }
 
 // FUNCTION: LEGO1 0x100b6de0
 void MxCriticalSection::Leave()
 {
-	if (this->m_mutex != NULL) {
-		ReleaseMutex(this->m_mutex);
-		return;
+	if (m_mutex != NULL) {
+		ReleaseMutex(m_mutex);
+	}
+	else {
+		LeaveCriticalSection(&m_criticalSection);
 	}
-
-	LeaveCriticalSection(&this->m_criticalSection);
 }
 
 // FUNCTION: LEGO1 0x100b6e00
 void MxCriticalSection::SetDoMutex()
 {
-	g_useMutex = 1;
+	g_useMutex = TRUE;
 }

LEGO1/omni/src/system/mxsemaphore.cpp

@@ -15,9 +15,11 @@ MxSemaphore::MxSemaphore()
 MxResult MxSemaphore::Init(MxU32 p_initialCount, MxU32 p_maxCount)
 {
 	MxResult result = FAILURE;
+
 	if ((m_hSemaphore = CreateSemaphoreA(NULL, p_initialCount, p_maxCount, NULL))) {
 		result = SUCCESS;
 	}
+
 	return result;
 }
 

LEGO1/omni/src/system/mxthread.cpp

@@ -1,44 +1,10 @@
 #include "mxthread.h"
 
 #include "decomp.h"
-#include "mxmisc.h"
-#include "mxtimer.h"
 
 #include <process.h>
 
 DECOMP_SIZE_ASSERT(MxThread, 0x1c)
-DECOMP_SIZE_ASSERT(MxTickleThread, 0x20)
-
-// FUNCTION: LEGO1 0x100b8bb0
-MxTickleThread::MxTickleThread(MxCore* p_target, MxS32 p_frequencyMS)
-{
-	m_target = p_target;
-	m_frequencyMS = p_frequencyMS;
-}
-
-// Match except for register allocation
-// FUNCTION: LEGO1 0x100b8c90
-MxResult MxTickleThread::Run()
-{
-	MxTimer* timer = Timer();
-	MxS32 lastTickled = -m_frequencyMS;
-	while (IsRunning()) {
-		MxLong currentTime = timer->GetTime();
-
-		if (currentTime < lastTickled) {
-			lastTickled = -m_frequencyMS;
-		}
-
-		MxS32 timeRemainingMS = (m_frequencyMS - currentTime) + lastTickled;
-		if (timeRemainingMS <= 0) {
-			m_target->Tickle();
-			timeRemainingMS = 0;
-			lastTickled = currentTime;
-		}
-		Sleep(timeRemainingMS);
-	}
-	return MxThread::Run();
-}
 
 // FUNCTION: LEGO1 0x100bf510
 MxThread::MxThread()
@@ -62,12 +28,14 @@ typedef unsigned(__stdcall* ThreadFunc)(void*);
 MxResult MxThread::Start(MxS32 p_stack, MxS32 p_flag)
 {
 	MxResult result = FAILURE;
+
 	if (m_semaphore.Init(0, 1) == SUCCESS) {
 		if ((m_hThread =
 				 _beginthreadex(NULL, p_stack << 2, (ThreadFunc) &MxThread::ThreadProc, this, p_flag, &m_threadId))) {
 			result = SUCCESS;
 		}
 	}
+
 	return result;
 }
 

LEGO1/omni/src/system/mxticklethread.cpp

@@ -0,0 +1,41 @@
+#include "mxticklethread.h"
+
+#include "decomp.h"
+#include "mxmisc.h"
+#include "mxtimer.h"
+
+DECOMP_SIZE_ASSERT(MxTickleThread, 0x20)
+
+// FUNCTION: LEGO1 0x100b8bb0
+MxTickleThread::MxTickleThread(MxCore* p_target, MxS32 p_frequencyMS)
+{
+	m_target = p_target;
+	m_frequencyMS = p_frequencyMS;
+}
+
+// Match except for register allocation
+// FUNCTION: LEGO1 0x100b8c90
+MxResult MxTickleThread::Run()
+{
+	MxTimer* timer = Timer();
+	MxS32 lastTickled = -m_frequencyMS;
+
+	while (IsRunning()) {
+		MxLong currentTime = timer->GetTime();
+
+		if (currentTime < lastTickled) {
+			lastTickled = -m_frequencyMS;
+		}
+
+		MxS32 timeRemainingMS = (m_frequencyMS - currentTime) + lastTickled;
+		if (timeRemainingMS <= 0) {
+			m_target->Tickle();
+			timeRemainingMS = 0;
+			lastTickled = currentTime;
+		}
+
+		Sleep(timeRemainingMS);
+	}
+
+	return MxThread::Run();
+}

LEGO1/omni/src/video/mxvideomanager.cpp

@@ -7,8 +7,8 @@
 #include "mxpalette.h"
 #include "mxpresenter.h"
 #include "mxregion.h"
-#include "mxthread.h"
 #include "mxticklemanager.h"
+#include "mxticklethread.h"
 
 DECOMP_SIZE_ASSERT(MxVideoManager, 0x64)