mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 16:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MxDSMediaAction structure/matches (#194)

Browse Source
This commit is contained in:
Christian Semmler
2023-10-11 03:50:14 -04:00
committed by GitHub
parent 93ce1ccfe8
commit 11dafaf816
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
LEGO1/mxdsmediaaction.cpp
View File

@@ -8,8 +8,8 @@ DECOMP_SIZE_ASSERT(MxDSMediaAction, 0xb8)
MxDSMediaAction::MxDSMediaAction() MxDSMediaAction::MxDSMediaAction()
{ {
this->m_mediaSrcPath = NULL; this->m_mediaSrcPath = NULL;
this->m_unk9c = 0; this->m_unk9c.m_unk00 = 0;
this->m_unka0 = 0; this->m_unk9c.m_unk04 = 0;
this->m_framesPerSecond = 0; this->m_framesPerSecond = 0;
this->m_mediaFormat = 0; this->m_mediaFormat = 0;
this->m_paletteManagement = 1; this->m_paletteManagement = 1;
@@ -29,10 +29,7 @@ void MxDSMediaAction::CopyFrom(MxDSMediaAction &p_dsMediaAction)
{ {
CopyMediaSrcPath(p_dsMediaAction.m_mediaSrcPath); CopyMediaSrcPath(p_dsMediaAction.m_mediaSrcPath);
// TODO
this->m_unk9c = p_dsMediaAction.m_unk9c; this->m_unk9c = p_dsMediaAction.m_unk9c;
this->m_unka0 = p_dsMediaAction.m_unka0;
this->m_framesPerSecond = p_dsMediaAction.m_framesPerSecond; this->m_framesPerSecond = p_dsMediaAction.m_framesPerSecond;
this->m_mediaFormat = p_dsMediaAction.m_mediaFormat; this->m_mediaFormat = p_dsMediaAction.m_mediaFormat;
this->m_paletteManagement = p_dsMediaAction.m_paletteManagement; this->m_paletteManagement = p_dsMediaAction.m_paletteManagement;
@@ -71,8 +68,8 @@ void MxDSMediaAction::Deserialize(char **p_source, MxS16 p_unk24)
MxDSAction::Deserialize(p_source, p_unk24); MxDSAction::Deserialize(p_source, p_unk24);
GetString(p_source, this->m_mediaSrcPath, this, &MxDSMediaAction::CopyMediaSrcPath); GetString(p_source, this->m_mediaSrcPath, this, &MxDSMediaAction::CopyMediaSrcPath);
GetScalar(p_source, this->m_unk9c); GetScalar(p_source, this->m_unk9c.m_unk00);
GetScalar(p_source, this->m_unka0); GetScalar(p_source, this->m_unk9c.m_unk04);
GetScalar(p_source, this->m_framesPerSecond); GetScalar(p_source, this->m_framesPerSecond);
GetScalar(p_source, this->m_mediaFormat); GetScalar(p_source, this->m_mediaFormat);
GetScalar(p_source, this->m_paletteManagement); GetScalar(p_source, this->m_paletteManagement);

7
LEGO1/mxdsmediaaction.h
View File

@@ -3,6 +3,7 @@
#include "decomp.h" #include "decomp.h"
#include "mxdsaction.h" #include "mxdsaction.h"
#include "mxpoint32.h"
// VTABLE 0x100dcd40 // VTABLE 0x100dcd40
// SIZE 0xb8 // SIZE 0xb8
@@ -38,8 +39,10 @@ public:
private: private:
MxU32 m_sizeOnDisk; MxU32 m_sizeOnDisk;
char *m_mediaSrcPath; char *m_mediaSrcPath;
undefined4 m_unk9c; struct {
undefined4 m_unka0; undefined4 m_unk00;
undefined4 m_unk04;
} m_unk9c;
MxS32 m_framesPerSecond; MxS32 m_framesPerSecond;
MxS32 m_mediaFormat; MxS32 m_mediaFormat;
MxS32 m_paletteManagement; MxS32 m_paletteManagement;