Skip to content

Commit b937298

Browse files
carter-ktb21carter-ktb21
committed
Pull request cleanup
1 parent d68894e commit b937298

File tree

2 files changed

+81
-46
lines changed

2 files changed

+81
-46
lines changed

‎include/d/actor/d_a_npc_midp.h‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -91,44 +91,44 @@ class daNpc_midP_Param_c {
9191
/* 80A73954 */ ~daNpc_midP_Param_c();
9292

9393
struct Data {
94-
/* 0x00 */ f32 field_0x00; // 210.0f
95-
/* 0x04 */ f32 mGravity; // -3.0f
96-
/* 0x08 */ f32 field_0x08; // 1.0f
97-
/* 0x0C */ f32 field_0x0c; // 500.0f
98-
/* 0x10 */ f32 mWeight; // 255.0f
99-
/* 0x14 */ f32 mCylH; // 190.0f
100-
/* 0x18 */ f32 mWallH; // 35.0f
101-
/* 0x1C */ f32 mWallR; // 30.0f
102-
/* 0x20 */ f32 field_0x20; // 0.0f
103-
/* 0x24 */ f32 field_0x24; // 0.0f
104-
/* 0x28 */ f32 field_0x28; // 10.0f
105-
/* 0x2C */ f32 field_0x2c; // -10.0f
106-
/* 0x30 */ f32 field_0x30; // 30.0f
107-
/* 0x34 */ f32 field_0x34; // 10.0f
108-
/* 0x38 */ f32 field_0x38; // 45.0f
109-
/* 0x3C */ f32 field_0x3c; // -45.0f
110-
/* 0x40 */ f32 field_0x40; // 0.6f
111-
/* 0x44 */ f32 mMorfFrames; // 12.0f
112-
/* 0x48 */ s16 field_0x48; // 3
113-
/* 0x4A */ s16 field_0x4a; // 6
114-
/* 0x4C */ s16 field_0x4c; // 5
115-
/* 0x4E */ s16 field_0x4e; // 6
116-
/* 0x50 */ f32 field_0x50; // 110.0f
117-
/* 0x54 */ f32 field_0x54; // 0.0f
118-
/* 0x58 */ f32 field_0x58; // 0.0f
119-
/* 0x5C */ f32 field_0x5c; // 0.0f
120-
/* 0x60 */ s16 field_0x60; // 60
121-
/* 0x62 */ s16 field_0x62; // 8
122-
/* 0x64 */ int field_0x64; // 0
123-
/* 0x68 */ int field_0x68; // 0
124-
/* 0x6C */ f32 field_0x6c; // 4.0f
125-
/* 0x70 */ f32 field_0x70; // 0.0f
126-
/* 0x74 */ f32 field_0x74; // 0.0f
127-
/* 0x78 */ f32 field_0x78; // 0.0f
128-
/* 0x7C */ f32 field_0x7c; // 0.0f
129-
/* 0x80 */ f32 field_0x80; // 0.0f
130-
/* 0x84 */ f32 field_0x84; // 0.0f
131-
/* 0x88 */ f32 field_0x88; // 0.0f
94+
/* 0x00 */ f32 field_0x00;
95+
/* 0x04 */ f32 mGravity;
96+
/* 0x08 */ f32 mScale;
97+
/* 0x0C */ f32 field_0x0c;
98+
/* 0x10 */ f32 mWeight;
99+
/* 0x14 */ f32 mCylH;
100+
/* 0x18 */ f32 mWallH;
101+
/* 0x1C */ f32 mWallR;
102+
/* 0x20 */ f32 field_0x20;
103+
/* 0x24 */ f32 field_0x24;
104+
/* 0x28 */ f32 field_0x28;
105+
/* 0x2C */ f32 field_0x2c;
106+
/* 0x30 */ f32 field_0x30;
107+
/* 0x34 */ f32 field_0x34;
108+
/* 0x38 */ f32 field_0x38;
109+
/* 0x3C */ f32 field_0x3c;
110+
/* 0x40 */ f32 field_0x40;
111+
/* 0x44 */ f32 mMorfFrames;
112+
/* 0x48 */ s16 field_0x48;
113+
/* 0x4A */ s16 field_0x4a;
114+
/* 0x4C */ s16 field_0x4c;
115+
/* 0x4E */ s16 field_0x4e;
116+
/* 0x50 */ f32 mAttnFovY;
117+
/* 0x54 */ f32 field_0x54;
118+
/* 0x58 */ f32 field_0x58;
119+
/* 0x5C */ f32 field_0x5c;
120+
/* 0x60 */ s16 field_0x60;
121+
/* 0x62 */ s16 field_0x62;
122+
/* 0x64 */ int field_0x64;
123+
/* 0x68 */ int field_0x68;
124+
/* 0x6C */ f32 field_0x6c;
125+
/* 0x70 */ f32 field_0x70;
126+
/* 0x74 */ f32 field_0x74;
127+
/* 0x78 */ f32 field_0x78;
128+
/* 0x7C */ f32 field_0x7c;
129+
/* 0x80 */ f32 field_0x80;
130+
/* 0x84 */ f32 field_0x84;
131+
/* 0x88 */ f32 field_0x88;
132132
};
133133

134134
static const Data m;

‎src/d/actor/d_a_npc_midp.cpp‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,44 @@ daNpc_midP_c::~daNpc_midP_c() {
7373

7474
/* 80A739C0-80A73A4C 000000 008C+00 6/6 0/0 0/0 .rodata m__18daNpc_midP_Param_c */
7575
daNpc_midP_Param_c::Data const daNpc_midP_Param_c::m = {
76-
210.0f, -3.0f, 1.0f, 500.0f, 255.0f, 190.0f, 35.0f, 30.0f, 0.0f, 0.0f, 10.0f, -10.0f,
77-
30.0f, -10.0f, 45.0f, -45.0f, 0.6f, 12.0f, 3, 6, 5, 6, 110.0f, 0.0f, 0.0f, 0.0f, 60,
78-
8, 0, 0, 4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
76+
210.0f,
77+
-3.0f, // mGravity
78+
1.0f, // mScale
79+
500.0f,
80+
255.0f, // mWeight
81+
190.0f, // mCylH
82+
35.0f, // mWallH
83+
30.0f, // mWallR
84+
0.0f,
85+
0.0f,
86+
10.0f,
87+
-10.0f,
88+
30.0f,
89+
-10.0f,
90+
45.0f,
91+
-45.0f,
92+
0.6f,
93+
12.0f, // mMorfFrames
94+
3,
95+
6,
96+
5,
97+
6,
98+
110.0f, // mAttnFovY
99+
0.0f,
100+
0.0f,
101+
0.0f,
102+
60,
103+
8,
104+
0,
105+
0,
106+
4.0f,
107+
0.0f,
108+
0.0f,
109+
0.0f,
110+
0.0f,
111+
0.0f,
112+
0.0f,
113+
0.0f,
79114
};
80115

81116
/* 80A70D90-80A71074 000210 02E4+00 1/1 0/0 0/0 .text create__12daNpc_midP_cFv */
@@ -172,7 +207,7 @@ int daNpc_midP_c::CreateHeap() {
172207

173208
/* 80A714BC-80A714F0 00093C 0034+00 1/1 0/0 0/0 .text Delete__12daNpc_midP_cFv */
174209
int daNpc_midP_c::Delete() {
175-
OS_REPORT("|%06d:%x|daNpc_midP_c -> Delete\n", g_Counter, this);
210+
OS_REPORT("|%06d:%x|daNpc_midP_c -> Delete\n", g_Counter.mCounter0, this);
176211
fopAcM_GetID(this);
177212
this->~daNpc_midP_c();
178213
return 1;
@@ -309,11 +344,11 @@ void daNpc_midP_c::setParam() {
309344
attention_info.distances[3] = daNpcT_getDistTableIdx(sVar1, sVar2);
310345
attention_info.flags = 10;
311346

312-
scale.setall(daNpc_midP_Param_c::m.field_0x08);
347+
scale.setall(daNpc_midP_Param_c::m.mScale);
313348
mCcStts.SetWeight(daNpc_midP_Param_c::m.mWeight);
314349
mCylH = daNpc_midP_Param_c::m.mCylH;
315350
mWallR = daNpc_midP_Param_c::m.mWallR;
316-
mAttnFovY = daNpc_midP_Param_c::m.field_0x50;
351+
mAttnFovY = daNpc_midP_Param_c::m.mAttnFovY;
317352
mAcchCir.SetWallR(mWallR);
318353
mAcchCir.SetWallH(daNpc_midP_Param_c::m.mWallH);
319354
field_0xde8 = daNpc_midP_Param_c::m.field_0x0c;
@@ -600,8 +635,8 @@ static int daNpc_midP_Draw(void* i_this) {
600635
}
601636

602637
/* 80A727D4-80A727DC 001C54 0008+00 1/0 0/0 0/0 .text daNpc_midP_IsDelete__FPv */
603-
static bool daNpc_midP_IsDelete(void* i_this) {
604-
return true;
638+
static int daNpc_midP_IsDelete(void* i_this) {
639+
return 1;
605640
}
606641

607642
/* 80A73D50-80A73D5C 000008 000C+00 1/1 0/0 0/0 .bss @3811 */

0 commit comments

Comments
 (0)