Reintroduce missing changes from pull request #2200 (#2213)

* Reintroduce missing changes from pull request  #2200

* m_Do_audio OK

7 files changed, 33 insertions, 6 deletions

diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h
index 03e1d89527..afd7aca753 100644
--- a/include/JSystem/JAudio2/JAISeMgr.h
+++ b/include/JSystem/JAudio2/JAISeMgr.h
@@ -95,7 +95,7 @@ public:
     /* 802A0768 */ bool startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
     /* 802A08D0 */ int getNumActiveSe() const;
 
-    /* 802A08FC */ virtual ~JAISeMgr();  // inline?
+    /* 802A08FC */ virtual ~JAISeMgr() {}
     /* 802A0168 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
     /* 802A01D8 */ virtual int releaseSeqData(JAISeqDataRegion const&);
 
diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h
index 81642eeef1..f15f3d75a3 100644
--- a/include/JSystem/JAudio2/JAISeqMgr.h
+++ b/include/JSystem/JAudio2/JAISeqMgr.h
@@ -29,7 +29,7 @@ public:
     /* 802A1F58 */ JAISeq* beginStartSeq_();
     /* 802A1FE8 */ bool endStartSeq_(JAISeq*, JAISoundHandle*);
 
-    /* 802A20F0 */ virtual ~JAISeqMgr();  // inline?
+    /* 802A20F0 */ virtual ~JAISeqMgr() {}
     /* 802A1804 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
     /* 802A1870 */ virtual int releaseSeqData(JAISeqDataRegion const&);
 
diff --git a/include/Z2AudioLib/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo.h
index 2ccc73ff7f..df17a68936 100644
--- a/include/Z2AudioLib/Z2SoundInfo.h
+++ b/include/Z2AudioLib/Z2SoundInfo.h
@@ -17,7 +17,7 @@ public:
     /* 802BB6DC */ virtual void getSeInfo(JAISoundID, JAISe*) const;
     /* 802BB8B4 */ virtual void getSeqInfo(JAISoundID, JAISeq*) const;
     /* 802BB8E0 */ virtual void getStreamInfo(JAISoundID, JAIStream*) const;
-    /* 802BBBE0 */ virtual ~Z2SoundInfo();
+    /* 802BBBE0 */ virtual ~Z2SoundInfo() {}
 
     /* 802BB158 */ JAUAudibleParam getAudibleSwFull(JAISoundID);
     /* 802BBA10 */ const char* getStreamFilePath(JAISoundID);
diff --git a/include/Z2AudioLib/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2.h
index 515ebb69b2..780e815124 100644
--- a/include/Z2AudioLib/Z2SpeechMgr2.h
+++ b/include/Z2AudioLib/Z2SpeechMgr2.h
@@ -8,7 +8,7 @@
 struct Z2SpeechStarter : public Z2SoundStarter {
     /* 802CCFB8 */ Z2SpeechStarter();
 
-    /* 802CBCEC */ virtual ~Z2SpeechStarter();
+    /* 802CBCEC */ virtual ~Z2SpeechStarter() {}
     /* 802CCFF8 */ virtual bool startSound(JAISoundID, JAISoundHandle*,
                                            JGeometry::TVec3<f32> const*, u32, f32, f32, f32, f32,
                                            f32, u32);
@@ -20,6 +20,7 @@ struct Z2SpeechMgr : public JASGlobalInstance<Z2SpeechMgr> {
 
 struct Z2SpeechMgr2 : public JASGlobalInstance<Z2SpeechMgr2> {
     /* 802CBC60 */ Z2SpeechMgr2();
+    ~Z2SpeechMgr2() {}
     /* 802CBD88 */ void setString(u16 const*, s16, u8, u16);
     /* 802CBF60 */ void setTextCount(s16);
     /* 802CC190 */ void speakOneWord(bool);
diff --git a/include/d/actor/d_a_tag_TWgate.h b/include/d/actor/d_a_tag_TWgate.h
index 77f290a171..c28a50cb8b 100644
--- a/include/d/actor/d_a_tag_TWgate.h
+++ b/include/d/actor/d_a_tag_TWgate.h
@@ -112,7 +112,7 @@ public:
         callInit();
     }
 
-    static u8 const mAttr[1 + 3 /* padding */];
+    static u8 const mAttr[1];
     static actionFunc ActionTable[13][2];
 
 private:
diff --git a/include/d/actor/d_a_tag_qs.h b/include/d/actor/d_a_tag_qs.h
index 7a6ef1e321..a47e02f3da 100644
--- a/include/d/actor/d_a_tag_qs.h
+++ b/include/d/actor/d_a_tag_qs.h
@@ -1,5 +1,31 @@
 #ifndef D_A_TAG_QS_H
 #define D_A_TAG_QS_H
 
+#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/d_cc_d.h"
+
+class daTagQs_c : public fopAc_ac_c {
+public:
+    /* 80D5DE78 */ ~daTagQs_c();
+    /* 80D5DFB0 */ int create();
+    /* 80D5E1FC */ f32 getPower();
+    /* 80D5E220 */ f32 getSafeArea();
+    /* 80D5E244 */ f32 getPower80();
+    /* 80D5E268 */ f32 getCenterPower();
+    /* 80D5E28C */ f32 calcPower(f32, f32);
+    /* 80D5E9F8 */ int execute();
+    /* 80D5EBF8 */ int draw();
+
+    u8 getType() { return fopAcM_GetParamBit(this, 0, 1); }
+    int getSwNo() { return fopAcM_GetParamBit(this, 1, 8); }
+
+    /* 0x568 */ f32 field_0x568;
+    /* 0x56C */ f32 field_0x56c;
+    /* 0x570 */ int field_0x570;
+    /* 0x574 */ int field_0x574;
+    /* 0x578 */ dCcD_Cyl mCyl;
+    /* 0x6B4 */ dCcD_Stts mStts;
+};
 
 #endif /* D_A_TAG_QS_H */
diff --git a/include/d/d_menu_option.h b/include/d/d_menu_option.h
index 356a3a1c06..81d7ff4a86 100644
--- a/include/d/d_menu_option.h
+++ b/include/d/d_menu_option.h
@@ -87,7 +87,7 @@ public:
     /* 801E8CB0 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
     /* 801E8CFC */ u8 yesnoWakuAlpahAnm(u8);
 
-    /* 801E8E6C */ virtual void draw();
+    /* 801E8E6C */ virtual void draw() { _draw(); }
     /* 801E2014 */ virtual ~dMenu_Option_c();
 
     u8 getQuitStatus() { return mQuitStatus; }