From b8e77b14a0fc082aa20c589c811b8aeb866d128d Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 25 Dec 2023 13:14:45 -0500 Subject: [PATCH] Retype some members --- LEGO1/mxdiskstreamprovider.cpp | 15 ++++++++------- LEGO1/mxdiskstreamprovider.h | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/mxdiskstreamprovider.cpp index 624b3cfc..dc2f7f94 100644 --- a/LEGO1/mxdiskstreamprovider.cpp +++ b/LEGO1/mxdiskstreamprovider.cpp @@ -35,8 +35,8 @@ MxResult MxDiskStreamProviderThread::StartWithTarget(MxDiskStreamProvider* p_tar MxDiskStreamProvider::MxDiskStreamProvider() { this->m_pFile = NULL; - this->m_remainingWork = 0; - this->m_unk0x35 = 0; + this->m_remainingWork = FALSE; + this->m_unk0x35 = FALSE; } // STUB: LEGO1 0x100d1240 @@ -64,7 +64,7 @@ MxResult MxDiskStreamProvider::SetResourceToGet(MxStreamController* p_resource) goto done; } - m_remainingWork = 1; + m_remainingWork = TRUE; m_busySemaphore.Init(0, 100); if (m_thread.StartWithTarget(this) == SUCCESS && p_resource != NULL) { @@ -85,18 +85,19 @@ void MxDiskStreamProvider::VTable0x20(MxDSAction* p_action) // FUNCTION: LEGO1 0x100d1750 MxResult MxDiskStreamProvider::WaitForWorkToComplete() { - while (m_remainingWork != 0) { + while (m_remainingWork) { m_busySemaphore.Wait(INFINITE); - if (m_unk0x35 != 0) + if (m_unk0x35) PerformWork(); } + return SUCCESS; } // FUNCTION: LEGO1 0x100d1780 MxResult MxDiskStreamProvider::FUN_100d1780(MxDSStreamingAction* p_action) { - if (m_remainingWork == 0) + if (!m_remainingWork) return FAILURE; if (p_action->GetUnknown9c() > 0 && !p_action->GetUnknowna0()) { @@ -122,7 +123,7 @@ MxResult MxDiskStreamProvider::FUN_100d1780(MxDSStreamingAction* p_action) m_list.push_back(p_action); } - m_unk0x35 = 1; + m_unk0x35 = TRUE; m_busySemaphore.Release(1); return SUCCESS; } diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/mxdiskstreamprovider.h index 8bf1b16e..6fc92d01 100644 --- a/LEGO1/mxdiskstreamprovider.h +++ b/LEGO1/mxdiskstreamprovider.h @@ -58,8 +58,8 @@ class MxDiskStreamProvider : public MxStreamProvider { private: MxDiskStreamProviderThread m_thread; // 0x10 MxSemaphore m_busySemaphore; // 0x2c - undefined m_remainingWork; // 0x34 - undefined m_unk0x35; // 0x35 + MxBool m_remainingWork; // 0x34 + MxBool m_unk0x35; // 0x35 MxCriticalSection m_criticalSection; // 0x38 MxStreamListMxDSAction m_list; // 0x54 };