Merge branch 'master' into create-UtopianPan0xa4-ancesters

Author: madebr

LEGORacers/include/mithrilchain0x8.h

@@ -9,13 +9,46 @@ class BronzeFalcon0xc8770;
 // SIZE 0x8
 class MithrilChain0x8 {
 public:
+	// SIZE 0x18
+	class Entry {
+	public:
+		enum {
+			c_flagActive = 0x01,
+			c_flagLooping = 0x02,
+			c_flagExpired = 0x04,
+		};
+
+		Entry();
+		~Entry();
+
+		void Reset();
+		void Deactivate();
+		void Update(LegoU32 p_elapsedMs);
+		void Draw(BronzeFalcon0xc8770* p_renderer);
+		LegoBool IsActive() { return m_flags & c_flagActive; }
+
+	private:
+		void Clear();
+
+		undefined4 m_unk0x00;   // 0x00
+		undefined4 m_unk0x04;   // 0x04
+		undefined m_unk0x08[4]; // 0x08
+		LegoU32 m_remainingMs;  // 0x0c
+		LegoU32 m_durationMs;   // 0x10
+		LegoU8 m_flags;         // 0x14
+		undefined m_unk0x15[3]; // 0x15
+	};
+
 	MithrilChain0x8();
 	~MithrilChain0x8();
-	void FUN_00494f60(LegoU32 p_unk0x04);
-	void FUN_00494fa0(BronzeFalcon0xc8770* p_unk0x04);
+	void Update(LegoU32 p_elapsedMs);
+	void Draw(BronzeFalcon0xc8770* p_renderer);
 
 private:
-	undefined m_unk0x00[0x8 - 0x00]; // 0x00
+	void Reset();
+
+	Entry* m_entries; // 0x00
+	LegoU32 m_count;  // 0x04
 };
 
 #endif // MITHRILCHAIN0X8_H

LEGORacers/src/menumanager.cpp

@@ -374,7 +374,7 @@ void MenuManager::Run()
 			}
 
 			chain = &m_unk0x04.m_unk0x4374;
-			chain->FUN_00494f60(frameDeltaMs);
+			chain->Update(frameDeltaMs);
 			m_unk0x4cd8->VTable0x54(TRUE);
 			m_unk0x4cd8->VTable0xec(6);
 			m_unk0x4cd8->VTable0xe8(TRUE);
@@ -386,7 +386,7 @@ void MenuManager::Run()
 				m_unk0x4c74.FUN_00469550();
 			}
 
-			chain->FUN_00494fa0(m_unk0x4cd8);
+			chain->Draw(m_unk0x4cd8);
 			m_unk0x4cd8->VTable0xe4();
 			m_unk0x4cd8->VTable0xf0();
 

LEGORacers/src/mithrilchain0x8.cpp

@@ -1,31 +1,119 @@
 #include "mithrilchain0x8.h"
 
 DECOMP_SIZE_ASSERT(MithrilChain0x8, 0x8)
+DECOMP_SIZE_ASSERT(MithrilChain0x8::Entry, 0x18)
 
-// STUB: LEGORACERS 0x0045c3b0
+// FUNCTION: LEGORACERS 0x0045c3b0
 MithrilChain0x8::MithrilChain0x8()
+{
+	m_entries = NULL;
+	m_count = 0;
+}
+
+// FUNCTION: LEGORACERS 0x00490500
+MithrilChain0x8::Entry::Entry()
+{
+	Clear();
+}
+
+// FUNCTION: LEGORACERS 0x00490510
+MithrilChain0x8::Entry::~Entry()
+{
+	Reset();
+}
+
+// FUNCTION: LEGORACERS 0x00490520
+void MithrilChain0x8::Entry::Reset()
+{
+	Deactivate();
+}
+
+// FUNCTION: LEGORACERS 0x00490530
+void MithrilChain0x8::Entry::Clear()
+{
+	m_unk0x00 = 0;
+	m_unk0x04 = 0;
+	m_remainingMs = 0;
+	m_durationMs = 0;
+	m_flags = 0;
+	m_unk0x08[0] = 0;
+	m_unk0x08[1] = 0;
+	m_unk0x08[2] = 0;
+	m_unk0x08[3] = 0;
+}
+
+// FUNCTION: LEGORACERS 0x00490580
+void MithrilChain0x8::Entry::Deactivate()
+{
+	Clear();
+}
+
+// FUNCTION: LEGORACERS 0x00490590
+void MithrilChain0x8::Entry::Update(LegoU32 p_elapsedMs)
+{
+	if (m_flags & c_flagActive) {
+		if (!m_remainingMs) {
+			if (m_flags & c_flagExpired) {
+				Deactivate();
+			}
+			else {
+				m_flags |= c_flagExpired;
+			}
+		}
+
+		if (p_elapsedMs > m_remainingMs) {
+			m_remainingMs = 0;
+			return;
+		}
+
+		m_remainingMs -= p_elapsedMs;
+	}
+}
+
+// STUB: LEGORACERS 0x004905e0
+void MithrilChain0x8::Entry::Draw(BronzeFalcon0xc8770*)
 {
 	// TODO
-	STUB(0x45c3b0);
+	STUB(0x4905e0);
 }
 
-// STUB: LEGORACERS 0x00494d90
+// FUNCTION: LEGORACERS 0x00494d90
 MithrilChain0x8::~MithrilChain0x8()
 {
-	// TODO
-	STUB(0x494d90);
+	Reset();
 }
 
-// STUB: LEGORACERS 0x00494f60
-void MithrilChain0x8::FUN_00494f60(LegoU32)
+// FUNCTION: LEGORACERS 0x00494da0
+void MithrilChain0x8::Reset()
 {
-	// TODO
-	STUB(0x494f60);
+	if (m_entries) {
+		for (LegoU32 i = 0; i < m_count; i++) {
+			m_entries[i].Reset();
+		}
+
+		delete[] m_entries;
+		m_entries = NULL;
+	}
+
+	m_count = 0;
 }
 
-// STUB: LEGORACERS 0x00494fa0
-void MithrilChain0x8::FUN_00494fa0(BronzeFalcon0xc8770*)
+// FUNCTION: LEGORACERS 0x00494f60
+void MithrilChain0x8::Update(LegoU32 p_elapsedMs)
 {
-	// TODO
-	STUB(0x494fa0);
+	for (LegoU32 i = 0; i < m_count; i++) {
+		if (m_entries[i].IsActive()) {
+			m_entries[i].Update(p_elapsedMs);
+		}
+	}
+}
+
+// FUNCTION: LEGORACERS 0x00494fa0
+void MithrilChain0x8::Draw(BronzeFalcon0xc8770* p_renderer)
+{
+	for (LegoU32 i = 0; i < m_count; i++) {
+		if (m_entries[i].IsActive()) {
+			m_entries[i].Draw(p_renderer);
+		}
+	}
 }