isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 19:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename variable

Browse Source
This commit is contained in:
Christian Semmler 2023-12-22 10:00:00 -05:00
parent bc57e0e335
commit 1a761c9e83
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/mxloopingsmkpresenter.cpp
View File

@ -39,8 +39,8 @@ void MxLoopingSmkPresenter::Destroy(MxBool p_fromDestructor)
// FUNCTION: LEGO1 0x100b4a00 // FUNCTION: LEGO1 0x100b4a00
void MxLoopingSmkPresenter::VTable0x88() void MxLoopingSmkPresenter::VTable0x88()
{ {
if (m_mxSmack.m_smackTag.Frames == m_elapsedFrames) { if (m_mxSmack.m_smackTag.Frames == m_currentFrame) {
m_elapsedFrames = 0; m_currentFrame = 0;
// TODO: struct incorrect, Palette at wrong offset? // TODO: struct incorrect, Palette at wrong offset?
memset(&m_mxSmack.m_smackTag.Palette[4], 0, sizeof(m_mxSmack.m_smackTag.Palette)); memset(&m_mxSmack.m_smackTag.Palette[4], 0, sizeof(m_mxSmack.m_smackTag.Palette));
} }

16
LEGO1/mxsmkpresenter.cpp
View File

@ -21,7 +21,7 @@ MxSmkPresenter::~MxSmkPresenter()
// FUNCTION: LEGO1 0x100b38d0 // FUNCTION: LEGO1 0x100b38d0
void MxSmkPresenter::Init() void MxSmkPresenter::Init()
{ {
m_elapsedFrames = 0; m_currentFrame = 0;
memset(&m_mxSmack, 0, sizeof(m_mxSmack)); memset(&m_mxSmack, 0, sizeof(m_mxSmack));
m_flags &= 0xfd; m_flags &= 0xfd;
m_flags &= 0xfb; m_flags &= 0xfb;
@ -65,8 +65,8 @@ void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk)
MxU8* bitmapData = m_bitmap->GetBitmapData(); MxU8* bitmapData = m_bitmap->GetBitmapData();
MxU8* chunkData = p_chunk->GetData(); MxU8* chunkData = p_chunk->GetData();
MxBool paletteChanged = m_mxSmack.m_frameTypes[m_elapsedFrames] & 1; MxBool paletteChanged = m_mxSmack.m_frameTypes[m_currentFrame] & 1;
m_elapsedFrames++; m_currentFrame++;
VTable0x88(); VTable0x88();
MxRectList list(TRUE); MxRectList list(TRUE);
@ -90,13 +90,13 @@ void MxSmkPresenter::LoadFrame(MxStreamChunk* p_chunk)
void MxSmkPresenter::VTable0x88() void MxSmkPresenter::VTable0x88()
{ {
if ((m_mxSmack.m_smackTag.SmackerType & 1) != 0) { if ((m_mxSmack.m_smackTag.SmackerType & 1) != 0) {
MxU32 und = (m_elapsedFrames % m_mxSmack.m_smackTag.Frames); MxU32 und = (m_currentFrame % m_mxSmack.m_smackTag.Frames);
if (1 < m_elapsedFrames && und == 1) if (1 < m_currentFrame && und == 1)
m_elapsedFrames = 1; m_currentFrame = 1;
} }
else { else {
if (m_mxSmack.m_smackTag.Frames == m_elapsedFrames) { if (m_mxSmack.m_smackTag.Frames == m_currentFrame) {
m_elapsedFrames = 0; m_currentFrame = 0;
// TODO: struct incorrect, Palette at wrong offset? // TODO: struct incorrect, Palette at wrong offset?
memset(&m_mxSmack.m_smackTag.Palette[4], 0, sizeof(m_mxSmack.m_smackTag.Palette)); memset(&m_mxSmack.m_smackTag.Palette[4], 0, sizeof(m_mxSmack.m_smackTag.Palette));
} }

4
LEGO1/mxsmkpresenter.h
View File

@ -38,8 +38,8 @@ class MxSmkPresenter : public MxVideoPresenter {
void Destroy(MxBool p_fromDestructor); void Destroy(MxBool p_fromDestructor);
protected: protected:
MxSmack m_mxSmack; // 0x64 MxSmack m_mxSmack; // 0x64
MxU32 m_elapsedFrames; // 0x71c MxU32 m_currentFrame; // 0x71c
}; };
#endif // MXSMKPRESENTER_H #endif // MXSMKPRESENTER_H