Fixes for other compilers (#1912)

* remove invalid virtual keywords

* remove duplicate inline

* remove leading 0 in character literals

* add missing public keywords

* fix some struct/class mismatches

include/JSystem/J3DGraphAnimator/J3DAnimation.h

@@ -338,6 +338,7 @@ private:
 };  // Size: 0x28
 
 class J3DAnmTransformFull : public J3DAnmTransform {
+public:
     /* 8032C2AC */ virtual ~J3DAnmTransformFull();
     /* 8032C318 */ virtual s32 getKind() const;
     /* 80328E90 */ virtual void getTransform(u16, J3DTransformInfo*) const;
@@ -347,14 +348,15 @@ private:
 };  // Size: 0x24
 
 class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull {
+public:
     /* 8032C228 */ virtual ~J3DAnmTransformFullWithLerp();
     /* 8032C2A4 */ virtual s32 getKind() const;
     /* 803291F0 */ virtual void getTransform(u16, J3DTransformInfo*) const;
 };  // Size: 0x24
 
 struct J3DTextureSRTInfo;
-struct J3DModelData;
-struct J3DMaterialTable;
+class J3DModelData;
+class J3DMaterialTable;
 
 class J3DAnmTextureSRTKey : public J3DAnmBase {
 public:

include/JSystem/J3DGraphAnimator/J3DCluster.h

@@ -3,7 +3,7 @@
 
 #include "dolphin/types.h"
 
-struct J3DDeformer;
+class J3DDeformer;
 
 struct J3DCluster {
     /* 0x00 */ f32 field_0x0;

include/JSystem/J3DGraphAnimator/J3DJointTree.h

@@ -11,7 +11,7 @@ struct J3DModelHierarchy {
     /* 0x2 */ u16 mValue;
 };
 
-struct J3DMaterialTable;
+class J3DMaterialTable;
 
 struct J3DDrawMtxData {
     /* 803115E0 */ J3DDrawMtxData();

include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h

@@ -3,12 +3,12 @@
 
 #include "dolphin/types.h"
 
-struct J3DMaterial;
-struct J3DTexture;
-struct J3DAnmColor;
-struct J3DAnmTexPattern;
-struct J3DAnmTextureSRTKey;
-struct J3DAnmTevRegKey;
+class J3DMaterial;
+class J3DTexture;
+class J3DAnmColor;
+class J3DAnmTexPattern;
+class J3DAnmTextureSRTKey;
+class J3DAnmTevRegKey;
 class JUTNameTab;
 
 class J3DMaterialTable {

include/JSystem/J3DGraphBase/J3DVertex.h

@@ -7,8 +7,8 @@
 
 typedef struct _GXColor GXColor;
 class J3DModel;
-struct J3DAnmVtxColor;
-struct J3DVertexBuffer;
+class J3DAnmVtxColor;
+class J3DVertexBuffer;
 
 struct J3DVtxColorCalc {
     /* 8032E180 */ void calc(J3DModel*);

include/JSystem/J3DGraphLoader/J3DAnmLoader.h

@@ -5,7 +5,7 @@
 
 enum J3DAnmLoaderDataBaseFlag { J3DLOADER_UNK_FLAG0 };
 
-struct J3DAnmBase;
+class J3DAnmBase;
 
 struct J3DAnmLoaderDataBase {
     /* 80337B40 */ static void* load(void const*, J3DAnmLoaderDataBaseFlag);

include/JSystem/J3DGraphLoader/J3DJointFactory.h

@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "dolphin/types.h"
 
-struct J3DJoint;
+class J3DJoint;
 struct ResNTAB;
 
 struct J3DJointInitData {

include/JSystem/J3DGraphLoader/J3DShapeFactory.h

@@ -4,9 +4,9 @@
 #include "dolphin/gx/GXAttr.h"
 #include "dolphin/mtx/vec.h"
 
-struct J3DShape;
-struct J3DShapeMtx;
-struct J3DShapeDraw;
+class J3DShape;
+class J3DShapeMtx;
+class J3DShapeDraw;
 struct ResNTAB;
 
 struct J3DShapeInitData {

include/JSystem/JAudio2/JAIAudience.h

@@ -3,7 +3,7 @@
 
 #include "JSystem/JGeometry.h"
 
-struct JAIAudible;
+class JAIAudible;
 class JAISoundID;
 struct JASSoundParams;
 

include/JSystem/JAudio2/JAISeqMgr.h

@@ -6,7 +6,7 @@
 #include "JSystem/JSupport/JSUList.h"
 
 struct JAIAudience;
-struct JAISeq;
+class JAISeq;
 
 class JAISeqMgr : public JAISeqDataUser, public JASGlobalInstance<JAISeqMgr> {
 public:

include/JSystem/JAudio2/JAISoundInfo.h

@@ -4,10 +4,6 @@
 #include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JAudio2/JASGadget.h"
 
-struct JAISe;
-struct JAISeq;
-struct JAIStream;
-
 struct JAISoundInfo : public JASGlobalInstance<JAISoundInfo> {
     /* 802A2D34 */ JAISoundInfo(bool);
     virtual u32 getSoundType(JAISoundID) const = 0;

include/JSystem/JAudio2/JAIStreamMgr.h

@@ -7,7 +7,8 @@
 
 class JAIStreamMgr;
 
-struct JAIStream {
+class JAIStream {
+public:
     /* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr<JAIStream>*);
     /* 802A319C */ void JAIStreamMgr_startID_(JAISoundID, s32, JGeometry::TVec3<f32> const*,
                                               JAIAudience*, int);

include/JSystem/JParticle/JPAEmitter.h

@@ -10,10 +10,10 @@
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JSupport/JSUList.h"
 
-struct JPAResourceManager;
-struct JPABaseEmitter;
-struct JPAEmitterManager;
-struct JPAParticleCallBack;
+class JPAResourceManager;
+class JPABaseEmitter;
+class JPAEmitterManager;
+class JPAParticleCallBack;
 
 struct JPAEmitterWorkData {
     /* 0x00 */ JPABaseEmitter* mpEmtr;

include/JSystem/JParticle/JPAEmitterManager.h

@@ -7,12 +7,12 @@
 #include "JSystem/JSupport/JSUList.h"
 #include "JSystem/JGeometry.h"
 
-struct JPAEmitterCallBack;
-struct JPAParticleCallBack;
-struct JPABaseEmitter;
-struct JPAResourceManager;
-struct JPABaseParticle;
-struct JKRHeap;
+class JPAEmitterCallBack;
+class JPAParticleCallBack;
+class JPABaseEmitter;
+class JPAResourceManager;
+class JPABaseParticle;
+class JKRHeap;
 struct JPAEmitterWorkData;
 
 class JPAEmitterManager {

include/JSystem/JParticle/JPAResourceManager.h

@@ -5,8 +5,8 @@
 #include "dolphin/types.h"
 
 class JKRHeap;
-class ResTIMG;
 class JPAResource;
+struct ResTIMG;
 
 class JPAResourceManager {
 public:

include/Z2AudioLib/Z2SoundInfo.h

@@ -3,14 +3,6 @@
 
 #include "JSystem/JAudio2/JAISoundInfo.h"
 
-struct JAISeq;
-
-struct JAISound;
-
-struct JAIStream;
-
-struct JAISe;
-
 struct JAUSoundInfo : public JASGlobalInstance<JAUSoundInfo> {
     virtual void getAudibleSw(JAISoundID) const = 0;
     virtual void getBgmSeqResourceID(JAISoundID) const = 0;

include/d/bg/d_bg_w.h

@@ -280,7 +280,7 @@ public:
     /* 8007C910 */ virtual void WallCorrectSort(dBgS_Acch*);
     /* 8007D470 */ virtual bool RoofChk(dBgS_RoofChk*);
     /* 8007D830 */ virtual bool SplGrpChk(dBgS_SplGrpChk*);
-    /* 8007DF00 */ virtual bool SphChk(dBgS_SphChk*, virtual void*);
+    /* 8007DF00 */ virtual bool SphChk(dBgS_SphChk*, void*);
     /* 8007B3AC */ virtual s32 GetExitId(cBgS_PolyInfo const&);
     /* 8007B3D8 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&);
     /* 8007B404 */ virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
@@ -311,11 +311,11 @@ public:
     /* 8007B904 */ virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&);
     /* 8007DF28 */ virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
     /* 8007DF58 */ virtual u8 GetGrpSoundId(cBgS_PolyInfo const&);
-    /* 8007DF88 */ virtual void CrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*,
+    /* 8007DF88 */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                        csXyz*);
-    /* 8007DFC4 */ virtual void TransPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*,
+    /* 8007DFC4 */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                          csXyz*);
-    /* 8007E000 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*,
+    /* 8007E000 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*,
                                              csXyz*, csXyz*);
     /* 8007E444 */ virtual void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
     /* 8007E474 */ virtual void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);

include/d/bg/d_bg_w_kcol.h

@@ -70,7 +70,7 @@ public:
     /* 80080330 */ virtual void WallCorrectSort(dBgS_Acch*);
     /* 80081E18 */ virtual bool RoofChk(dBgS_RoofChk*);
     /* 80082184 */ virtual bool SplGrpChk(dBgS_SplGrpChk*);
-    /* 800824EC */ virtual bool SphChk(dBgS_SphChk*, virtual void*);
+    /* 800824EC */ virtual bool SphChk(dBgS_SphChk*, void*);
     /* 800829F0 */ virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const;
     /* 80082A20 */ virtual s32 GetExitId(cBgS_PolyInfo const&);
     /* 80082A50 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&);
@@ -102,11 +102,11 @@ public:
     /* 80082EFC */ virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&);
     /* 80082F2C */ virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
     /* 80082F5C */ virtual u8 GetGrpSoundId(cBgS_PolyInfo const&);
-    /* 80082F8C */ virtual void CrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*,
+    /* 80082F8C */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                        csXyz*);
-    /* 80082F90 */ virtual void TransPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*,
+    /* 80082F90 */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                          csXyz*);
-    /* 80082F94 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*,
+    /* 80082F94 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*,
                                              csXyz*, csXyz*);
 
     KC_PrismData* getPrismData(int poly_index) const { return &m_pkc_head->m_prism_data[poly_index]; }

include/d/com/d_com_inf_game.h

@@ -328,12 +328,11 @@ public:
     void setItemPachinkoNumCount(s16 seeds) { mItemPachinkoNumCount += seeds; }
     void setItemKeyNumCount(s16 keys) { mItemKeyNumCount += keys; }
     void setItemMaxLifeCount(s16 max) { mItemMaxLifeCount += max; }
-    void setOxygen(int oxygen) { mOxygen = oxygen; }
+    void setOxygen(s32 oxygen) { mOxygen = oxygen; }
     void setNowOxygen(s32 oxygen) { mNowOxygen = oxygen; }
     void setOxygenCount(s32 oxygen) { mOxygenCount += oxygen; }
     int getOxygen() { return mOxygen; }
     void setMaxOxygen(int max) { mMaxOxygen = max; }
-    void setOxygen(s32 i_oxygen) { mOxygen = i_oxygen; }
     int getMaxOxygen() { return mMaxOxygen; }
     int getNowOxygen() { return mNowOxygen; }
     void setItemNowLife(u16 life) { mItemNowLife = life; }

include/d/d_lib.h

@@ -7,7 +7,7 @@
 
 class fopAc_ac_c;
 
-struct JKRAramArchive;
+class JKRAramArchive;
 u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName);
 BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
                                 cXyz const* param_3);

include/d/d_name.h

@@ -10,7 +10,7 @@ class J2DAnmColorKey;
 class J2DAnmTextureSRTKey;
 class J2DTextBox;
 class JUTFont;
-struct STControl;
+class STControl;
 
 class dNm_HIO_c {
 public:

include/d/d_stage.h

@@ -979,7 +979,7 @@ int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3,
 void dStage_Create();
 static s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0);
 void dStage_restartRoom(u32 roomParam, u32 mode, int param_2);
-struct cBgS_GndChk;
+class cBgS_GndChk;
 int dStage_RoomCheck(cBgS_GndChk* gndChk);
 void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* stageDt, int param_2);
 void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2);

include/d/menu/d_menu_collect.h

@@ -6,7 +6,7 @@
 
 class CPaneMgr;
 struct CSTControl;
-struct STControl;
+class STControl;
 class dMsgString_c;
 class dMenu_save_c;
 class dMenu_Option_c;

include/d/menu/d_menu_dmap.h

@@ -11,7 +11,7 @@ class J2DPicture;
 class J2DScreen;
 class JKRArchive;
 class JKRExpHeap;
-struct STControl;
+class STControl;
 class dMenu_DmapMapCtrl_c;
 class dMenu_DmapBg_c;
 class mDoDvdThd_mountArchive_c;

include/d/menu/d_menu_fishing.h

@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class dMsgString_c;
 class mDoDvdThd_mountArchive_c;
 

include/d/menu/d_menu_fmap.h

@@ -9,7 +9,7 @@ class J2DAnmTextureSRTKey;
 class JKRArchive;
 class JKRExpHeap;
 class JKRHeap;
-struct STControl;
+class STControl;
 class dMenu_Fmap_stage_data_c;
 class dMenu_Fmap_world_data_c;
 class dMenu_Fmap_region_data_c;

include/d/menu/d_menu_insect.h

@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class dMsgScrn3Select_c;
 class dMsgString_c;
 class dSelect_cursor_c;

include/d/menu/d_menu_letter.h

@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
 class dMsgScrnArrow_c;

include/d/menu/d_menu_option.h

@@ -7,7 +7,7 @@ class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
 class JUTFont;
-struct STControl;
+class STControl;
 class dFile_warning_c;
 class dMenu_Calibration_c;
 class mDoDvdThd_mountArchive_c;

include/d/menu/d_menu_ring.h

@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class dKantera_icon_c;
 class dMsgString_c;
 class dMenu_ItemExplain_c;

include/d/menu/d_menu_save.h

@@ -10,7 +10,7 @@ struct CSTControl;
 class J2DAnmColorKey;
 class J2DAnmTransformKey;
 class JUTFont;
-struct STControl;
+class STControl;
 class dMsgString_c;
 class dFile_warning_c;
 class dFile_info_c;

include/d/menu/d_menu_skill.h

@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
 class dSelect_cursor_c;

include/d/menu/d_menu_window.h

@@ -6,7 +6,7 @@
 #include "m_Do/m_Do_graphic.h"
 
 struct CSTControl;
-struct STControl;
+class STControl;
 class dMenu_Collect_c;
 class dMenu_Dmap_c;
 class dMenu_Fishing_c;

include/d/meter/d_meter2_info.h

@@ -5,7 +5,7 @@
 
 class CPaneMgr;
 class J2DTextBox;
-class JMSMesgEntry_c;
+struct JMSMesgEntry_c;
 class JUTFont;
 
 struct dMenu_LetterData {

include/d/msg/d_msg_class.h

@@ -32,8 +32,8 @@ struct JMSMesgHeader_c {
     /* 0x0E */ u16 field_0xe;
 };  // Size: 0x10
 
-struct STControl;
-struct dMsgObject_c;
+class STControl;
+class dMsgObject_c;
 struct jmessage_tReference : public JMessage::TReference {
     /* 80228B04 */ jmessage_tReference();
     /* 80228D28 */ void calcDistance();

include/d/particle/d_particle.h

@@ -42,8 +42,8 @@ private:
 class mDoDvdThd_toMainRam_c;
 class cBgS_PolyInfo;
 class JPAEmitterManager;
-struct JPADrawInfo;
-struct J3DAnmBase;
+class JPADrawInfo;
+class J3DAnmBase;
 
 class dPa_simpleEcallBack : public JPAEmitterCallBack {
 public:

include/d/particle/d_particle_copoly.h

@@ -5,7 +5,7 @@
 #include "SSystem/SComponent/c_xyz.h"
 
 class dBgS_Acch;
-struct dKy_tevstr_c;
+class dKy_tevstr_c;
 
 class dPaPo_c {
 public:

include/d/shop/d_shop_system.h

@@ -5,7 +5,7 @@
 #include "d/shop/d_shop_item_ctrl.h"
 
 class dSelect_cursor_c;
-struct STControl;
+class STControl;
 
 typedef int (*ShopCam_actionFunc)(void);
 

include/f_op/f_op_actor.h

@@ -28,7 +28,7 @@ enum {
     ACTOR_TYPE_ENEMY = 2,
 };
 
-struct JKRSolidHeap;
+class JKRSolidHeap;
 
 class dEvt_info_c {
 public:

include/f_op/f_op_actor_mng.h

@@ -101,8 +101,8 @@ public:
     static f32 mWaterY[1 + 1 /* padding */];
 };
 
-struct dKy_tevstr_c;
-struct cBgS_PolyInfo;
+class dKy_tevstr_c;
+class cBgS_PolyInfo;
 typedef int (*heapCallbackFunc)(fopAc_ac_c*);
 typedef int (*createFunc)(void*);
 

include/m_Do/m_Do_machine_exception.h

@@ -3,7 +3,7 @@
 
 #include "dolphin/gx/GX.h"
 
-struct JUTConsole;
+class JUTConsole;
 
 void print_f(char const*, ...);
 void print(char const*);

include/msg/scrn/d_msg_scrn_explain.h

@@ -4,7 +4,7 @@
 #include "msg/scrn/d_msg_scrn_base.h"
 
 class J2DOrthoGraph;
-struct STControl;
+class STControl;
 class dMsgScrnArrow_c;
 class dMsgScrn3Select_c;
 class dMsgString_c;

include/msg/scrn/d_msg_scrn_tree.h

@@ -3,8 +3,8 @@
 
 #include "msg/scrn/d_msg_scrn_base.h"
 
-struct JUTFont;
-struct JKRExpHeap;
+class JUTFont;
+class JKRExpHeap;
 
 struct dMsgScrnTree_c : public dMsgScrnBase_c {
     /* 80248954 */ dMsgScrnTree_c(JUTFont*, JKRExpHeap*);

include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h

@@ -4,9 +4,9 @@
 #include "dolphin/types.h"
 
 struct cXyz;
-struct fopAc_ac_c;
-struct J3DJoint;
-struct J3DModel;
+class fopAc_ac_c;
+class J3DJoint;
+class J3DModel;
 
 struct daNPC_TK_c {
     /* 80B01498 */ void setBck(int, u8, f32, f32);

include/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h

@@ -3,7 +3,7 @@
 
 #include "f_op/f_op_actor_mng.h"
 
-struct cBgS_PolyInfo;
+class cBgS_PolyInfo;
 
 class daTagMagne_c : public fopAc_ac_c {
 public:

src/msg/scrn/d_msg_scrn_arrow.cpp

@@ -25,15 +25,15 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() {
     mBpkFrame = 0.0f;
 
     mPaneMgr0 = new CPaneMgr(mScreen, 'set_ya_n', 0, NULL);
-    mPaneMgr1 = new CPaneMgr(mScreen, '\0ya_next', 0, NULL);
+    mPaneMgr1 = new CPaneMgr(mScreen, 'ya_next', 0, NULL);
     mPaneMgr1->hide();
     mPaneMgr1->mPane->setAnimation(mAnmBck);
-    mScreen->search('\0yajnext')->setAnimation(mAnmBpk);
+    mScreen->search('yajnext')->setAnimation(mAnmBpk);
     mScreen->search('yajinexl')->setAnimation(mAnmBpk);
 
     mPaneMgr2 = new CPaneMgr(mScreen, 'ya_end', 0, NULL);
     mPaneMgr2->hide();
-    mScreen->search('\0yaj_end')->setAnimation(mAnmBpk);
+    mScreen->search('yaj_end')->setAnimation(mAnmBpk);
     mScreen->search('yajiendl')->setAnimation(mAnmBpk);
 }