From fb99370d4d5b6285eb06ffd12c145bce08f96438 Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Wed, 13 Dec 2023 18:05:43 -0500 Subject: [PATCH] fixes --- LEGO1/mxdsbuffer.h | 1 + LEGO1/mxramstreamcontroller.cpp | 8 ++++---- LEGO1/mxramstreamcontroller.h | 2 +- LEGO1/mxstreamcontroller.h | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h index d815aa71..aaecd4c0 100644 --- a/LEGO1/mxdsbuffer.h +++ b/LEGO1/mxdsbuffer.h @@ -3,6 +3,7 @@ #include "decomp.h" #include "mxcore.h" + class MxStreamController; class MxDSAction; diff --git a/LEGO1/mxramstreamcontroller.cpp b/LEGO1/mxramstreamcontroller.cpp index de356739..75f8379a 100644 --- a/LEGO1/mxramstreamcontroller.cpp +++ b/LEGO1/mxramstreamcontroller.cpp @@ -40,15 +40,15 @@ MxResult MxRAMStreamController::Open(const char* p_filename) MxResult MxRAMStreamController::VTable0x20(MxDSAction* p_action) { MxAutoLocker locker(&m_criticalSection); - MxS16 unk24 = 0; + MxS16 unk0x24 = 0; MxResult result = FAILURE; if (p_action->GetUnknown24() == -1) { p_action->SetUnknown24(-3); MxDSAction* action = m_unk0x54.Find(p_action, FALSE); if (action != NULL) { - unk24 = action->GetUnknown24() + 1; + unk0x24 = action->GetUnknown24() + 1; } - p_action->SetUnknown24(unk24); + p_action->SetUnknown24(unk0x24); } else { if (m_unk0x54.Find(p_action, FALSE)) { @@ -84,7 +84,7 @@ MxResult MxRAMStreamController::DeserializeObject(MxDSStreamingAction& p_action) { MxAutoLocker locker(&m_criticalSection); MxResult result; - undefined4 unknownValue = 0; + undefined4 value = 0; do { m_buffer.FUN_100c6f80(p_action.GetUnknown94()); result = m_buffer.FUN_100c67b0(this, &p_action, &unknownValue); diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/mxramstreamcontroller.h index dc93f50f..9fc6013b 100644 --- a/LEGO1/mxramstreamcontroller.h +++ b/LEGO1/mxramstreamcontroller.h @@ -32,7 +32,7 @@ class MxRAMStreamController : public MxStreamController { private: MxDSBuffer m_buffer; - MxResult DeserializeObject(MxDSStreamingAction& action); + MxResult DeserializeObject(MxDSStreamingAction& p_action); }; #endif // MXRAMSTREAMCONTROLLER_H diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h index 8bb979b0..a4d90b86 100644 --- a/LEGO1/mxstreamcontroller.h +++ b/LEGO1/mxstreamcontroller.h @@ -47,7 +47,6 @@ class MxStreamController : public MxCore { MxResult FUN_100c1f00(MxDSAction* p_action); inline MxAtomId& GetAtom() { return m_atom; }; - inline MxStreamListMxDSAction GetUnknown3c() { return m_unk0x3c; }; protected: MxCriticalSection m_criticalSection; // 0x8