From f7c715c58b179f4acc60704793bf5d75369ae2b6 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 18 Dec 2023 14:29:44 -0500 Subject: [PATCH] Fix naming --- LEGO1/mxsmack.cpp | 6 +++--- LEGO1/mxsmack.h | 2 +- LEGO1/mxsmkpresenter.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LEGO1/mxsmack.cpp b/LEGO1/mxsmack.cpp index 7982db67..5dae04d8 100644 --- a/LEGO1/mxsmack.cpp +++ b/LEGO1/mxsmack.cpp @@ -38,12 +38,12 @@ MxResult MxSmack::LoadHeaderAndTrees(MxU8* p_data, MxSmack* p_mxSmack) memcpy(frameSizes, p_data, FRAME_COUNT(p_mxSmack) * sizeof(MxU32)); p_data += FRAME_COUNT(p_mxSmack) * sizeof(MxU32); - p_mxSmack->maxFrameSize = 0; + p_mxSmack->m_maxFrameSize = 0; // TODO for (MxU32 i = 0; i < FRAME_COUNT(p_mxSmack); i++) { - if (p_mxSmack->maxFrameSize < frameSizes[i]) - p_mxSmack->maxFrameSize = frameSizes[i]; + if (p_mxSmack->m_maxFrameSize < frameSizes[i]) + p_mxSmack->m_maxFrameSize = frameSizes[i]; } frameTypes = new MxU8[FRAME_COUNT(p_mxSmack)]; diff --git a/LEGO1/mxsmack.h b/LEGO1/mxsmack.h index 3eb8f362..5899a620 100644 --- a/LEGO1/mxsmack.h +++ b/LEGO1/mxsmack.h @@ -14,7 +14,7 @@ struct MxSmack { MxU8* m_frameTypes; // 0x6a4 MxU8* m_huffmanTrees; // 0x6a8 MxU8* m_huffmanTables; // 0x6ac - MxU32 maxFrameSize; // 0x6b0 + MxU32 m_maxFrameSize; // 0x6b0 MxU8* m_unk0x6b4; // 0x6b4 static MxResult LoadHeaderAndTrees(MxU8* p_data, MxSmack* p_mxSmack); diff --git a/LEGO1/mxsmkpresenter.cpp b/LEGO1/mxsmkpresenter.cpp index cb0219f3..2a33be97 100644 --- a/LEGO1/mxsmkpresenter.cpp +++ b/LEGO1/mxsmkpresenter.cpp @@ -67,8 +67,8 @@ void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk) void MxSmkPresenter::VTable0x88() { if ((m_mxSmack.m_smack.m_header.m_smkType & 1) != 0) { - MxU32 unk = (m_unk0x71c % m_mxSmack.m_smack.m_header.m_frames); - if (1 < m_unk0x71c && unk == 1) + MxU32 und = (m_unk0x71c % m_mxSmack.m_smack.m_header.m_frames); + if (1 < m_unk0x71c && und == 1) m_unk0x71c = 1; } else {