mirror of
https://github.com/zeldaret/tp
synced 2026-09-03 02:03:55 -04:00
next round of standard compiler fixes (#2969)
* next round of standard compiler fixes * Fix weak function order issue * fix missmatch with ShieldD version
This commit is contained in:
@@ -181,6 +181,7 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
|
||||
/* 0x000 */ JASSeqCtrl mSeqCtrl;
|
||||
/* 0x05C */ JASTrackPort mTrackPort;
|
||||
/* 0x080 */ JASRegisterParam mRegisterParam;
|
||||
#ifdef __MWERKS__
|
||||
/* 0x09C */ union {
|
||||
struct {
|
||||
MoveParam_ volume;
|
||||
@@ -192,6 +193,20 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
|
||||
} params;
|
||||
MoveParam_ array[6];
|
||||
} mMoveParam;
|
||||
#else
|
||||
/* 0x09C */ union MoveParam_u {
|
||||
struct {
|
||||
MoveParam_ volume;
|
||||
MoveParam_ pitch;
|
||||
MoveParam_ fxmix;
|
||||
MoveParam_ pan;
|
||||
MoveParam_ dolby;
|
||||
MoveParam_ distFilter;
|
||||
} params;
|
||||
MoveParam_ array[6];
|
||||
MoveParam_u() {}
|
||||
} mMoveParam;
|
||||
#endif
|
||||
/* 0x0e4 */ JASOscillator::Data mOscParam[2];
|
||||
/* 0x114 */ JASOscillator::Point mOscPoint[4];
|
||||
/* 0x12C */ JASTrack* mParent;
|
||||
|
||||
@@ -92,7 +92,7 @@ struct TParseValue : public Parser {
|
||||
}
|
||||
|
||||
static const void* advance(const void* data, s32 advanceNum) {
|
||||
return (char*)data + (advanceNum * sizeof(Parser::ParseType));
|
||||
return (char*)data + (advanceNum * sizeof(typename Parser::ParseType));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -262,7 +262,7 @@ struct TLinkList_factory : public TLinkList<T, I> {
|
||||
}
|
||||
|
||||
typename TLinkList<T, I>::iterator Erase_destroy(T* param_0) {
|
||||
typename TLinkList<T, I>::iterator spC(Erase(param_0));
|
||||
typename TLinkList<T, I>::iterator spC(this->Erase(param_0));
|
||||
Do_destroy(param_0);
|
||||
return spC;
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
#define D_D_PATH_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "mtx.h"
|
||||
#include "dolphin/mtx.h"
|
||||
|
||||
class cBgS_PolyInfo;
|
||||
struct cXyz;
|
||||
|
||||
@@ -131,4 +131,10 @@ static const float INF = 2000000000.0f;
|
||||
#define SJIS(character, value) ((u32)value)
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
#define ASM asm
|
||||
#else
|
||||
#define ASM
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user