From 11dafaf816b0a4364a5290a5950e1d937999d7bb Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Wed, 11 Oct 2023 03:50:14 -0400
Subject: [PATCH] Fix MxDSMediaAction structure/matches (#194)

---
 LEGO1/mxdsmediaaction.cpp | 11 ++++-------
 LEGO1/mxdsmediaaction.h   |  7 +++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/mxdsmediaaction.cpp
index 19f3bde2..125156d7 100644
--- a/LEGO1/mxdsmediaaction.cpp
+++ b/LEGO1/mxdsmediaaction.cpp
@@ -8,8 +8,8 @@ DECOMP_SIZE_ASSERT(MxDSMediaAction, 0xb8)
 MxDSMediaAction::MxDSMediaAction()
 {
   this->m_mediaSrcPath = NULL;
-  this->m_unk9c = 0;
-  this->m_unka0 = 0;
+  this->m_unk9c.m_unk00 = 0;
+  this->m_unk9c.m_unk04 = 0;
   this->m_framesPerSecond = 0;
   this->m_mediaFormat = 0;
   this->m_paletteManagement = 1;
@@ -29,10 +29,7 @@ void MxDSMediaAction::CopyFrom(MxDSMediaAction &p_dsMediaAction)
 {
   CopyMediaSrcPath(p_dsMediaAction.m_mediaSrcPath);
 
-  // TODO
   this->m_unk9c = p_dsMediaAction.m_unk9c;
-  this->m_unka0 = p_dsMediaAction.m_unka0;
-
   this->m_framesPerSecond = p_dsMediaAction.m_framesPerSecond;
   this->m_mediaFormat = p_dsMediaAction.m_mediaFormat;
   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);
 
   GetString(p_source, this->m_mediaSrcPath, this, &MxDSMediaAction::CopyMediaSrcPath);
-  GetScalar(p_source, this->m_unk9c);
-  GetScalar(p_source, this->m_unka0);
+  GetScalar(p_source, this->m_unk9c.m_unk00);
+  GetScalar(p_source, this->m_unk9c.m_unk04);
   GetScalar(p_source, this->m_framesPerSecond);
   GetScalar(p_source, this->m_mediaFormat);
   GetScalar(p_source, this->m_paletteManagement);
diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/mxdsmediaaction.h
index 34b6695e..a6303227 100644
--- a/LEGO1/mxdsmediaaction.h
+++ b/LEGO1/mxdsmediaaction.h
@@ -3,6 +3,7 @@
 
 #include "decomp.h"
 #include "mxdsaction.h"
+#include "mxpoint32.h"
 
 // VTABLE 0x100dcd40
 // SIZE 0xb8
@@ -38,8 +39,10 @@ class MxDSMediaAction : public MxDSAction
 private:
   MxU32 m_sizeOnDisk;
   char *m_mediaSrcPath;
-  undefined4 m_unk9c;
-  undefined4 m_unka0;
+  struct {
+    undefined4 m_unk00;
+    undefined4 m_unk04;
+  } m_unk9c;
   MxS32 m_framesPerSecond;
   MxS32 m_mediaFormat;
   MxS32 m_paletteManagement;