Merge branch 'master' into mxdsparallelaction

LEGO1/mxdsaction.h

@@ -79,6 +79,8 @@ class MxDSAction : public MxDSObject
   undefined4 m_unk84;
   undefined4 m_unk88;
   MxOmni *m_omni; // 0x8c
+
+protected:
   MxLong m_someTimingField; // 0x90
 };
 

LEGO1/mxdsmultiaction.cpp

@@ -39,6 +39,55 @@ MxDSMultiAction &MxDSMultiAction::operator=(MxDSMultiAction &p_dsMultiAction)
   return *this;
 }
 
+// OFFSET: LEGO1 0x100ca290
+void MxDSMultiAction::SetSomeTimingField(MxLong p_someTimingField)
+{
+  this->m_someTimingField = p_someTimingField;
+
+  MxDSActionListCursor cursor(this->m_actions);
+  MxDSAction *action;
+  while (cursor.Next(action))
+    action->SetSomeTimingField(p_someTimingField);
+}
+
+// OFFSET: LEGO1 0x100ca370
+void MxDSMultiAction::MergeFrom(MxDSAction &p_dsMultiAction)
+{
+  MxDSAction::MergeFrom(p_dsMultiAction);
+
+  MxDSActionListCursor cursor(this->m_actions);
+  MxDSAction *action;
+  while (cursor.Next(action))
+    action->MergeFrom(p_dsMultiAction);
+}
+
+// OFFSET: LEGO1 0x100ca450
+MxBool MxDSMultiAction::HasId(MxU32 p_objectId)
+{
+  if (this->GetObjectId() == p_objectId)
+    return TRUE;
+
+  MxDSActionListCursor cursor(this->m_actions);
+  MxDSAction *action;
+  while (cursor.Next(action)) {
+    if (action->HasId(p_objectId))
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+// OFFSET: LEGO1 0x100ca550
+MxDSAction *MxDSMultiAction::Clone()
+{
+  MxDSMultiAction *clone = new MxDSMultiAction();
+
+  if (clone)
+    *clone = *this;
+
+  return clone;
+}
+
 // OFFSET: LEGO1 0x100ca5e0
 undefined4 MxDSMultiAction::unk14()
 {
@@ -66,3 +115,40 @@ MxU32 MxDSMultiAction::GetSizeOnDisk()
 
   return totalSizeOnDisk;
 }
+
+// OFFSET: LEGO1 0x100ca7b0
+void MxDSMultiAction::Deserialize(char **p_source, MxS16 p_unk24)
+{
+  MxDSAction::Deserialize(p_source, p_unk24);
+
+  MxU32 extraFlag = *(MxU32*)(*p_source + 4) & 1;
+  *p_source += 12;
+
+  MxU32 count = *(MxU32*) *p_source;
+  *p_source += sizeof(count);
+
+  if (count) {
+    while (count--) {
+      MxU32 extraFlag = *(MxU32*)(*p_source + 4) & 1;
+      *p_source += 8;
+
+      MxDSAction *action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk24);
+      *p_source += extraFlag;
+
+      this->m_actions->Append(action);
+    }
+  }
+
+  *p_source += extraFlag;
+}
+
+// OFFSET: LEGO1 0x100ca8c0
+void MxDSMultiAction::SetAtomId(MxAtomId p_atomId)
+{
+  MxDSAction::SetAtomId(p_atomId);
+
+  MxDSActionListCursor cursor(this->m_actions);
+  MxDSAction *action;
+  while (cursor.Next(action))
+    action->SetAtomId(p_atomId);
+}

LEGO1/mxdsmultiaction.h

@@ -30,6 +30,12 @@ class MxDSMultiAction : public MxDSAction
 
   virtual undefined4 unk14(); // vtable+14;
   virtual MxU32 GetSizeOnDisk(); // vtable+18;
+  virtual void Deserialize(char **p_source, MxS16 p_unk24); // vtable+1c;
+  virtual void SetAtomId(MxAtomId p_atomId); // vtable+20;
+  virtual MxDSAction *Clone(); // vtable+2c;
+  virtual void MergeFrom(MxDSAction &p_dsAction); // vtable+30;
+  virtual MxBool HasId(MxU32 p_objectId); // vtable+34;
+  virtual void SetSomeTimingField(MxLong p_someTimingField); // vtable+38;
 
 private:
   MxU32 m_sizeOnDisk;