Skip to content

Commit 9187f4d

Browse files
hev7hev7
committed
Various improvements
1 parent cbc79a5 commit 9187f4d

File tree

2 files changed

+33
-41
lines changed

2 files changed

+33
-41
lines changed

‎include/d/actor/d_a_obj_lv6TogeRoll.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ class daTogeRoll_c : public dBgS_MoveBgActor {
2020
typedef void (daTogeRoll_c::*modeFunc)();
2121

2222
enum Mode {
23-
ACC,
24-
MOVE,
25-
BRK,
26-
WAIT,
27-
WAIT_INIT,
28-
BREAK,
29-
BOUND,
30-
BOUND_2,
31-
BOUND_WAIT,
23+
MODE_ACC,
24+
MODE_MOVE,
25+
MODE_BRK,
26+
MODE_WAIT,
27+
MODE_WAIT_INIT,
28+
MODE_BREAK,
29+
MODE_BOUND,
30+
MODE_BOUND_2,
31+
MODE_BOUND_WAIT,
3232
};
3333

3434
/* 80C77CC8 */ void setBaseMtx();
@@ -97,7 +97,7 @@ STATIC_ASSERT(sizeof(daTogeRoll_c) == 0x117c);
9797
class daTogeRoll_HIO_c : public mDoHIO_entry_c {
9898
public:
9999
/* 80C77C2C */ daTogeRoll_HIO_c();
100-
/* 80C798D0 */ ~daTogeRoll_HIO_c();
100+
/* 80C798D0 */ ~daTogeRoll_HIO_c() {}
101101

102102
/* 0x00 */ /* vtable */
103103

‎src/d/actor/d_a_obj_lv6TogeRoll.cpp‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ int daTogeRoll_c::create() {
120120
field_0x5ae = 0;
121121
field_0x5d4 = mSpeed[getSpeed()];
122122
init_modeWaitInit();
123-
cullMtx = mpModel->getBaseTRMtx();
123+
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
124124
fopAcM_setCullSizeBox2(this, mpModel->getModelData());
125125
setBaseMtx();
126126
mStts.Init(0xfe, 0xff, this);
@@ -191,26 +191,21 @@ int daTogeRoll_c::Execute(Mtx** i_mtx) {
191191

192192
cXyz pos;
193193
for (int i = 0; i < 8; i++) {
194-
pos.x = 0.0f;
195-
pos.y = 0.0f;
196-
pos.z = 0.0f;
197-
pos.x = (i ^ 0x80000000) * 70.0f - 248.0f;
194+
cXyz pos(0.0f, 0.0f, 0.0f);
195+
pos.x = (f32)i * 70.0f - 248.0f;
198196

199197
mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
200198
mDoMtx_stack_c::multVec(&pos, &pos);
201199

202200
cXyz pos2 = current.pos;
203-
PSVECAdd(&pos2, &pos, &pos2);
201+
pos2 += pos;
204202

205203
mSph[i].SetR(50.0f);
206204
mSph[i].SetC(pos2);
207205
dComIfG_Ccsp()->Set(&mSph[i]);
208206
}
209207

210-
cXyz pos3;
211-
pos3.x = 270.0f;
212-
pos3.y = 0.0f;
213-
pos3.z = 0.0f;
208+
cXyz pos3(270.0f, 0.0f, 0.0f);
214209

215210
mDoMtx_stack_c::ZXYrotS(current.angle.x, current.angle.y, current.angle.z);
216211
mDoMtx_stack_c::multVec(&pos3, &pos3);
@@ -219,7 +214,7 @@ int daTogeRoll_c::Execute(Mtx** i_mtx) {
219214
field_0x113c.mEnd = current.pos - pos3;
220215
field_0x113c.mRadius = 30.0f;
221216

222-
static_cast<cM3dGCps*>(&mCps)->Set(field_0x113c);
217+
mCps.cM3dGCps::Set(field_0x113c);
223218
dComIfG_Ccsp()->Set(&mCps);
224219
mStts.Move();
225220
mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -275,7 +270,7 @@ void daTogeRoll_c::init_modeBound() {
275270
cXyz pos2;
276271
cM3d_InDivPos2(&current.pos, &field_0x5b0, l_HIO.field_0x0c, &pos2);
277272
field_0x5b0 = pos2;
278-
mMode = BOUND;
273+
mMode = MODE_BOUND;
279274
}
280275

281276
/* 80C78B7C-80C78BD8 00103C 005C+00 1/0 0/0 0/0 .text modeBound__12daTogeRoll_cFv */
@@ -295,7 +290,7 @@ void daTogeRoll_c::modeBound2() {
295290
/* 80C78C34-80C78C50 0010F4 001C+00 2/2 0/0 0/0 .text init_modeBoundWait__12daTogeRoll_cFv */
296291
void daTogeRoll_c::init_modeBoundWait() {
297292
field_0x5db = l_HIO.field_0x06;
298-
mMode = BOUND_WAIT;
293+
mMode = MODE_BOUND_WAIT;
299294
}
300295

301296
/* 80C78C50-80C78CA8 001110 0058+00 1/0 0/0 0/0 .text modeBoundWait__12daTogeRoll_cFv */
@@ -311,7 +306,7 @@ void daTogeRoll_c::modeBoundWait() {
311306

312307
/* 80C78CA8-80C78CB4 001168 000C+00 1/1 0/0 0/0 .text init_modeAcc__12daTogeRoll_cFv */
313308
void daTogeRoll_c::init_modeAcc() {
314-
mMode = ACC;
309+
mMode = MODE_ACC;
315310
}
316311

317312
/* 80C78CB4-80C78DA0 001174 00EC+00 1/0 0/0 0/0 .text modeAcc__12daTogeRoll_cFv */
@@ -330,7 +325,7 @@ void daTogeRoll_c::modeAcc() {
330325

331326
/* 80C78DA0-80C78DAC 001260 000C+00 1/1 0/0 0/0 .text init_modeMove__12daTogeRoll_cFv */
332327
void daTogeRoll_c::init_modeMove() {
333-
mMode = MOVE;
328+
mMode = MODE_MOVE;
334329
}
335330

336331
/* 80C78DAC-80C790C4 00126C 0318+00 1/0 0/0 0/0 .text modeMove__12daTogeRoll_cFv */
@@ -360,7 +355,7 @@ void daTogeRoll_c::modeMove() {
360355

361356
/* 80C790C4-80C790D0 001584 000C+00 1/1 0/0 0/0 .text init_modeBrk__12daTogeRoll_cFv */
362357
void daTogeRoll_c::init_modeBrk() {
363-
mMode = BRK;
358+
mMode = MODE_BRK;
364359
}
365360

366361
/* 80C790D0-80C792CC 001590 01FC+00 1/0 0/0 0/0 .text modeBrk__12daTogeRoll_cFv */
@@ -382,7 +377,7 @@ void daTogeRoll_c::modeBrk() {
382377
*/
383378
void daTogeRoll_c::init_modeWaitInit() {
384379
speedF = 0.0f;
385-
mMode = WAIT_INIT;
380+
mMode = MODE_WAIT_INIT;
386381
}
387382

388383
/* 80C792E4-80C79318 0017A4 0034+00 1/0 0/0 0/0 .text modeWaitInit__12daTogeRoll_cFv */
@@ -393,7 +388,7 @@ void daTogeRoll_c::modeWaitInit() {
393388

394389
/* 80C79318-80C79324 0017D8 000C+00 2/2 0/0 0/0 .text init_modeWait__12daTogeRoll_cFv */
395390
void daTogeRoll_c::init_modeWait() {
396-
mMode = WAIT;
391+
mMode = MODE_WAIT;
397392
}
398393

399394
/* 80C79324-80C79344 0017E4 0020+00 1/0 0/0 0/0 .text modeWait__12daTogeRoll_cFv */
@@ -405,21 +400,21 @@ void daTogeRoll_c::modeWait() {
405400
void daTogeRoll_c::init_modeBreak() {
406401
mDoAud_seStart(Z2SE_OBJ_TRAP_BREAK, &current.pos, 0,
407402
dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
408-
mMode = BREAK;
403+
mMode = MODE_BREAK;
409404
}
410405

411406
/* 80C793C8-80C795E8 001888 0220+00 1/0 0/0 0/0 .text modeBreak__12daTogeRoll_cFv */
412407
void daTogeRoll_c::modeBreak() {
413-
csXyz pos = shape_angle;
414-
pos.x = 0.0f;
415-
pos.z = 0.0f;
408+
csXyz rot = shape_angle;
409+
rot.x = 0.0f;
410+
rot.z = 0.0f;
416411

417-
dComIfGp_particle_set(0x8A73, &current.pos, &pos, NULL);
418-
dComIfGp_particle_set(0x8A74, &current.pos, &pos, NULL);
419-
dComIfGp_particle_set(0x8A75, &current.pos, &pos, NULL);
420-
dComIfGp_particle_set(0x8A76, &current.pos, &pos, NULL);
421-
dComIfGp_particle_set(0x8A77, &current.pos, &pos, NULL);
422-
dComIfGp_particle_set(0x8A78, &current.pos, &pos, NULL);
412+
dComIfGp_particle_set(0x8A73, &current.pos, &rot, NULL);
413+
dComIfGp_particle_set(0x8A74, &current.pos, &rot, NULL);
414+
dComIfGp_particle_set(0x8A75, &current.pos, &rot, NULL);
415+
dComIfGp_particle_set(0x8A76, &current.pos, &rot, NULL);
416+
dComIfGp_particle_set(0x8A77, &current.pos, &rot, NULL);
417+
dComIfGp_particle_set(0x8A78, &current.pos, &rot, NULL);
423418

424419
fopAcM_delete(this);
425420
}
@@ -491,9 +486,6 @@ static int daTogeRoll_Create(fopAc_ac_c* i_this) {
491486
return static_cast<daTogeRoll_c*>(i_this)->create();
492487
}
493488

494-
/* 80C798D0-80C7992C 001D90 005C+00 2/1 0/0 0/0 .text __dt__16daTogeRoll_HIO_cFv */
495-
daTogeRoll_HIO_c::~daTogeRoll_HIO_c() {}
496-
497489
/* 80C79C70-80C79C90 -00001 0020+00 1/0 0/0 0/0 .data l_daTogeRoll_Method */
498490
static actor_method_class l_daTogeRoll_Method = {
499491
(process_method_func)daTogeRoll_Create, (process_method_func)daTogeRoll_Delete,

0 commit comments

Comments
 (0)