Skip to content

Commit e0ccbb2

Browse files
hatal175hatal175
committed
Rename a_this
1 parent 93d5801 commit e0ccbb2

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed

‎src/d/actor/d_a_npc_worm.cpp‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -84,42 +84,42 @@ static void npc_worm_ground(npc_worm_class* i_this) {
8484
/* 80B2E2C4-80B2E544 0004C4 0280+00 1/1 0/0 0/0 .text npc_worm_normal__FP14npc_worm_class
8585
*/
8686
static void npc_worm_normal(npc_worm_class* i_this) {
87-
fopAc_ac_c* base = i_this;
87+
fopAc_ac_c* a_this = i_this;
8888
switch(i_this->field_0x5a8) {
8989
case -1:
90-
base->current.angle.y = cM_rndF(65536.0f);
91-
base->speed.y = 0.0f;
92-
base->speedF = 0.0f;
93-
base->shape_angle.x = -cM_rndF(16000.0f);
90+
a_this->current.angle.y = cM_rndF(65536.0f);
91+
a_this->speed.y = 0.0f;
92+
a_this->speedF = 0.0f;
93+
a_this->shape_angle.x = -cM_rndF(16000.0f);
9494
i_this->field_0x5d0 = 10.0f;
9595
i_this->field_0x5e8[1] = cM_rndF(60.0f) + 130.0f;
9696
i_this->field_0x5a8 = 1;
9797
i_this->field_0x5e6 = 1;
9898
break;
9999
case 0:
100-
base->current.pos.y += 3.0f;
101-
base->current.angle.y = cM_rndF(65536.0f);
102-
base->speed.y = cM_rndF(5.0f) + 15.0f;
103-
base->speedF = cM_rndF(2.0f) + 4.0f;
104-
base->shape_angle.x = -cM_rndF(16000.0f);
100+
a_this->current.pos.y += 3.0f;
101+
a_this->current.angle.y = cM_rndF(65536.0f);
102+
a_this->speed.y = cM_rndF(5.0f) + 15.0f;
103+
a_this->speedF = cM_rndF(2.0f) + 4.0f;
104+
a_this->shape_angle.x = -cM_rndF(16000.0f);
105105
i_this->field_0x5d0 = 10.0f;
106106
i_this->field_0x5e8[1] = cM_rndF(60.0f) + 130.0f;
107107
i_this->field_0x5a8 = 1;
108108
i_this->field_0x5e6 = 1;
109109
case 1:
110-
if (base->current.pos.y <= i_this->field_0x5cc &&
110+
if (a_this->current.pos.y <= i_this->field_0x5cc &&
111111
i_this->field_0x5e8[0] == 0)
112112
{
113-
i_this->field_0x5ca = base->current.angle.y + (s16)cM_rndFX(20000.0f);
113+
i_this->field_0x5ca = a_this->current.angle.y + (s16)cM_rndFX(20000.0f);
114114
i_this->field_0x5e8[0] = cM_rndF(10.0f) + 3.0f;
115-
base->speedF = cM_rndF(0.75f) + 0.5f;
115+
a_this->speedF = cM_rndF(0.75f) + 0.5f;
116116
}
117117

118-
if (base->eventInfo.checkCommandCatch()) {
119-
fopAcM_delete(base);
118+
if (a_this->eventInfo.checkCommandCatch()) {
119+
fopAcM_delete(a_this);
120120
} else {
121-
dComIfGp_att_CatchRequest(base, 0x74, 200.0f, 100.0f, -150.0f, 0x5000, 1);
122-
base->eventInfo.onCondition(dEvtCnd_40_e);
121+
dComIfGp_att_CatchRequest(a_this, 0x74, 200.0f, 100.0f, -150.0f, 0x5000, 1);
122+
a_this->eventInfo.onCondition(dEvtCnd_40_e);
123123
}
124124

125125
#ifndef DEBUG
@@ -132,8 +132,8 @@ static void npc_worm_normal(npc_worm_class* i_this) {
132132
break;
133133
}
134134

135-
cLib_addCalcAngleS2(&base->current.angle.y, i_this->field_0x5ca, 4, 0x400);
136-
cLib_addCalcAngleS2(&base->shape_angle.x, 0, 2, 0x800);
135+
cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->field_0x5ca, 4, 0x400);
136+
cLib_addCalcAngleS2(&a_this->shape_angle.x, 0, 2, 0x800);
137137
}
138138

139139
/* 80B2E544-80B2E678 000744 0134+00 1/1 0/0 0/0 .text npc_worm_dive__FP14npc_worm_class
@@ -188,7 +188,7 @@ static void npc_worm_binwait(npc_worm_class* i_this) {
188188

189189
/* 80B2E6C4-80B2EBF4 0008C4 0530+00 1/1 0/0 0/0 .text action__FP14npc_worm_class */
190190
static void action(npc_worm_class* i_this) {
191-
fopAc_ac_c* base = i_this;
191+
fopAc_ac_c* a_this = i_this;
192192
cXyz local_124;
193193
cXyz local_130;
194194
int local_140 = 0;
@@ -226,13 +226,13 @@ static void action(npc_worm_class* i_this) {
226226
for (int i = 0; i < 9; i++) {
227227
i_this->field_0x5b4[i] = i_this->field_0x5b0 * cM_ssin(i_this->field_0x5aa - i * i_this->field_0x5ae);
228228
}
229-
i_this->shape_angle.y = (int)(-(i_this->field_0x5b4[3] * 2)) + base->current.angle.y;
229+
i_this->shape_angle.y = (int)(-(i_this->field_0x5b4[3] * 2)) + a_this->current.angle.y;
230230
cLib_addCalc2(&i_this->field_0x5d0, 10.0f, 1.0f, 1.0f);
231231
} else if (local_140 == 2) {
232232
i_this->field_0x5aa += i_this->field_0x5ac;
233233
i_this->field_0x5b0 = 8000.0f;
234234
i_this->field_0x5ae = 3000;
235-
int local_154 = 0.17f * (i_this->field_0x5cc - base->current.pos.y);
235+
int local_154 = 0.17f * (i_this->field_0x5cc - a_this->current.pos.y);
236236
if (local_154 > 8) {
237237
local_154 = 8;
238238
}
@@ -247,58 +247,58 @@ static void action(npc_worm_class* i_this) {
247247
cLib_addCalc0(&i_this->field_0x5d0, 1.0f, 1.0f);
248248
}
249249
if (bVar5) {
250-
cMtx_YrotS(*calc_mtx, base->current.angle.y);
250+
cMtx_YrotS(*calc_mtx, a_this->current.angle.y);
251251
local_124.x = 0.0f;
252252
local_124.y = 0.0f;
253-
local_124.z = base->speedF;
253+
local_124.z = a_this->speedF;
254254
MtxPosition(&local_124, &local_130);
255-
base->current.pos.x += local_130.x;
256-
base->current.pos.y += base->speed.y;
257-
base->current.pos.z += local_130.z;
258-
base->speed.y -= 5.0f;
259-
if (base->speed.y < -50.0f) {
260-
base->speed.y = -50.0f;
255+
a_this->current.pos.x += local_130.x;
256+
a_this->current.pos.y += a_this->speed.y;
257+
a_this->current.pos.z += local_130.z;
258+
a_this->speed.y -= 5.0f;
259+
if (a_this->speed.y < -50.0f) {
260+
a_this->speed.y = -50.0f;
261261
}
262262
dBgS_LinChk linkChk;
263-
linkChk.Set(&base->old.pos, &base->current.pos, base);
263+
linkChk.Set(&a_this->old.pos, &a_this->current.pos, a_this);
264264
if (dComIfG_Bgsp().LineCross(&linkChk)) {
265-
base->current.pos.x = base->old.pos.x;
266-
base->current.pos.z = base->old.pos.z;
265+
a_this->current.pos.x = a_this->old.pos.x;
266+
a_this->current.pos.z = a_this->old.pos.z;
267267
}
268268
}
269269
if (bVar6) {
270270
dBgS_GndChk gndchk;
271-
cXyz local_13c(base->current.pos);
271+
cXyz local_13c(a_this->current.pos);
272272
local_13c.y += 50.0f;
273273
gndchk.SetPos(&local_13c);
274274
i_this->field_0x5cc = dComIfG_Bgsp().GroundCross(&gndchk) + 3.0f;
275-
if (base->current.pos.y <= i_this->field_0x5cc) {
276-
base->current.pos.y = i_this->field_0x5cc;
277-
base->speed.y = -10.0f;
278-
local_13c = base->current.pos;
275+
if (a_this->current.pos.y <= i_this->field_0x5cc) {
276+
a_this->current.pos.y = i_this->field_0x5cc;
277+
a_this->speed.y = -10.0f;
278+
local_13c = a_this->current.pos;
279279
local_13c.y += 50.0f;
280280
local_13c.z += 10.0f;
281281
gndchk.SetPos(&local_13c);
282282
local_13c.y = dComIfG_Bgsp().GroundCross(&gndchk) + 3.0f;
283-
i_this->field_0x5c6 = -cM_atan2s(local_13c.y - base->current.pos.y,
284-
local_13c.z - base->current.pos.z);
283+
i_this->field_0x5c6 = -cM_atan2s(local_13c.y - a_this->current.pos.y,
284+
local_13c.z - a_this->current.pos.z);
285285
if (i_this->field_0x5c6 > 0x3000 || i_this->field_0x5c6 < -0x3000) {
286286
i_this->field_0x5c6 = 0;
287287
}
288-
local_13c = base->current.pos;
288+
local_13c = a_this->current.pos;
289289
local_13c.y += 50.0f;
290290
local_13c.x += 10.0f;
291291
gndchk.SetPos(&local_13c);
292292
local_13c.y = dComIfG_Bgsp().GroundCross(&gndchk) + 3.0f;
293293
i_this->field_0x5c8 =
294-
cM_atan2s(local_13c.y - base->current.pos.y, local_13c.x - base->current.pos.x);
294+
cM_atan2s(local_13c.y - a_this->current.pos.y, local_13c.x - a_this->current.pos.x);
295295
if (i_this->field_0x5c8 > 0x3000 || i_this->field_0x5c8 < -0x3000) {
296296
i_this->field_0x5c8 = 0;
297297
}
298298
}
299299
}
300-
if (bVar7 && fopAcM_searchPlayerDistance(base) < 200.0f) {
301-
daPy_py_c::setLookPos(&base->current.pos);
300+
if (bVar7 && fopAcM_searchPlayerDistance(a_this) < 200.0f) {
301+
daPy_py_c::setLookPos(&a_this->current.pos);
302302
}
303303
}
304304

@@ -351,8 +351,8 @@ static int daNPC_WORM_Delete(npc_worm_class* i_this) {
351351
}
352352

353353
/* 80B2EE08-80B2EEC0 001008 00B8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
354-
static int useHeapInit(fopAc_ac_c* actor_this) {
355-
npc_worm_class* i_this = (npc_worm_class*)actor_this;
354+
static int useHeapInit(fopAc_ac_c* a_this) {
355+
npc_worm_class* i_this = (npc_worm_class*)a_this;
356356
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x30);
357357
JUT_ASSERT(776, modelData != 0);
358358
i_this->mModel1 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -370,9 +370,9 @@ static int useHeapInit(fopAc_ac_c* actor_this) {
370370

371371
/* 80B2EEC0-80B2F050 0010C0 0190+00 1/0 0/0 0/0 .text daNPC_WORM_Create__FP10fopAc_ac_c
372372
*/
373-
static int daNPC_WORM_Create(fopAc_ac_c* actor_this) {
374-
fopAcM_SetupActor(actor_this, npc_worm_class);
375-
npc_worm_class* i_this = (npc_worm_class*)actor_this;
373+
static int daNPC_WORM_Create(fopAc_ac_c* a_this) {
374+
fopAcM_SetupActor(a_this, npc_worm_class);
375+
npc_worm_class* i_this = (npc_worm_class*)a_this;
376376
int rv =
377377
dComIfG_resLoad(&i_this->mPhase, "Alink");
378378
if (rv == cPhs_COMPLEATE_e) {

0 commit comments

Comments
 (0)