From bc3724680f8bc063fe2ef05896e32226d160adcd Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sat, 14 Oct 2023 09:18:53 -0400
Subject: [PATCH] Add getter for MIDIInitialized, fix virtual function decl

---
 LEGO1/mxmidipresenter.cpp | 7 ++++---
 LEGO1/mxmidipresenter.h   | 4 ++--
 LEGO1/mxmusicmanager.h    | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/LEGO1/mxmidipresenter.cpp b/LEGO1/mxmidipresenter.cpp
index f16ecf3e..c0669220 100644
--- a/LEGO1/mxmidipresenter.cpp
+++ b/LEGO1/mxmidipresenter.cpp
@@ -7,7 +7,8 @@
 DECOMP_SIZE_ASSERT(MxMIDIPresenter, 0x58);
 
 // OFFSET: LEGO1 0x100c25e0
-MxMIDIPresenter::MxMIDIPresenter() {
+MxMIDIPresenter::MxMIDIPresenter()
+{
   Init();
 }
 
@@ -30,9 +31,9 @@ void MxMIDIPresenter::Destroy(MxBool p_fromDestructor)
 }
 
 // OFFSET: LEGO1 0x100c2940
-void MxMIDIPresenter::EndMIDIAction()
+void MxMIDIPresenter::DoneTickle()
 {
-  if(!MusicManager()->m_MIDIInitialized) {
+  if (!MusicManager()->GetMIDIInitialized()) {
     this->EndAction();
   }
 }
\ No newline at end of file
diff --git a/LEGO1/mxmidipresenter.h b/LEGO1/mxmidipresenter.h
index cf6ee88e..9fa3e0a6 100644
--- a/LEGO1/mxmidipresenter.h
+++ b/LEGO1/mxmidipresenter.h
@@ -8,7 +8,7 @@ class MxMIDIPresenter : public MxMusicPresenter
 {
 public:
   MxMIDIPresenter();
-  ~MxMIDIPresenter();
+  virtual ~MxMIDIPresenter() override;
 
   // OFFSET: LEGO1 0x100c2650
   inline virtual const char *ClassName() const override // vtable+0xc
@@ -23,7 +23,7 @@ class MxMIDIPresenter : public MxMusicPresenter
     return !strcmp(name, MxMIDIPresenter::ClassName()) || MxMusicPresenter::IsA(name);
   }
 
-  virtual void EndMIDIAction(); // vtable+0x2a
+  virtual void DoneTickle() override; // vtable+0x2c
 
 private:
   void Init();
diff --git a/LEGO1/mxmusicmanager.h b/LEGO1/mxmusicmanager.h
index 013867a7..b46c8878 100644
--- a/LEGO1/mxmusicmanager.h
+++ b/LEGO1/mxmusicmanager.h
@@ -16,6 +16,8 @@ class MxMusicManager : public MxAudioManager
   virtual void SetVolume(MxS32 p_volume) override; // vtable+2c
   virtual MxResult StartMIDIThread(MxU32 p_frequencyMS, MxU8 p_noRegister); // vtable+30
 
+  inline MxBool GetMIDIInitialized() { return m_MIDIInitialized; }
+
 private:
   void Destroy(MxBool p_fromDestructor);
   void DeinitializeMIDI();
@@ -24,9 +26,7 @@ class MxMusicManager : public MxAudioManager
   void SetMIDIVolume();
 
   HMIDISTRM m_MIDIStreamH;  // 0x30
-public:
   MxBool m_MIDIInitialized; // 0x34
-private:
   undefined4 m_unk38;       // 0x38
   undefined4 m_unk3c;       // 0x3c
   undefined4 m_unk40;       // 0x40