encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for other compilers (#1912)

Browse Source 
* remove invalid virtual keywords

* remove duplicate inline

* remove leading 0 in character literals

* add missing public keywords

* fix some struct/class mismatches
This commit is contained in:
Jcw87
2023-09-04 17:17:51 -06:00
committed by GitHub
parent a8c261a943
commit 7f762353ea
46 changed files with 78 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/bg/d_bg_w.h
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+1 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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:

Some files were not shown because too many files have changed in this diff Show More