Improve compiler compatibility (#743)

* fix returns

* use standard C headers

* struct/class mismatch

* explicit this in template

* switch variable scope

* C standard compliance

* & l-value

26 files changed, 34 insertions, 34 deletions

diff --git a/include/d/actor/d_a_bk.h b/include/d/actor/d_a_bk.h
index 6b528d05..ab0cdaf0 100644
--- a/include/d/actor/d_a_bk.h
+++ b/include/d/actor/d_a_bk.h
@@ -6,7 +6,7 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "m_Do/m_Do_hostIO.h"
 
-class dPath;
+struct dPath;
 namespace daObj_Search { class Act_c; };
 struct br_s;
 
diff --git a/include/d/actor/d_a_wind_tag.h b/include/d/actor/d_a_wind_tag.h
index 6d3a04e0..441e6359 100644
--- a/include/d/actor/d_a_wind_tag.h
+++ b/include/d/actor/d_a_wind_tag.h
@@ -8,7 +8,7 @@
 #include "m_Do/m_Do_ext.h"
 
 class JPABaseEmitter;
-class dPath;
+struct dPath;
 
 namespace daWindTag {
     static BOOL CheckCreateHeap(fopAc_ac_c*);
diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h
index 8ee54cc7..7f119417 100644
--- a/include/d/actor/d_a_ykgr.h
+++ b/include/d/actor/d_a_ykgr.h
@@ -3,7 +3,7 @@
 
 #include "f_op/f_op_actor.h"
 
-class dPath;
+struct dPath;
 class JPABaseEmitter;
 class JPABaseParticle;
 
diff --git a/include/d/d_2dnumber.h b/include/d/d_2dnumber.h
index 9e5c4e7b..9e93d2e9 100644
--- a/include/d/d_2dnumber.h
+++ b/include/d/d_2dnumber.h
@@ -5,7 +5,7 @@
 
 struct ResTIMG;
 class JUTFont;
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 
 class dDlst_2DNumber_c : public dDlst_base_c {
 public:
diff --git a/include/d/d_auction_screen.h b/include/d/d_auction_screen.h
index 638690ae..bfa2c7e3 100644
--- a/include/d/d_auction_screen.h
+++ b/include/d/d_auction_screen.h
@@ -3,7 +3,7 @@
 
 #include "dolphin/types.h"
 
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class J2DPane;
 class JKRArchive;
 
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index d3e54ccf..0f371320 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -17,7 +17,7 @@ class camera_process_class;
 class dBgS_LinChk;
 class dBgS_CamGndChk;
 class d2DBSplinePath;
-class dStage_Event_dt_c;
+struct dStage_Event_dt_c;
 class fopAc_ac_c;
 
 struct dCamera__EventParam {
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 91569f9d..636e7145 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -3544,7 +3544,7 @@ inline void dComIfGp_setFmapData(void * pData) { g_dComIfG_gameInfo.play.setFmap
  * === RESOURCE ===
  */
 
-class request_of_phase_process_class;
+struct request_of_phase_process_class;
 cPhs_State dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_name);
 int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resName);
 
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index e0b17751..267ee99c 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -9,7 +9,7 @@
 #include "SSystem/SComponent/c_rnd.h"
 #include "global.h"
 
-class ResTIMG;
+struct ResTIMG;
 class cM3dGPla;
 
 class dDlst_base_c {
@@ -427,7 +427,7 @@ public:
 
 struct view_port_class;
 struct view_class;
-struct camera_class;
+class camera_class;
 
 struct dDlst_alphaModelData_c {
 public:
diff --git a/include/d/d_event.h b/include/d/d_event.h
index 70a2355a..4d7556e7 100644
--- a/include/d/d_event.h
+++ b/include/d/d_event.h
@@ -56,7 +56,7 @@ public:
     /* 0x15 */ u8 mEventInfoIdx;
 };  // Size = 0x18
 
-class dStage_Event_dt_c;
+struct dStage_Event_dt_c;
 
 enum dTalkXYButton_e {
     dTalkBtn_NONE_e = 0,
diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h
index fbf35432..f7139dc8 100644
--- a/include/d/d_kankyo.h
+++ b/include/d/d_kankyo.h
@@ -157,13 +157,13 @@ class dKankyo_cloud_Packet;
 class dKankyo_vrkumo_Packet;
 class dKankyo_wave_Packet;
 class dKankyo_poison_Packet;
-class WINDEFF_SET;
+struct WINDEFF_SET;
 class dKankyo_star_Packet;
-class stage_palet_info_class;
-class stage_pselect_info_class;
-class stage_envr_info_class;
-class stage_vrbox_info_class;
-class stage_plight_info_class;
+struct stage_palet_info_class;
+struct stage_pselect_info_class;
+struct stage_envr_info_class;
+struct stage_vrbox_info_class;
+struct stage_plight_info_class;
 struct dKyd_Schedule;
 
 class dScnKy_env_light_c {
diff --git a/include/d/d_kankyo_demo.h b/include/d/d_kankyo_demo.h
index 58b449e8..66209963 100644
--- a/include/d/d_kankyo_demo.h
+++ b/include/d/d_kankyo_demo.h
@@ -3,7 +3,7 @@
 
 #include "d/d_kankyo.h"
 
-struct cXyz;
+class cXyz;
 
 struct DEMO_PLIGHT {
     /* 0x00 */ int field_0x00;
diff --git a/include/d/d_kankyo_wether.h b/include/d/d_kankyo_wether.h
index 196b0749..81ddd402 100644
--- a/include/d/d_kankyo_wether.h
+++ b/include/d/d_kankyo_wether.h
@@ -8,7 +8,7 @@
 
 class JUTTexture;
 class JPABaseEmitter;
-class WIND_INFLUENCE;
+struct WIND_INFLUENCE;
 
 class dKankyo_sun_Packet : public J3DPacket {
 public:
diff --git a/include/d/d_map.h b/include/d/d_map.h
index 21ca9712..6ee765ad 100644
--- a/include/d/d_map.h
+++ b/include/d/d_map.h
@@ -8,7 +8,7 @@ struct ResTIMG;
 struct dmap_dmap_tlut_s;
 class fopAc_ac_c;
 struct map_dt_c;
-class stage_map_info_class;
+struct stage_map_info_class;
 
 class dMap_2DMtMapSpcl_tex_c {
 public:
diff --git a/include/d/d_menu_collect.h b/include/d/d_menu_collect.h
index 66a505ea..a556326b 100644
--- a/include/d/d_menu_collect.h
+++ b/include/d/d_menu_collect.h
@@ -3,7 +3,7 @@
 
 #include "dolphin/types.h"
 
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class JKRArchive;
 class JUTFont;
 
diff --git a/include/d/d_menu_dmap.h b/include/d/d_menu_dmap.h
index 3c8e2834..54d8679d 100644
--- a/include/d/d_menu_dmap.h
+++ b/include/d/d_menu_dmap.h
@@ -4,7 +4,7 @@
 #include "dolphin/types.h"
 
 class J2DPane;
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class JKRArchive;
 class JUTFont;
 
diff --git a/include/d/d_menu_fmap.h b/include/d/d_menu_fmap.h
index cea276f3..b1acbbcf 100644
--- a/include/d/d_menu_fmap.h
+++ b/include/d/d_menu_fmap.h
@@ -6,7 +6,7 @@
 
 class JUTFont;
 class J2DScreen;
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class dMenu_FmapSv_c;
 struct cursorTable_t;
 struct aramCmapDatPat_t;
diff --git a/include/d/d_menu_fmap2.h b/include/d/d_menu_fmap2.h
index 1c0e4658..96f6a0bc 100644
--- a/include/d/d_menu_fmap2.h
+++ b/include/d/d_menu_fmap2.h
@@ -3,9 +3,9 @@
 
 #include "dolphin/types.h"
 
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class J2DScreen;
-class ResTIMG;
+struct ResTIMG;
 class aramCmapDat_c;
 class dMenu_FmapSv_c;
 
diff --git a/include/d/d_menu_item.h b/include/d/d_menu_item.h
index e44263f2..2c4a028e 100644
--- a/include/d/d_menu_item.h
+++ b/include/d/d_menu_item.h
@@ -3,7 +3,7 @@
 
 #include "dolphin/types.h"
 
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class JKRArchive;
 class JUTFont;
 class J2DPane;
diff --git a/include/d/d_menu_option.h b/include/d/d_menu_option.h
index 353177b2..c3529d8b 100644
--- a/include/d/d_menu_option.h
+++ b/include/d/d_menu_option.h
@@ -7,7 +7,7 @@
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_hostIO.h"
 
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class JKRArchive;
 class JUTFont;
 
diff --git a/include/d/d_menu_save.h b/include/d/d_menu_save.h
index 2cc0edbc..9d4733cb 100644
--- a/include/d/d_menu_save.h
+++ b/include/d/d_menu_save.h
@@ -4,7 +4,7 @@
 #include "d/d_drawlist.h"
 #include "dolphin/types.h"
 
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 
 class dDlst_MenuSave_c : public dDlst_base_c {
 public:
diff --git a/include/d/d_meter.h b/include/d/d_meter.h
index 3cebe860..f6769286 100644
--- a/include/d/d_meter.h
+++ b/include/d/d_meter.h
@@ -8,7 +8,7 @@
 class J2DPane;
 class JPABaseEmitter;
 class fopAc_ac_c;
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class msg_class;
 class sub_meter_class;
 
diff --git a/include/d/d_minigame_starter.h b/include/d/d_minigame_starter.h
index 071910c3..0dcf993b 100644
--- a/include/d/d_minigame_starter.h
+++ b/include/d/d_minigame_starter.h
@@ -4,7 +4,7 @@
 #include "dolphin/types.h"
 
 class JKRArchive;
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 
 class dDlst_StarterScrnDraw_c {
 public:
diff --git a/include/d/d_minigame_terminater.h b/include/d/d_minigame_terminater.h
index 6dc38e5d..bc3420eb 100644
--- a/include/d/d_minigame_terminater.h
+++ b/include/d/d_minigame_terminater.h
@@ -5,7 +5,7 @@
 
 class JKRArchive;
 class J2DPane;
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 
 class dDlst_TerminaterScrnDraw_c {
 public:
diff --git a/include/d/d_operate_wind.h b/include/d/d_operate_wind.h
index 69169e2b..94edb695 100644
--- a/include/d/d_operate_wind.h
+++ b/include/d/d_operate_wind.h
@@ -7,7 +7,7 @@
 #include "m_Do/m_Do_hostIO.h"
 #include "JSystem/JUtility/TColor.h"
 
-class fopMsgM_pane_class;
+struct fopMsgM_pane_class;
 class JKRExpHeap;
 class J2DScreen;
 class STControl;
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index 4e47625b..48246d3d 100644
--- a/include/d/d_particle.h
+++ b/include/d/d_particle.h
@@ -20,7 +20,7 @@ class JKRHeap;
 class JPABaseEmitter;
 class JPAEmitterManager;
 class J3DModelData;
-struct csXyz;
+class csXyz;
 
 class dPa_simpleData_c {
 public:
diff --git a/include/d/d_picture_box.h b/include/d/d_picture_box.h
index 3d8a9020..5d8ac449 100644
--- a/include/d/d_picture_box.h
+++ b/include/d/d_picture_box.h
@@ -4,8 +4,8 @@
 #include "dolphin/types.h"
 
 class JKRExpHeap;
-class fopMsgM_pane_class;
-class fopMsgM_pane_alpha_class;
+struct fopMsgM_pane_class;
+struct fopMsgM_pane_alpha_class;
 
 class sub_pb_class;