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
This commit is contained in:
Jcw87
2023-09-04 16:17:51 -07:00
committed by GitHub
parent a8c261a943
commit 7f762353ea
46 changed files with 78 additions and 88 deletions
@@ -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:
@@ -3,7 +3,7 @@
#include "dolphin/types.h"
struct J3DDeformer;
class J3DDeformer;
struct J3DCluster {
/* 0x00 */ f32 field_0x0;
@@ -11,7 +11,7 @@ struct J3DModelHierarchy {
/* 0x2 */ u16 mValue;
};
struct J3DMaterialTable;
class J3DMaterialTable;
struct J3DDrawMtxData {
/* 803115E0 */ J3DDrawMtxData();
@@ -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 {
+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*);
@@ -5,7 +5,7 @@
enum J3DAnmLoaderDataBaseFlag { J3DLOADER_UNK_FLAG0 };
struct J3DAnmBase;
class J3DAnmBase;
struct J3DAnmLoaderDataBase {
/* 80337B40 */ static void* load(void const*, J3DAnmLoaderDataBaseFlag);
@@ -4,7 +4,7 @@
#include "JSystem/J3DGraphBase/J3DTransform.h"
#include "dolphin/types.h"
struct J3DJoint;
class J3DJoint;
struct ResNTAB;
struct J3DJointInitData {
@@ -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 {
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JGeometry.h"
struct JAIAudible;
class JAIAudible;
class JAISoundID;
struct JASSoundParams;
+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:
-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;
+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);
+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;
@@ -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 {
@@ -5,8 +5,8 @@
#include "dolphin/types.h"
class JKRHeap;
class ResTIMG;
class JPAResource;
struct ResTIMG;
class JPAResourceManager {
public: