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/JSystem/J3DGraphAnimator/J3DAnimation.h
+4 -2
View File
@@ -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
+1 -1
View File
@@ -3,7 +3,7 @@
#include "dolphin/types.h"
struct J3DDeformer;
class J3DDeformer;
struct J3DCluster {
/* 0x00 */ f32 field_0x0;
include/JSystem/J3DGraphAnimator/J3DJointTree.h
+1 -1
View File
@@ -11,7 +11,7 @@ struct J3DModelHierarchy {
/* 0x2 */ u16 mValue;
};
struct J3DMaterialTable;
class J3DMaterialTable;
struct J3DDrawMtxData {
/* 803115E0 */ J3DDrawMtxData();
include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+6 -6
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JGeometry.h"
struct JAIAudible;
class JAIAudible;
class JAISoundID;
struct JASSoundParams;
include/JSystem/JAudio2/JAISeqMgr.h
+1 -1
View File
@@ -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
View File
@@ -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
+2 -1
View File
@@ -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
+4 -4
View File
@@ -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
+6 -6
View File
@@ -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
+1 -1
View File
@@ -5,8 +5,8 @@
#include "dolphin/types.h"
class JKRHeap;
class ResTIMG;
class JPAResource;
struct ResTIMG;
class JPAResourceManager {
public:
include/Z2AudioLib/Z2SoundInfo.h
-8
View File
@@ -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
+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);

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