Skip to content

Commit 2934b5f

Browse files
committed
Add a precompiled header for RELs
1 parent 8a30030 commit 2934b5f

File tree

1,082 files changed

+4373
-12460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,082 files changed

+4373
-12460
lines changed

.clangd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ Diagnostics:
1414
- "bound_member_function"
1515
- "typecheck_subscript_value"
1616
- "unknown_typename"
17+
---
18+
If:
19+
PathMatch: .*\.pch
20+
CompileFlags:
21+
Add: ["--language=c++", "--std=c++98"]

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"files.trimFinalNewlines": true,
1717
"files.associations": {
1818
"*.inc": "cpp",
19+
"*.pch": "cpp",
20+
"*.pch++": "cpp",
1921
".clangd": "yaml",
2022
},
2123
// Disable C/C++ IntelliSense, use clangd instead

configure.py

Lines changed: 203 additions & 183 deletions
Large diffs are not rendered by default.

include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ typedef struct _GXColorS10 GXColorS10;
1212
*/
1313
class J3DMatColorAnm {
1414
public:
15-
/* 8003B2B8 */ ~J3DMatColorAnm() {};
16-
/* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {};
15+
/* 8003B2B8 */ ~J3DMatColorAnm() {}
16+
/* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {}
1717
J3DMatColorAnm(u16 param_1, J3DAnmColor* param_2) {
1818
field_0x0 = param_1;
1919
mAnmFlag = 1;
@@ -42,8 +42,8 @@ class J3DMatColorAnm {
4242
*/
4343
class J3DTexNoAnm {
4444
public:
45-
/* 8003B1F8 */ ~J3DTexNoAnm() {};
46-
/* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {};
45+
/* 8003B1F8 */ ~J3DTexNoAnm() {}
46+
/* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {}
4747
J3DTexNoAnm(u16 param_1, J3DAnmTexPattern* param_2) {
4848
field_0x4 = param_1;
4949
mAnmFlag = 1;
@@ -73,8 +73,8 @@ class J3DTexNoAnm {
7373
*/
7474
class J3DTexMtxAnm {
7575
public:
76-
/* 8003B264 */ ~J3DTexMtxAnm() {};
77-
/* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {};
76+
/* 8003B264 */ ~J3DTexMtxAnm() {}
77+
/* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}
7878
J3DTexMtxAnm(u16 param_1, J3DAnmTextureSRTKey* param_2) {
7979
field_0x0 = param_1;
8080
mAnmFlag = 1;
@@ -174,7 +174,7 @@ class J3DMaterialAnm {
174174
/* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*);
175175
/* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*);
176176

177-
/* 800A4820 */ virtual ~J3DMaterialAnm() {};
177+
/* 800A4820 */ virtual ~J3DMaterialAnm() {}
178178
/* 8032C3C4 */ virtual void calc(J3DMaterial*) const;
179179

180180
const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; }

include/JSystem/J3DGraphBase/J3DMatBlock.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1549,12 +1549,13 @@ struct J3DAlphaComp {
15491549
mRef1 = info.mRef1;
15501550
}
15511551

1552-
J3DAlphaComp& operator=(u16 id) { mID = id; }
1552+
J3DAlphaComp& operator=(u16 id) { mID = id; return *this; }
15531553

15541554
J3DAlphaComp& operator=(const J3DAlphaComp& rhs) {
15551555
mID = rhs.mID;
15561556
mRef0 = rhs.mRef0;
15571557
mRef1 = rhs.mRef1;
1558+
return *this;
15581559
}
15591560

15601561
void setAlphaCompInfo(const J3DAlphaCompInfo& info) {
@@ -1599,6 +1600,7 @@ struct J3DIndTexOrder : public J3DIndTexOrderInfo {
15991600
/* 8000E128 */ J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {}
16001601
J3DIndTexOrder& operator=(J3DIndTexOrder const& other) {
16011602
*(u32*)this = *(u32*)&other;
1603+
return *this;
16021604
}
16031605
J3DIndTexOrder(J3DIndTexOrderInfo const& info) : J3DIndTexOrderInfo(info) {}
16041606
u8 getMap() const { return (GXTexMapID)mMap; }

include/JSystem/JAudio2/JASSimpleWaveBank.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
struct JASSimpleWaveBank : JASWaveBank, JASWaveArc {
99
struct TWaveHandle : JASWaveHandle {
10-
/* 80298D84 */ ~TWaveHandle() {}
10+
/* 80298D84 */ ~TWaveHandle();
1111
/* 80298F38 */ int getWavePtr() const;
1212
/* 80298F5C */ TWaveHandle();
1313
/* 80298F90 */ const JASWaveInfo* getWaveInfo() const;

include/SSystem/SComponent/c_sxyz.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ struct SVec {
1010
class csXyz : public SVec {
1111
public:
1212
static const csXyz Zero;
13-
/* 80018BD0 */ ~csXyz() {};
13+
/* 80018BD0 */ ~csXyz() {}
1414
/* inline */ csXyz() {}
1515
/* inline */ csXyz(const csXyz& other) : SVec(other){};
1616
/* 802673F4 */ csXyz(s16, s16, s16);

include/SSystem/SComponent/c_xyz.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct cXyz : Vec {
100100
void zero() { set(0.0f, 0.0f, 0.0f); }
101101

102102
f32 getSquareMag() const { return VECSquareMag(this); }
103-
f32 getSquareDistance(const Vec& other) const { return VECSquareDistance(this, &other); }
103+
f32 getSquareDistance(const Vec& other) const { return PSVECSquareDistance(this, &other); }
104104

105105
static f32 getNearZeroValue() { return 8e-11f; }
106106

include/Z2AudioLib/Z2Calc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
#define Z2CALC_H
33

44
#include "dolphin/types.h"
5+
#include "m_Do/m_Do_lib.h"
56

67
namespace Z2Calc {
8+
// hack for f_op_actor, having this present breaks its weak func ordering
9+
static const Vec cNullVec = {0.0f, 0.0f, 0.0f};
10+
711
enum CurveSign {
812
CURVE_SIGN_0 = 0,
913
CURVE_SIGN_1 = 1,

include/d/actor/d_a_b_dr.h

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -175,51 +175,4 @@ class daB_DR_c : public fopEn_enemy_c {
175175

176176
STATIC_ASSERT(sizeof(daB_DR_c) == 0x2860);
177177

178-
179-
class daB_DR_HIO_c : public JORReflexible {
180-
public:
181-
/* 805BAE6C */ daB_DR_HIO_c();
182-
/* 805C6B94 */ virtual ~daB_DR_HIO_c() {}
183-
184-
void genMessage(JORMContext*);
185-
186-
/* 0x04 */ s8 field_0x4;
187-
/* 0x08 */ f32 model_size;
188-
/* 0x0C */ f32 fall_accel;
189-
/* 0x10 */ f32 fall_accel_max;
190-
/* 0x14 */ f32 wind_large_attack_lockon_range;
191-
/* 0x18 */ f32 unk_0x18;
192-
/* 0x1C */ f32 wind_small_attack_power;
193-
/* 0x20 */ f32 wind_attack_power;
194-
/* 0x24 */ f32 glide_wind_power;
195-
/* 0x28 */ f32 breath_attack_threshold;
196-
/* 0x2C */ f32 unk_0x2c;
197-
/* 0x30 */ f32 breath_move_speed_max;
198-
/* 0x34 */ f32 breath_move_speed_min;
199-
/* 0x38 */ s16 tail_hit_chance_time;
200-
/* 0x3A */ s16 center_wind_time;
201-
/* 0x3C */ s16 breath_continue_time;
202-
/* 0x3E */ s16 breath_continue_no_armor_time;
203-
/* 0x40 */ s16 breath_feint1_time;
204-
/* 0x42 */ s16 breath_feint2_time;
205-
/* 0x44 */ s16 breath_feint3_time;
206-
/* 0x46 */ s16 no_attack_time;
207-
/* 0x48 */ s16 unk_0x48;
208-
/* 0x4A */ s16 no_attack_no_armor_time;
209-
/* 0x4C */ s16 unk_0x4c;
210-
/* 0x4E */ s16 back_hit_chance_time;
211-
/* 0x50 */ s16 after_breath_chance_time;
212-
/* 0x52 */ s16 neck_search_speed;
213-
/* 0x54 */ s16 neck_search2_speed;
214-
/* 0x56 */ s16 neck_search_speed_max;
215-
/* 0x58 */ s16 body_search_speed;
216-
/* 0x5A */ s16 body_search2_speed;
217-
/* 0x5C */ s16 body_search_speed_max;
218-
/* 0x5E */ s16 body_search_feint_speed_max;
219-
/* 0x60 */ s16 feint_angle;
220-
/* 0x62 */ s16 unk_0x62;
221-
/* 0x64 */ u8 display_range;
222-
/* 0x65 */ u8 breath_feint2_OFF;
223-
};
224-
225178
#endif /* D_A_B_DR_H */

0 commit comments

Comments
 (0)