diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-09-16 21:43:25 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-09-16 22:32:06 -0400 |
| commit | d591961dbd14bfe723dbd6ba542b169e472744da (patch) | |
| tree | 5bee1f9e1a1782530864461fc77cb5db52aecbed /src | |
| parent | ed1df7c7ab7267ce8b1fb1fb658d0172995c85b9 (diff) | |
dAcObjBase var -> mVar
Diffstat (limited to 'src')
111 files changed, 599 insertions, 588 deletions
diff --git a/src/REL/d/a/d_a_bombf.cpp b/src/REL/d/a/d_a_bombf.cpp index 35fc3a6d..253a5f3b 100644 --- a/src/REL/d/a/d_a_bombf.cpp +++ b/src/REL/d/a/d_a_bombf.cpp @@ -36,11 +36,11 @@ int dAcBombf_c::actorCreate() { } mStts.SetDefaultRank(); - forwardAccel = -2.0f; - forwardMaxSpeed = -80.0f; + mAcceleration = -2.0f; + mMaxSpeed = -80.0f; mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-80.0, -50.0f, -80.0f), mVec3_c(80.0, 60.0f, 80.0f)); - angle = mRotation; + mBoundingBox.Set(mVec3_c(-80.0, -50.0f, -80.0f), mVec3_c(80.0, 60.0f, 80.0f)); + mAngle = mRotation; if (mDespawnSceneFlag < 0xFF) { unsetActorProperty(AC_PROP_0x1); setActorProperty(AC_PROP_0x4); @@ -111,20 +111,20 @@ int dAcBombf_c::actorExecute() { bomb->setTransformFromFlower(mtx); } mModel.setLocalMtx(mWorldMtx); - poscopy2 = mPosition; - poscopy3 = mPosition; + mPositionCopy2 = mPosition; + mPositionCopy3 = mPosition; field_0x3D3 = 0; } else { if (dBgS::GetInstance()->ChkMoveBG(field_0x398, true)) { - dBgS::GetInstance()->MoveBgTransPos(field_0x398, true, &mPosition, &angle, &mRotation); + dBgS::GetInstance()->MoveBgTransPos(field_0x398, true, &mPosition, &mAngle, &mRotation); updateMatrix(); dAcBomb_c *bomb = mBombRef.get(); if (bomb != nullptr) { bomb->setTransformFromFlower(mWorldMtx); } mModel.setLocalMtx(mWorldMtx); - poscopy2 = mPosition; - poscopy3 = mPosition; + mPositionCopy2 = mPosition; + mPositionCopy3 = mPosition; } } diff --git a/src/REL/d/a/d_a_invisible.cpp b/src/REL/d/a/d_a_invisible.cpp index 15052b1d..0dc8f48d 100644 --- a/src/REL/d/a/d_a_invisible.cpp +++ b/src/REL/d/a/d_a_invisible.cpp @@ -16,10 +16,10 @@ int dAcInvisible::create() { mStts.SetRank(9); mSph.SetStts(mStts); mCps.SetStts(mStts); - forwardAccel = 0.0; - forwardMaxSpeed = -40.0f; + mAcceleration = 0.0; + mMaxSpeed = -40.0f; mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/d_a_knight_leader_bird.cpp b/src/REL/d/a/d_a_knight_leader_bird.cpp index 94d9a4a8..a9199547 100644 --- a/src/REL/d/a/d_a_knight_leader_bird.cpp +++ b/src/REL/d/a/d_a_knight_leader_bird.cpp @@ -35,7 +35,7 @@ int dAcKnightLeaderBird_c::create() { dAcBirdBase_c::resetBird(); field_0xF40 = 0.15f; mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-300.0f, 0.0f, -300.0f), mVec3_c(300.0f, 200.0f, 300.0f)); + mBoundingBox.Set(mVec3_c(-300.0f, 0.0f, -300.0f), mVec3_c(300.0f, 200.0f, 300.0f)); return SUCCEEDED; } @@ -51,7 +51,7 @@ int dAcKnightLeaderBird_c::actorExecute() { fn_80176D30(); fn_80176F80(); updateMatrixBird(); - + updateSpineMtx(); fn_80177EA0(); @@ -72,7 +72,6 @@ int dAcKnightLeaderBird_c::draw() { return SUCCEEDED; } - void dAcKnightLeaderBird_c::updateSpineMtx() { static const char *sBirdLordSpineName = "Spine"; u32 id = mMdl.getModel().getNodeID(sBirdLordSpineName); @@ -85,9 +84,9 @@ void dAcKnightLeaderBird_c::updateSpineMtx() { } void dAcKnightLeaderBird_c::initializeState_Wait() { - forwardSpeed = 0.0f; - velocity.set(0.0f, 0.0f, 0.0f); - forwardAccel = 0.0f; + mSpeed = 0.0f; + mVelocity.set(0.0f, 0.0f, 0.0f); + mAcceleration = 0.0f; changeBirdAction(sBirdLordAnmName, BIRD_ACTION_GLIDE, m3d::PLAY_MODE_4, 8.0f); } void dAcKnightLeaderBird_c::executeState_Wait() {} diff --git a/src/REL/d/a/d_a_t_wood_area.cpp b/src/REL/d/a/d_a_t_wood_area.cpp index 382df9d1..23106844 100644 --- a/src/REL/d/a/d_a_t_wood_area.cpp +++ b/src/REL/d/a/d_a_t_wood_area.cpp @@ -15,8 +15,8 @@ STATE_DEFINE(dAcTWoodArea_c, Wait); int dAcTWoodArea_c::actorCreate() { mStateMgr.changeState(StateID_Init); PSMTXTrans(mWorldMtx.m, mPosition.x, mPosition.y, mPosition.z); - boundingBox.mMin = mVec3_c(-0.0f, -0.0f, -0.0f); - boundingBox.mMax = mVec3_c(0.0f, 0.0f, 0.0f); + mBoundingBox.mMin = mVec3_c(-0.0f, -0.0f, -0.0f); + mBoundingBox.mMax = mVec3_c(0.0f, 0.0f, 0.0f); return SUCCEEDED; } diff --git a/src/REL/d/a/e/d_a_e_hb_leaf.cpp b/src/REL/d/a/e/d_a_e_hb_leaf.cpp index 6660bc08..c1d0e291 100644 --- a/src/REL/d/a/e/d_a_e_hb_leaf.cpp +++ b/src/REL/d/a/e/d_a_e_hb_leaf.cpp @@ -21,7 +21,7 @@ bool dAcEhb_leaf_c::createHeap() { int dAcEhb_leaf_c::create() { CREATE_ALLOCATOR(dAcEhb_leaf_c); - boundingBox.Set(mVec3_c(-100.0f, -100.0f, -100.0f), mVec3_c(100.0f, 100.0f, 100.0f)); + mBoundingBox.Set(mVec3_c(-100.0f, -100.0f, -100.0f), mVec3_c(100.0f, 100.0f, 100.0f)); mRotation.y = cM::rndF(65535.0f); someRot = mRotation.y.mVal; diff --git a/src/REL/d/a/e/d_a_e_sm.cpp b/src/REL/d/a/e/d_a_e_sm.cpp index c68755b6..e389f57a 100644 --- a/src/REL/d/a/e/d_a_e_sm.cpp +++ b/src/REL/d/a/e/d_a_e_sm.cpp @@ -129,7 +129,7 @@ int dAcEsm_c::actorCreate() { CREATE_ALLOCATOR(dAcEsm_c); - mRotation.z = angle.x = 0; + mRotation.z = mAngle.x = 0; mBombRef.unlink(); @@ -138,19 +138,19 @@ int dAcEsm_c::actorCreate() { switch ((int)mScale.x) { default: case SM_SMALL: { - boundingBox.Set(mVec3_c(-250.f, -250.f, -250.f), mVec3_c(250.f, 375.f, 250.f)); + mBoundingBox.Set(mVec3_c(-250.f, -250.f, -250.f), mVec3_c(250.f, 375.f, 250.f)); mScale.set(0.8f, 0.8f, 0.8f); } break; case SM_LARGE: { - boundingBox.Set(mVec3_c(-500.f, -500.f, -500.f), mVec3_c(500.f, 750.f, 500.f)); + mBoundingBox.Set(mVec3_c(-500.f, -500.f, -500.f), mVec3_c(500.f, 750.f, 500.f)); mScale.set(0.4f, 0.4f, 0.4f); } break; case SM_MASSIVE: { - boundingBox.Set(mVec3_c(-800.f, -800.f, -800.f), mVec3_c(800.f, 1200.f, 800.f)); + mBoundingBox.Set(mVec3_c(-800.f, -800.f, -800.f), mVec3_c(800.f, 1200.f, 800.f)); mScale.set(0.25f, 0.25f, 0.25f); } break; case SM_TINY: { - boundingBox.Set(mVec3_c(-150.f, -150.f, -150.f), mVec3_c(150.f, 225.f, 150.f)); + mBoundingBox.Set(mVec3_c(-150.f, -150.f, -150.f), mVec3_c(150.f, 225.f, 150.f)); mScale.set(1.2f, 1.2f, 1.2f); } break; } @@ -166,16 +166,16 @@ int dAcEsm_c::actorCreate() { mObjAcch.SetGndThinCellingOff(); mObjAcch.mField_0x390 = 1; - forwardMaxSpeed = -40.f; + mMaxSpeed = -40.f; mSph.Set(sSphSrc); mSph.SetStts(mStts); - mPosition.CopyTo(poscopy2); + mPosition.CopyTo(mPositionCopy2); mPosition.CopyTo(mPosCopy1); - mPosition.CopyTo(poscopy3); - poscopy3.y += 50.f; + mPosition.CopyTo(mPositionCopy3); + mPositionCopy3.y += 50.f; mRotCopy.set(mRotation); @@ -220,10 +220,10 @@ int dAcEsm_c::actorCreate() { mHealth = 100; if (field_0xBBF != 1) { - forwardAccel = -3.f; + mAcceleration = -3.f; } calcVelocity(); - mPosition += velocity; + mPosition += mVelocity; mPosition += mStts.GetCcMove(); mObjAcch.CrrPos(*dBgS::GetInstance()); @@ -233,27 +233,27 @@ int dAcEsm_c::actorCreate() { switch (mType) { // SM_RED default: { - targetFiTextId = 59; + mTargetFiTextID = 59; anim_frame = 0.f; mSph.SetAtModifier(AT_MOD_FIRE); mType = SM_RED; } break; case SM_GREEN_ALT: case SM_GREEN: { - targetFiTextId = 62; + mTargetFiTextID = 62; anim_frame = 3.f; mType = SM_GREEN; } break; case SM_YELLOW_ALT: case SM_YELLOW: { - targetFiTextId = 61; + mTargetFiTextID = 61; anim_frame = 2.f; mSph.SetAtModifier(AT_MOD_ELECTRIC); mType = SM_YELLOW; } break; case SM_BLUE: { - targetFiTextId = 60; + mTargetFiTextID = 60; anim_frame = 1.f; } break; } @@ -339,7 +339,7 @@ int dAcEsm_c::actorExecute() { target.y += mScaleTarget.y * 60.f; } - cLib::addCalcPos2(&bomb->getPosition(), target, 0.8f, 20.f + GetSpeed() * 1.5f); + cLib::addCalcPos2(&bomb->getPosition(), target, 0.8f, 20.f + getSpeed() * 1.5f); field_0xB6C = 0.5f; @@ -412,11 +412,11 @@ int dAcEsm_c::actorExecute() { fillUpperParams2Byte(); deleteRequest(); } - forwardSpeed = 0.f; + mSpeed = 0.f; // TODO: Maybe Inline - Common Pattern. Check GetCcMove calcVelocity(); - mPosition += velocity; + mPosition += mVelocity; mPosition += mStts.GetCcMove(); mObjAcch.CrrPos(*dBgS::GetInstance()); @@ -443,7 +443,7 @@ int dAcEsm_c::actorExecute() { field_0xBBF = 0; setBattleBgmRelated(2); fn_80030700(); - mRotation.y = angle.y = getXZAngleToPlayer(); + mRotation.y = mAngle.y = getXZAngleToPlayer(); } if (field_0xBBF == 3) { return SUCCEEDED; @@ -468,7 +468,7 @@ int dAcEsm_c::actorExecute() { if (0 == sLib::calcTimer(&mTimer_0xBC4)) { calcVelocity(); - mPosition += velocity; + mPosition += mVelocity; mPosition += mStts.GetCcMove(); } @@ -517,7 +517,7 @@ int dAcEsm_c::actorExecute() { if (mSph.ChkTgHit()) { if (field_0xB94 == 7) { field_0xB6C = 0.5f; - forwardSpeed = 0.f; + mSpeed = 0.f; } else { int val = 0; // IDK what this would have been field_0xB6C = 1.5f + 0.1f * val; @@ -550,7 +550,7 @@ int dAcEsm_c::actorExecute() { break; default: { dAcObjBase_c *tgActor = mSph.GetTgActor(); - if (tgActor->profile_name == fProfile::OBJ_FIRE_PILLAR) { + if (tgActor->mProfileName == fProfile::OBJ_FIRE_PILLAR) { mHealth = 0; fn_187_4540(2); } else { @@ -581,12 +581,13 @@ int dAcEsm_c::actorExecute() { if (mHealth != 0 && field_0xBC8 == 0 && field_0xBA0 == 0 && field_0xB90 < 0) { // Check to make sure the chu is slow enough/or on the ground - if ((!mStateMgr.isState(StateID_BirthJump) || mObjAcch.ChkGndHit() || velocity.y <= -6.f) && field_0xBB6 == 0) { + if ((!mStateMgr.isState(StateID_BirthJump) || mObjAcch.ChkGndHit() || mVelocity.y <= -6.f) && + field_0xBB6 == 0) { // Check to make sure chu isnt in a "death"-like state. if (!(mStateMgr.isState(StateID_Absorption) || mStateMgr.isState(StateID_Dead) || mStateMgr.isState(StateID_Fusion))) { // CHECK FOR FUSION - Another ESm - if (mSph.ChkCoHit() && mSph.GetCoActor()->profile_name == fProfile::E_SM) { + if (mSph.ChkCoHit() && mSph.GetCoActor()->mProfileName == fProfile::E_SM) { // The other chu to interact with dAcEsm_c *pOther = static_cast<dAcEsm_c *>(mSph.GetCoActor()); @@ -594,7 +595,7 @@ int dAcEsm_c::actorExecute() { if (!fn_187_4B50() && pOther->field_0xBC8 == 0 && pOther->mHealth != 0 && pOther->field_0xBA0 == 0 && pOther->field_0xB90 < 0 && pOther->field_0xBB6 == 0) { if (!pOther->mStateMgr.isState(StateID_BirthJump) || pOther->mObjAcch.ChkGndHit() || - pOther->velocity.y <= -6.f) { + pOther->mVelocity.y <= -6.f) { // Check for non-fusion/absorption status and if the other Chu is smaller than [this] chu if (!(pOther->mStateMgr.isState(StateID_Absorption) || pOther->mStateMgr.isState(StateID_Fusion)) && @@ -632,7 +633,7 @@ int dAcEsm_c::actorExecute() { dAcBomb_c *bomb = getBombWithinRadius(lookRadius); if (bomb != nullptr && std::abs(bomb->getPosition().y - mHomePos1.y) < 0.7f * lookRadius) { - if (bomb->GetLinkage().tryAttach(bomb, this, &mBombRef, dLinkage_c::CONNECTION_1, false)) { + if (bomb->getLinkage().tryAttach(bomb, this, &mBombRef, dLinkage_c::CONNECTION_1, false)) { mTimer_0xBAE = 160; startSound(SE_ESm_BRING_IN); unsetActorProperty(AC_PROP_0x1); @@ -657,10 +658,10 @@ int dAcEsm_c::actorExecute() { MTXMultVec(nodeMtx, center, mHomePos1); - mPosition.CopyTo(poscopy3); - mPosition.CopyTo(poscopy2); - poscopy2.y += 130.f * mScaleTarget.y; - poscopy3.y += 260.f * mScaleTarget.y; + mPosition.CopyTo(mPositionCopy3); + mPosition.CopyTo(mPositionCopy2); + mPositionCopy2.y += 130.f * mScaleTarget.y; + mPositionCopy3.y += 260.f * mScaleTarget.y; mSph.SetC(mHomePos1); if (mSph.ChkTgElectric()) { @@ -674,12 +675,12 @@ int dAcEsm_c::actorExecute() { mSph.SetR(radius); dCcS::GetInstance()->Set(&mSph); - f32 speedTarget = forwardSpeed; + f32 speedTarget = mSpeed; speedTarget -= field_0xB80; if (speedTarget < 0.f) { speedTarget = 0.f; } - sLib::addCalcScaledDiff(&forwardSpeed, speedTarget, 0.3f, 1.f); + sLib::addCalcScaledDiff(&mSpeed, speedTarget, 0.3f, 1.f); sLib::addCalcScaled(&field_0xB80, 0.3f, 1.f); if (field_0xBCB == 0) { @@ -768,10 +769,10 @@ void dAcEsm_c::initializeState_Walk() { mRotation.x = 0; Set_0xBBC(2); - field_0xBAA = angle.y; + field_0xBAA = mAngle.y; field_0xBA8 = 0; field_0xBCB = 0; - forwardAccel = -3.f; + mAcceleration = -3.f; } void dAcEsm_c::executeState_Walk() { field_0xBA6 += (s16)(1000.f + field_0xB70 / mScaleTarget.x); @@ -797,7 +798,7 @@ void dAcEsm_c::initializeState_BirthJump() { field_0xB54 = 0.1f; field_0xB68 = 0.f; - forwardSpeed = 0.f; + mSpeed = 0.f; field_0xBB8 = 3; field_0xB90 = -1; @@ -855,8 +856,8 @@ void dAcEsm_c::fn_187_3F60() { bool dAcEsm_c::fn_187_4090() { mVec3_c pos(mPosition.x, mPosition.y + 20.f, mPosition.z); - if (velocity.y <= 0.f && dBgS_ObjGndChk::CheckPos(pos) && dBgS_ObjGndChk::GetGroundHeight() + 5.f > mPosition.y) { - forwardSpeed = 0.f; + if (mVelocity.y <= 0.f && dBgS_ObjGndChk::CheckPos(pos) && dBgS_ObjGndChk::GetGroundHeight() + 5.f > mPosition.y) { + mSpeed = 0.f; field_0xB6C = 1.5f; if (field_0xB84) { field_0xB6C = field_0xB84 * 0.1f + 0.7f; @@ -903,7 +904,7 @@ bool dAcEsm_c::fn_187_42C0() { return false; } - if (mSph.ChkAtHit() && mSph.GetAtActor()->profile_name == fProfile::PLAYER) { + if (mSph.ChkAtHit() && mSph.GetAtActor()->mProfileName == fProfile::PLAYER) { if (fn_187_4B50()) { return true; } @@ -942,7 +943,7 @@ void dAcEsm_c::fn_187_44C0() { void dAcEsm_c::fn_187_4540(int param0) { const dAcPy_c *player = dAcPy_c::GetLink(); - mAng3_c rot = GetAngle(); + mAng3_c rot = getAngle(); fn_187_44C0(); if (mStateMgr.isState(StateID_Dead)) { @@ -1024,24 +1025,24 @@ void dAcEsm_c::fn_187_4540(int param0) { rot.y = fn_187_51F0(true); const f32 y = sSmDataArr[field_0xB98].field_0x04.y; if (y != v) { - pChild->velocity.y = y; + pChild->mVelocity.y = y; - pChild->velocity.y *= mScaleTarget.y; + pChild->mVelocity.y *= mScaleTarget.y; if (field_0xB98 != 2) { - if (pChild->velocity.y < lower) { - pChild->velocity.y = lower; + if (pChild->mVelocity.y < lower) { + pChild->mVelocity.y = lower; } } else { - if (pChild->velocity.y < upper) { - pChild->velocity.y = upper; + if (pChild->mVelocity.y < upper) { + pChild->mVelocity.y = upper; } } } - pChild->field_0xB84 = pChild->velocity.y; - pChild->forwardSpeed = mScaleTarget.x * sSmDataArr[field_0xB98].field_0x04.x; - if (pChild->forwardSpeed != v && pChild->forwardSpeed < lowest) { - pChild->forwardSpeed = lowest; + pChild->field_0xB84 = pChild->mVelocity.y; + pChild->mSpeed = mScaleTarget.x * sSmDataArr[field_0xB98].field_0x04.x; + if (pChild->mSpeed != v && pChild->mSpeed < lowest) { + pChild->mSpeed = lowest; } pChild->field_0xBB8 = bb8; } @@ -1049,7 +1050,7 @@ void dAcEsm_c::fn_187_4540(int param0) { mSph.OnCoSet(); if (field_0xB98 != 2) { - angle.y = rot.y; + mAngle.y = rot.y; } if (field_0xB98 != 0) { field_0xBCE = 1; @@ -1059,23 +1060,23 @@ void dAcEsm_c::fn_187_4540(int param0) { fn_187_6C20(1); if (field_0xB98 != 0) { if (sSmDataArr[field_0xB98].field_0x10.y) { - velocity.y = sSmDataArr[field_0xB98].field_0x10.y; - velocity.y *= mScaleTarget.y; + mVelocity.y = sSmDataArr[field_0xB98].field_0x10.y; + mVelocity.y *= mScaleTarget.y; if (field_0xB98 != 2) { - if (velocity.y < 20.f) { - velocity.y = 20.f; + if (mVelocity.y < 20.f) { + mVelocity.y = 20.f; } } else { - if (velocity.y < 30.f) { - velocity.y = 30.f; + if (mVelocity.y < 30.f) { + mVelocity.y = 30.f; } } } - field_0xB84 = velocity.y; - forwardSpeed = sSmDataArr[field_0xB98].field_0x10.y * mScaleTarget.x; - if (forwardSpeed && forwardSpeed < 10.f) { - forwardSpeed = 10.f; + field_0xB84 = mVelocity.y; + mSpeed = sSmDataArr[field_0xB98].field_0x10.y * mScaleTarget.x; + if (mSpeed && mSpeed < 10.f) { + mSpeed = 10.f; } field_0xBB8 = 0; if (field_0xB98 == 2) { @@ -1126,9 +1127,9 @@ void dAcEsm_c::fn_187_4CC0() { } if (mObjAcch.ChkWallHit(nullptr)) { - sLib::addCalcAngle(angle.y.ref(), mAcchCir.GetWallAngleY(), 4, 0x200); + sLib::addCalcAngle(mAngle.y.ref(), mAcchCir.GetWallAngleY(), 4, 0x200); } - sLib::addCalcAngle(mRotation.y.ref(), angle.y, 2, 0x800); + sLib::addCalcAngle(mRotation.y.ref(), mAngle.y, 2, 0x800); sLib::addCalcAngle(mRotUnk.x.ref(), mTargetRotX, 4, 0x800); sLib::addCalcAngle(mRotUnk.z.ref(), mTargetRotZ, 4, 0x800); @@ -1235,7 +1236,7 @@ void dAcEsm_c::fn_187_5940() { void dAcEsm_c::updateBoundingBox() { f32 min = -200.f / mScale.x; f32 max = 200.f / mScale.x; - boundingBox.Set(mVec3_c(min, min, min), mVec3_c(max, 250.f / mScale.x, max)); + mBoundingBox.Set(mVec3_c(min, min, min), mVec3_c(max, 250.f / mScale.x, max)); } void dAcEsm_c::fn_187_61B0(u8 param0) { @@ -1436,8 +1437,8 @@ void dAcEsm_c::fn_187_6C20(bool param0) { if (!param0) { dCamera_c *cam = dScGame_c::getCamera(0); - angle.y = cLib::targetAngleY(cam->getPositionMaybe(), cam->getField_0x78()); - angle.addY(cM::rndFX(16384.f)); + mAngle.y = cLib::targetAngleY(cam->getPositionMaybe(), cam->getField_0x78()); + mAngle.addY(cM::rndFX(16384.f)); } field_0xBCE = 1; diff --git a/src/REL/d/a/npc/d_a_npc_rival_lod.cpp b/src/REL/d/a/npc/d_a_npc_rival_lod.cpp index 434c4e5a..f1440a07 100644 --- a/src/REL/d/a/npc/d_a_npc_rival_lod.cpp +++ b/src/REL/d/a/npc/d_a_npc_rival_lod.cpp @@ -18,10 +18,10 @@ int dAcNpcRivalLOD_c::create() { return FAILED; } 0.0f; // float order, cool - forwardAccel = -1.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = -1.0f; + mMaxSpeed = -40.0f; setState(StateID_Wait); - boundingBox.Set(mVec3_c(-110.0f, -30.0f, -130.0f), mVec3_c(130.0f, 190.0f, 110.0f)); + mBoundingBox.Set(mVec3_c(-110.0f, -30.0f, -130.0f), mVec3_c(130.0f, 190.0f, 110.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/npc/d_a_npc_saltalk.cpp b/src/REL/d/a/npc/d_a_npc_saltalk.cpp index e25108ed..57432ef7 100644 --- a/src/REL/d/a/npc/d_a_npc_saltalk.cpp +++ b/src/REL/d/a/npc/d_a_npc_saltalk.cpp @@ -53,7 +53,7 @@ int dAcNpcSltk_c::actorCreate() { field_0x76C = 0; - boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_F302_light.cpp b/src/REL/d/a/obj/d_a_obj_F302_light.cpp index 5e52d22a..308a1f76 100644 --- a/src/REL/d/a/obj/d_a_obj_F302_light.cpp +++ b/src/REL/d/a/obj/d_a_obj_F302_light.cpp @@ -37,8 +37,8 @@ bool dAcOF302Light_c::createHeap() { int dAcOF302Light_c::actorCreate() { field_0x440 = getFromParams(0, 0xFF); CREATE_ALLOCATOR(dAcOF302Light_c); - forwardAccel = 0.f; - forwardMaxSpeed = -40.f; + mAcceleration = 0.f; + mMaxSpeed = -40.f; updateMatrix(); mMdl.setLocalMtx(mWorldMtx); if (field_0x440 < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, field_0x440)) { @@ -46,7 +46,7 @@ int dAcOF302Light_c::actorCreate() { } else { mStateMgr.changeState(StateID_SwitchOn); } - boundingBox.Set(mVec3_c(-660.f, -40.f, -660.f), mVec3_c(660.f, 0.f, 660.f)); + mBoundingBox.Set(mVec3_c(-660.f, -40.f, -660.f), mVec3_c(660.f, 0.f, 660.f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_F400_gate_leaf.cpp b/src/REL/d/a/obj/d_a_obj_F400_gate_leaf.cpp index 004c554b..1b7e4d97 100644 --- a/src/REL/d/a/obj/d_a_obj_F400_gate_leaf.cpp +++ b/src/REL/d/a/obj/d_a_obj_F400_gate_leaf.cpp @@ -39,7 +39,7 @@ int dAcOF400GateLeaf_c::create() { mMdl.setLocalMtx(mWorldMtx); mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp b/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp index 7699a8bc..03e42eed 100644 --- a/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp +++ b/src/REL/d/a/obj/d_a_obj_F400_gate_seal.cpp @@ -81,7 +81,7 @@ int dAcOF400GateSeal_c::actorPostCreate() { mMdl.setLocalMtx(mWorldMtx); mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); return SUCCEEDED; } @@ -104,7 +104,7 @@ int dAcOF400GateSeal_c::actorExecute() { if (mAnmClr.isStop(0)) { setObjectProperty(0x200); } else { - clearObjectProperty(0x200); + unsetObjectProperty(0x200); } return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_amber.cpp b/src/REL/d/a/obj/d_a_obj_amber.cpp index bb81d3b8..110847ce 100644 --- a/src/REL/d/a/obj/d_a_obj_amber.cpp +++ b/src/REL/d/a/obj/d_a_obj_amber.cpp @@ -44,7 +44,7 @@ int dAcOAmber_c::actorPostCreate() { } } mMdl.getBounds(&mMin, &mMax); - boundingBox.Set(mMin, mMax); + mBoundingBox.Set(mMin, mMax); mShadowRot.v = (mMin + mMax) * 0.5f; mShadowRot.w = ((mMax - mMin) * 0.5f).mag(); updateMatrix(); diff --git a/src/REL/d/a/obj/d_a_obj_appear_bridge.cpp b/src/REL/d/a/obj/d_a_obj_appear_bridge.cpp index c5a68581..6b79487d 100644 --- a/src/REL/d/a/obj/d_a_obj_appear_bridge.cpp +++ b/src/REL/d/a/obj/d_a_obj_appear_bridge.cpp @@ -50,7 +50,7 @@ int dAcOappearBridge_c::create() { mStateMgr.changeState(StateID_Wait); mModel.setPriorityDraw(0x1C, 0x9); - boundingBox.Set(mVec3_c(-3000.0f, -200.0f, -600.0f), mVec3_c(50.0f, 800.0f, 600.0f)); + mBoundingBox.Set(mVec3_c(-3000.0f, -200.0f, -600.0f), mVec3_c(50.0f, 800.0f, 600.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_bamboo_island.cpp b/src/REL/d/a/obj/d_a_obj_bamboo_island.cpp index a454fadd..b8425c7e 100644 --- a/src/REL/d/a/obj/d_a_obj_bamboo_island.cpp +++ b/src/REL/d/a/obj/d_a_obj_bamboo_island.cpp @@ -47,7 +47,7 @@ int dAcObambooIsland_c::create() { dBgS::GetInstance()->Regist(&mCollision, this); mModels[0].setPriorityDraw(0x1C, 9); mModels[1].setPriorityDraw(0x22, 9); - boundingBox.Set(mVec3_c(-2400.0f, -1600.0f, -2300.0f), mVec3_c(2400.0f, 3900.0f, 2400.0f)); + mBoundingBox.Set(mVec3_c(-2400.0f, -1600.0f, -2300.0f), mVec3_c(2400.0f, 3900.0f, 2400.0f)); mCullingDistance = 500000.0f; mCollision.SetRideCallback(rideCallback); return SUCCEEDED; diff --git a/src/REL/d/a/obj/d_a_obj_bird_sp.cpp b/src/REL/d/a/obj/d_a_obj_bird_sp.cpp index 4f8eefe1..94b769bd 100644 --- a/src/REL/d/a/obj/d_a_obj_bird_sp.cpp +++ b/src/REL/d/a/obj/d_a_obj_bird_sp.cpp @@ -27,7 +27,7 @@ bool dAcObjBirdSp_c::createHeap() { int dAcObjBirdSp_c::create() { CREATE_ALLOCATOR(dAcObjBirdSp_c); - boundingBox.Set(mVec3_c(-2000, -2000, -2000), mVec3_c(2000, 2000, 2000)); + mBoundingBox.Set(mVec3_c(-2000, -2000, -2000), mVec3_c(2000, 2000, 2000)); mCollider.Set(sCcSrc); mCollider.SetStts(mStts); mCollider.SetR(mScale.x * 1000.0f); @@ -37,8 +37,8 @@ int dAcObjBirdSp_c::create() { int dAcObjBirdSp_c::actorExecute() { /* if its colliding with Bird or Player */ if (mCollider.ChkCoHit() && mCollider.GetCoActor() != nullptr && - (mCollider.GetCoActor()->profile_name == fProfile::BIRD || - mCollider.GetCoActor()->profile_name == fProfile::PLAYER)) { + (mCollider.GetCoActor()->mProfileName == fProfile::BIRD || + mCollider.GetCoActor()->mProfileName == fProfile::PLAYER)) { mVec3_c posChange(0, -0.2, 1.0); mMtx_c matrix; matrix.ZXYrotS(mRotation); diff --git a/src/REL/d/a/obj/d_a_obj_bird_statue.cpp b/src/REL/d/a/obj/d_a_obj_bird_statue.cpp index 5047769d..6ce53e52 100644 --- a/src/REL/d/a/obj/d_a_obj_bird_statue.cpp +++ b/src/REL/d/a/obj/d_a_obj_bird_statue.cpp @@ -29,7 +29,7 @@ int dAcOBirdStatue_c::create() { mMdl.setLocalMtx(mWorldMtx); mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_blade.cpp b/src/REL/d/a/obj/d_a_obj_blade.cpp index 8ead42e4..fe3102f7 100644 --- a/src/REL/d/a/obj/d_a_obj_blade.cpp +++ b/src/REL/d/a/obj/d_a_obj_blade.cpp @@ -23,7 +23,7 @@ int dAcOblade_c::create() { mMdl.setAnm("StageF000Blade", m3d::PLAY_MODE_4); updateMatrix(); mMdl.getModel().setLocalMtx(mWorldMtx); - boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_block_underground.cpp b/src/REL/d/a/obj/d_a_obj_block_underground.cpp index 3440310a..33f9d741 100644 --- a/src/REL/d/a/obj/d_a_obj_block_underground.cpp +++ b/src/REL/d/a/obj/d_a_obj_block_underground.cpp @@ -155,7 +155,7 @@ int dAcOBlockUnderground::actorCreate() { mBgW.Move(); mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_bstone.cpp b/src/REL/d/a/obj/d_a_obj_bstone.cpp index 57814208..f8019267 100644 --- a/src/REL/d/a/obj/d_a_obj_bstone.cpp +++ b/src/REL/d/a/obj/d_a_obj_bstone.cpp @@ -43,9 +43,9 @@ int dAcObstonec::create() { mBg.SetUnkBase(1); } - forwardAccel = -1.0f; - forwardMaxSpeed = -40.0f; - boundingBox.Set(mVec3_c(-350.0f, -60.0f, -240.0f), mVec3_c(350.0f, 600.0f, 240.0f)); + mAcceleration = -1.0f; + mMaxSpeed = -40.0f; + mBoundingBox.Set(mVec3_c(-350.0f, -60.0f, -240.0f), mVec3_c(350.0f, 600.0f, 240.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_chair.cpp b/src/REL/d/a/obj/d_a_obj_chair.cpp index ac5a30f2..0af39065 100644 --- a/src/REL/d/a/obj/d_a_obj_chair.cpp +++ b/src/REL/d/a/obj/d_a_obj_chair.cpp @@ -101,8 +101,8 @@ int dAcOChair_c::create() { mObjAcch.CrrPos(*dBgS::GetInstance()); } - forwardAccel = -2.f; - forwardMaxSpeed = -40.f; + mAcceleration = -2.f; + mMaxSpeed = -40.f; field_0xB1B = 1; field_0xB1A = 1; @@ -110,7 +110,7 @@ int dAcOChair_c::create() { mChairRot = mRotation.y; mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-60.f, -0.f, -60.f), mVec3_c(60.f, 160.f, 60.f)); + mBoundingBox.Set(mVec3_c(-60.f, -0.f, -60.f), mVec3_c(60.f, 160.f, 60.f)); return SUCCEEDED; } @@ -207,7 +207,7 @@ void dAcOChair_c::executeState_Wait() { return; } if (field_0xB1C && mChairType == CHAIR_E) { - const f32 mag = (mChairPos - poscopy2).squareMagXZ(); + const f32 mag = (mChairPos - mPositionCopy2).squareMagXZ(); if (mag < 10000.f) { return; } @@ -244,11 +244,11 @@ dAcOChair_c::ChairType dAcOChair_c::getChairType(u8 ¶m) { void dAcOChair_c::updateChairPos() { if (mChairType != CHAIR_E) { if (isBench()) { - poscopy2 = mPosition; + mPositionCopy2 = mPosition; } else { - mMdl.getNodeWorldMtxMultVecZero(mSeatNodeID, poscopy2); + mMdl.getNodeWorldMtxMultVecZero(mSeatNodeID, mPositionCopy2); } - poscopy3 = poscopy2; + mPositionCopy3 = mPositionCopy2; } else { field_0xB1A = true; if (!checkObjectProperty(0x8000)) { @@ -256,13 +256,13 @@ void dAcOChair_c::updateChairPos() { work.rotY(getRelativeYRotationToPlayer()); work.z = 0.f; work.rotY(mRotation.y); - poscopy2 = mPosition; + mPositionCopy2 = mPosition; if (work.squareMagXZ() < 10000.f) { - poscopy2 += work; + mPositionCopy2 += work; } else { field_0xB1A = false; } } - poscopy3 = poscopy2; + mPositionCopy3 = mPositionCopy2; } } diff --git a/src/REL/d/a/obj/d_a_obj_chest.cpp b/src/REL/d/a/obj/d_a_obj_chest.cpp index f56eefd2..1a7a5e88 100644 --- a/src/REL/d/a/obj/d_a_obj_chest.cpp +++ b/src/REL/d/a/obj/d_a_obj_chest.cpp @@ -116,18 +116,18 @@ int dAcOChest_c::create() { dBgS::GetInstance()->Regist(&mBgW, this); dBgS::GetInstance()->RegistBg(&mBgW, this); - forwardAccel = 0.0f; - forwardMaxSpeed = 0.0f; + mAcceleration = 0.0f; + mMaxSpeed = 0.0f; mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-200.0f, -0.0f, -100.0f), mVec3_c(200.0f, 500.0f, 100.0f)); + mBoundingBox.Set(mVec3_c(-200.0f, -0.0f, -100.0f), mVec3_c(200.0f, 500.0f, 100.0f)); mAnmMdl.setAnm(getOpenOrClose(0), m3d::PLAY_MODE_4); mAnmMdl.setRate(0.0f); - poscopy2.y = mPosition.y + 150.0f; - poscopy3 = poscopy2; + mPositionCopy2.y = mPosition.y + 150.0f; + mPositionCopy3 = mPositionCopy2; if ((s32)getFromParams(0x10, 0xFF) != 0xFF) { mInsideMdl.setLocalMtx(mWorldMtx); } diff --git a/src/REL/d/a/obj/d_a_obj_cloud_dive.cpp b/src/REL/d/a/obj/d_a_obj_cloud_dive.cpp index 75cfc261..7e87cbd5 100644 --- a/src/REL/d/a/obj/d_a_obj_cloud_dive.cpp +++ b/src/REL/d/a/obj/d_a_obj_cloud_dive.cpp @@ -48,7 +48,7 @@ int dAcOcloudDive_c::create() { } updateMatrix(); mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_decoB.cpp b/src/REL/d/a/obj/d_a_obj_decoB.cpp index fefb7ba9..d707da2c 100644 --- a/src/REL/d/a/obj/d_a_obj_decoB.cpp +++ b/src/REL/d/a/obj/d_a_obj_decoB.cpp @@ -23,10 +23,10 @@ int dAcODecoB_c::create() { if (!initAllocatorWork1Heap(0x1000, "dAcODecoB_c::m_allocator", 0x20)) { return FAILED; } - forwardAccel = 0.0f; - forwardMaxSpeed = 0.0f; + mAcceleration = 0.0f; + mMaxSpeed = 0.0f; mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-350.0f, 100.0f, -100.0f), mVec3_c(350.0f, -300.0f, 100.0f)); + mBoundingBox.Set(mVec3_c(-350.0f, 100.0f, -100.0f), mVec3_c(350.0f, -300.0f, 100.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_desert_debris.cpp b/src/REL/d/a/obj/d_a_obj_desert_debris.cpp index 37876288..48dedf7d 100644 --- a/src/REL/d/a/obj/d_a_obj_desert_debris.cpp +++ b/src/REL/d/a/obj/d_a_obj_desert_debris.cpp @@ -37,7 +37,7 @@ int dAcOdesertDebris_c::create() { mMdl.setPriorityDraw(0x1C, 9); mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp index 00c40e4a..804b3114 100644 --- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp @@ -29,7 +29,7 @@ int dAcOdistantShip_c::create() { CREATE_ALLOCATOR(dAcOdistantShip_c); updateMatrix(); mModel.setLocalMtx(mWorldMtx); - boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); } return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp b/src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp index 498d98d3..266dca7f 100644 --- a/src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp @@ -129,9 +129,9 @@ int dAcODungeonShip_c::create() { mStts.SetRank(2); mCc.Set(sCcSrc); mCc.SetStts(mStts); - forwardAccel = 0.0f; - forwardMaxSpeed = 0.0f; - boundingBox.Set(mVec3_c(-6000.0f, -500.0f, -2000.0f), mVec3_c(5000.0f, 4000.0f, 2000.0f)); + mAcceleration = 0.0f; + mMaxSpeed = 0.0f; + mBoundingBox.Set(mVec3_c(-6000.0f, -500.0f, -2000.0f), mVec3_c(5000.0f, 4000.0f, 2000.0f)); if (SceneflagManager::sInstance->checkBoolFlag(mRoomID, (mParams >> 0x10) & 0xFF)) { dBgS::GetInstance()->RegistBg(&mBg, this); mStateMgr.changeState(StateID_End); @@ -309,7 +309,7 @@ void dAcODungeonShip_c::executeState_Transparency() { field_0x858 *= -1; } } - sLib::addCalc(&forwardSpeed, field_0x858, 0.02f, 1.0f, 0.1f); + sLib::addCalc(&mSpeed, field_0x858, 0.02f, 1.0f, 0.1f); fn_485_1720(); } void dAcODungeonShip_c::finalizeState_Transparency() {} @@ -440,7 +440,7 @@ static u32 rot_7fff = 0x7FFF; static u32 rot_4000 = 0x4000; void dAcODungeonShip_c::fn_485_1720() { - mPath.setSpeed(forwardSpeed); + mPath.setSpeed(mSpeed); mPath.execute(); // TODO mPosition = mPath.getPosition(); @@ -452,7 +452,7 @@ void dAcODungeonShip_c::fn_485_1720() { mRotation.y += rot_7fff; } mRotation.y += rot_4000; - angle.y = mRotation.y; + mAngle.y = mRotation.y; int factor = 0x12C; f32 tmp2 = nw4r::math::SinIdx((field_0x850 * 800)); @@ -478,7 +478,7 @@ u32 dAcODungeonShip_c::fn_485_1960() { return 0; } mVec3_c v = mVec3_c::Ez; - v.rotY(angle.y + mAng(-0x4000)); + v.rotY(mAngle.y + mAng(-0x4000)); mVec3_c dist = link->mPosition - mPosition; dist.y = 0.0f; dist.normalizeRS(); @@ -510,7 +510,7 @@ void dAcODungeonShip_c::fn_485_1DF0() { mVec3_c dist = mPosition - link->mPosition; fn_485_1960(); field_0x858 = 30.0f; - sLib::addCalc(&forwardSpeed, 30.0f, 0.02f, 1.0f, 0.1f); + sLib::addCalc(&mSpeed, 30.0f, 0.02f, 1.0f, 0.1f); fn_485_1720(); } } diff --git a/src/REL/d/a/obj/d_a_obj_fence_boko.cpp b/src/REL/d/a/obj/d_a_obj_fence_boko.cpp index 1c9c0dad..baea4b9c 100644 --- a/src/REL/d/a/obj/d_a_obj_fence_boko.cpp +++ b/src/REL/d/a/obj/d_a_obj_fence_boko.cpp @@ -26,7 +26,7 @@ int dAcOfenceBoko_c::create() { mCollision.mRoomId = dStage_c::GetInstance()->getCurrRoomId(); mRoomID = mCollision.mRoomId; mModel.setPriorityDraw(0x1C, 0x9); - boundingBox.Set(mVec3_c(-210.0f, -10.0f, -20.0f), mVec3_c(210.0f, 340.0f, 20.0f)); + mBoundingBox.Set(mVec3_c(-210.0f, -10.0f, -20.0f), mVec3_c(210.0f, 340.0f, 20.0f)); mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp b/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp index e6dca825..b0a57119 100644 --- a/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp +++ b/src/REL/d/a/obj/d_a_obj_fence_boko2.cpp @@ -22,7 +22,7 @@ int dAcOfenceBoko2_c::create() { dBgS::GetInstance()->Regist(&mCollision, this); dBgS::GetInstance()->RegistBg(&mCollision, this); mModel.setPriorityDraw(0x1C, 0x9); - boundingBox.Set(mVec3_c(-160.0f, -40.0f, -70.0f), mVec3_c(180.0f, 300.0f, 60.0f)); + mBoundingBox.Set(mVec3_c(-160.0f, -40.0f, -70.0f), mVec3_c(180.0f, 300.0f, 60.0f)); mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_fence_konsai.cpp b/src/REL/d/a/obj/d_a_obj_fence_konsai.cpp index 94e3c944..2fd78177 100644 --- a/src/REL/d/a/obj/d_a_obj_fence_konsai.cpp +++ b/src/REL/d/a/obj/d_a_obj_fence_konsai.cpp @@ -21,7 +21,7 @@ int dAcOfenceKonsai_c::create() { CREATE_ALLOCATOR(dAcOfenceKonsai_c); dBgS::GetInstance()->Regist(&mCollision, this); mModel.setPriorityDraw(0x1C, 0x9); - boundingBox.Set(mVec3_c(-100.0f, -10.0f, -30.0f), mVec3_c(100.0f, 270.0f, 40.0f)); + mBoundingBox.Set(mVec3_c(-100.0f, -10.0f, -30.0f), mVec3_c(100.0f, 270.0f, 40.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp b/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp index 061db868..2e47a594 100644 --- a/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp +++ b/src/REL/d/a/obj/d_a_obj_flying_clawshot_target.cpp @@ -64,7 +64,7 @@ int dAcOFlyingClawshotTarget_c::actorCreate() { mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp b/src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp index f268c878..c42791d2 100644 --- a/src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp +++ b/src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp @@ -49,7 +49,7 @@ int dAcOFruitGutsLeaf_c::actorCreate() { mMdl.setPriorityDraw(0x7F, 0x7F); } - boundingBox.Set(bbMin, bbMax); + mBoundingBox.Set(bbMin, bbMax); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp b/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp index fe379ea8..ab3bcbc2 100644 --- a/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp +++ b/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp @@ -33,13 +33,13 @@ int dAcOgirahimFoot_c::create() { mStateMgr.changeState(StateID_Wait); - poscopy2.x = 13275.0f; - poscopy2.y = 2370.0f; - poscopy2.z = -11780.0f; + mPositionCopy2.x = 13275.0f; + mPositionCopy2.y = 2370.0f; + mPositionCopy2.z = -11780.0f; mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_hole.cpp b/src/REL/d/a/obj/d_a_obj_hole.cpp index 792db68b..524feaba 100644 --- a/src/REL/d/a/obj/d_a_obj_hole.cpp +++ b/src/REL/d/a/obj/d_a_obj_hole.cpp @@ -35,7 +35,7 @@ int dAcOhole_c::create() { u8 params2 = getFromParams(2, 0xF); field_0x799 = params2 != (s8)0xF ? params2 : 0xFF; - boundingBox.Set(mVec3_c(-200.0f, -200.0f, -200.0f), mVec3_c(200.0f, 200.0f, 200.0f)); + mBoundingBox.Set(mVec3_c(-200.0f, -200.0f, -200.0f), mVec3_c(200.0f, 200.0f, 200.0f)); mObjAcch.Set(this, 1, &mAcchCir); mAcchCir.SetWall(100.0f, 100.0f); mObjAcch.CrrPos(*dBgS::GetInstance()); diff --git a/src/REL/d/a/obj/d_a_obj_impa_door.cpp b/src/REL/d/a/obj/d_a_obj_impa_door.cpp index 63cdc7af..487836b5 100644 --- a/src/REL/d/a/obj/d_a_obj_impa_door.cpp +++ b/src/REL/d/a/obj/d_a_obj_impa_door.cpp @@ -25,7 +25,7 @@ int dAcOimpaDoor_c::create() { mMdl.setLocalMtx(mWorldMtx); mStateMgr.changeState(StateID_Wait); mMdl.setPriorityDraw(0x1C, 9); - boundingBox.Set(mVec3_c(-250.0f, 0.0f, -30.0f), mVec3_c(250.0f, 940.0f, 30.0f)); + mBoundingBox.Set(mVec3_c(-250.0f, 0.0f, -30.0f), mVec3_c(250.0f, 940.0f, 30.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp index 83d079aa..3f8cf682 100644 --- a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp +++ b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp @@ -22,7 +22,7 @@ int dAcOironStage_c::create() { CREATE_ALLOCATOR(dAcOironStage_c); dBgS::GetInstance()->Regist(&mCollision, this); mModel.setPriorityDraw(0x1C, 0x9); - boundingBox.Set(mVec3_c(-460.0f, -210.0f, -260.0f), mVec3_c(460.0f, 210.0f, 260.0f)); + mBoundingBox.Set(mVec3_c(-460.0f, -210.0f, -260.0f), mVec3_c(460.0f, 210.0f, 260.0f)); mCullingDistance = 15000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_island_LOD.cpp b/src/REL/d/a/obj/d_a_obj_island_LOD.cpp index fbcb4000..80921158 100644 --- a/src/REL/d/a/obj/d_a_obj_island_LOD.cpp +++ b/src/REL/d/a/obj/d_a_obj_island_LOD.cpp @@ -33,7 +33,7 @@ int dAcOislandLOD_c::create() { mMdl.setLocalMtx(mWorldMtx); mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); mCullingDistance = 500000.0; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_island_nusi.cpp b/src/REL/d/a/obj/d_a_obj_island_nusi.cpp index 3c7523ca..14d613e0 100644 --- a/src/REL/d/a/obj/d_a_obj_island_nusi.cpp +++ b/src/REL/d/a/obj/d_a_obj_island_nusi.cpp @@ -58,7 +58,7 @@ int dAcOislandNusi_c::create() { mMdls[0].setPriorityDraw(0x1C, 9); mMdls[1].setPriorityDraw(0x22, 9); - boundingBox.Set(mVec3_c(-4000.0f, -1200.0f, -2700.0f), mVec3_c(4800.0f, 3400.0f, 1700.0f)); + mBoundingBox.Set(mVec3_c(-4000.0f, -1200.0f, -2700.0f), mVec3_c(4800.0f, 3400.0f, 1700.0f)); mCullingDistance = 500000.0f; diff --git a/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp b/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp index 7b5fc745..e6320b1f 100644 --- a/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp +++ b/src/REL/d/a/obj/d_a_obj_ivy_rope.cpp @@ -721,7 +721,7 @@ void dAcOivyRope_c::fn_256_C980(f32 f0, f32 f1) { UNKTYPE dAcOivyRope_c::fn_256_C9B0(UNKTYPE) {} void dAcOivyRope_c::fn_256_CD40() { - mPosition = poscopy3 = poscopy2 = fn_256_D730(mSegmentCount - 1); + mPosition = mPositionCopy3 = mPositionCopy2 = fn_256_D730(mSegmentCount - 1); mCps1.Set(sCpsSrc); mCps1.SetStts(mStts); diff --git a/src/REL/d/a/obj/d_a_obj_junk_repairing.cpp b/src/REL/d/a/obj/d_a_obj_junk_repairing.cpp index 80ce4e8d..2eb060dc 100644 --- a/src/REL/d/a/obj/d_a_obj_junk_repairing.cpp +++ b/src/REL/d/a/obj/d_a_obj_junk_repairing.cpp @@ -34,12 +34,12 @@ bool dAcOJunkRep_c::createHeap() { int dAcOJunkRep_c::create() { CREATE_ALLOCATOR(dAcOJunkRep_c); - forwardAccel = -1.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = -1.0f; + mMaxSpeed = -40.0f; mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-30.0f, -0.0f, -20.0f), mVec3_c(30.0f, 120.0f, 20.0f)); + mBoundingBox.Set(mVec3_c(-30.0f, -0.0f, -20.0f), mVec3_c(30.0f, 120.0f, 20.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_lava_F200.cpp b/src/REL/d/a/obj/d_a_obj_lava_F200.cpp index 003563a8..af4961b2 100644 --- a/src/REL/d/a/obj/d_a_obj_lava_F200.cpp +++ b/src/REL/d/a/obj/d_a_obj_lava_F200.cpp @@ -41,7 +41,7 @@ int dAcOlavaF200_c::create() { mModels[0].setPriorityDraw(0x1C, 9); mModels[1].setPriorityDraw(0x22, 9); - boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_megami_island.cpp b/src/REL/d/a/obj/d_a_obj_megami_island.cpp index 8f380109..5ace732f 100644 --- a/src/REL/d/a/obj/d_a_obj_megami_island.cpp +++ b/src/REL/d/a/obj/d_a_obj_megami_island.cpp @@ -90,7 +90,7 @@ int dAcOmegamiIsland_c::create() { mMdls[0].setPriorityDraw(0x1C, 9); mMdls[1].setPriorityDraw(0x22, 9); - boundingBox.Set(mVec3_c(-5000.0f, -5000.0f, -23000.0f), mVec3_c(5000.0f, 10000.0f, -9000.0f)); + mBoundingBox.Set(mVec3_c(-5000.0f, -5000.0f, -23000.0f), mVec3_c(5000.0f, 10000.0f, -9000.0f)); mCullingDistance = 500000.0f; return SUCCEEDED; diff --git a/src/REL/d/a/obj/d_a_obj_mole_cover.cpp b/src/REL/d/a/obj/d_a_obj_mole_cover.cpp index acfe73fa..cf4d2f48 100644 --- a/src/REL/d/a/obj/d_a_obj_mole_cover.cpp +++ b/src/REL/d/a/obj/d_a_obj_mole_cover.cpp @@ -32,7 +32,7 @@ int dAcOmoleCover_c::create() { CREATE_ALLOCATOR(dAcOmoleCover_c); dBgS::GetInstance()->Regist(&mBgW, this); mMdl.setPriorityDraw(0x1C, 9); - boundingBox.Set(mVec3_c(-1900.0f, 1100.0f, -5500.0f), mVec3_c(100.0f, 1700.0f, -1800.0f)); + mBoundingBox.Set(mVec3_c(-1900.0f, 1100.0f, -5500.0f), mVec3_c(100.0f, 1700.0f, -1800.0f)); mCullingDistance = FLOAT_MAX; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_mole_soil.cpp b/src/REL/d/a/obj/d_a_obj_mole_soil.cpp index fe637441..87599226 100644 --- a/src/REL/d/a/obj/d_a_obj_mole_soil.cpp +++ b/src/REL/d/a/obj/d_a_obj_mole_soil.cpp @@ -30,7 +30,7 @@ int dAcOmoleSoil_c::create() { dAcBase_c::mScale.set(sHalfScale, sHalfScale, sHalfScale); mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-100.0f, -0.0f, -100.0f), mVec3_c(100.0f, 100.0f, 100.0f)); + mBoundingBox.Set(mVec3_c(-100.0f, -0.0f, -100.0f), mVec3_c(100.0f, 100.0f, 100.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_oct_grass.cpp b/src/REL/d/a/obj/d_a_obj_oct_grass.cpp index 9059b112..933d38d5 100644 --- a/src/REL/d/a/obj/d_a_obj_oct_grass.cpp +++ b/src/REL/d/a/obj/d_a_obj_oct_grass.cpp @@ -41,19 +41,19 @@ bool dAcOOctGrass_c::createHeap() { int dAcOOctGrass_c::create() { CREATE_ALLOCATOR(dAcOOctGrass_c); - forwardAccel = 0.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = 0.0f; + mMaxSpeed = -40.0f; if ((mParams & 0xF) != 0) { mMdl.setPriorityDraw(0x1C, 9); } updateMatrix(); mMdl.setLocalMtx(mWorldMtx); spawnOcGrsL(); - poscopy2 = mPosition; - poscopy3 = mPosition; - poscopy3.y += 20.0f; + mPositionCopy2 = mPosition; + mPositionCopy3 = mPosition; + mPositionCopy3.y += 20.0f; mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-50.0f, -10.0f, -50.0f), mVec3_c(50.0f, 100.0f, 50.0f)); + mBoundingBox.Set(mVec3_c(-50.0f, -10.0f, -50.0f), mVec3_c(50.0f, 100.0f, 50.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_pool_cock.cpp b/src/REL/d/a/obj/d_a_obj_pool_cock.cpp index e3f04b97..c455a9bf 100644 --- a/src/REL/d/a/obj/d_a_obj_pool_cock.cpp +++ b/src/REL/d/a/obj/d_a_obj_pool_cock.cpp @@ -22,8 +22,8 @@ bool dAcOPoolCock_c::createHeap() { int dAcOPoolCock_c::actorCreate() { CREATE_ALLOCATOR(dAcOPoolCock_c); - forwardAccel = -0.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = -0.0f; + mMaxSpeed = -40.0f; mOpenSceneflag = mParams & 0xFF; mOpenDirection = mVec3_c::Ez; mOpenDirection.rotY(mRotation.y); @@ -34,7 +34,7 @@ int dAcOPoolCock_c::actorCreate() { mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-300.0f, -100.0f, -300.0f), mVec3_c(300.0f, 100.0f, 300.0f)); + mBoundingBox.Set(mVec3_c(-300.0f, -100.0f, -300.0f), mVec3_c(300.0f, 100.0f, 300.0f)); return SUCCEEDED; } @@ -49,7 +49,7 @@ int dAcOPoolCock_c::doDelete() { int dAcOPoolCock_c::actorExecute() { mStateMgr.executeState(); calcVelocity(); - mPosition += velocity; + mPosition += mVelocity; mPosition += mStts.mCcMove; updateMatrix(); diff --git a/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp b/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp index 1ab67bf4..bc1af437 100644 --- a/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp +++ b/src/REL/d/a/obj/d_a_obj_pumpkin_bar.cpp @@ -46,7 +46,7 @@ int dAcOpumpkinBar_c::create() { // This also works if a separate variable is used but I // think it's more likely that mCullingDistance got set twice. mCullingDistance = 100000.0f; - boundingBox.Set(mVec3_c(-2790.0f, -1450.0f, -8270.0f), mVec3_c(2880.0f, 2120.0f, 1370.0f)); + mBoundingBox.Set(mVec3_c(-2790.0f, -1450.0f, -8270.0f), mVec3_c(2880.0f, 2120.0f, 1370.0f)); mCullingDistance = 500000.0f; mBarCollision.SetRideCallback(barCollisionRideCallback); return SUCCEEDED; diff --git a/src/REL/d/a/obj/d_a_obj_pumpkin_leaf.cpp b/src/REL/d/a/obj/d_a_obj_pumpkin_leaf.cpp index d1e196bb..1cf42d46 100644 --- a/src/REL/d/a/obj/d_a_obj_pumpkin_leaf.cpp +++ b/src/REL/d/a/obj/d_a_obj_pumpkin_leaf.cpp @@ -19,11 +19,11 @@ int dAcOPumpkinLeaf_c::create() { return FAILED; } - forwardAccel = -1.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = -1.0f; + mMaxSpeed = -40.0f; updateMatrix(); mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-50.0f, -10.0f, -50.0f), mVec3_c(50.0f, 50.0f, 50.0f)); + mBoundingBox.Set(mVec3_c(-50.0f, -10.0f, -50.0f), mVec3_c(50.0f, 50.0f, 50.0f)); dAcObjBase_c::create( "PmpknBd", getRoomId(), 0, &mPosition, &mRotation, &mScale, getParams2_ignoreLower(), -1, mViewClipIdx ); diff --git a/src/REL/d/a/obj/d_a_obj_puzzle_island.cpp b/src/REL/d/a/obj/d_a_obj_puzzle_island.cpp index fbaae9eb..d42f4be0 100644 --- a/src/REL/d/a/obj/d_a_obj_puzzle_island.cpp +++ b/src/REL/d/a/obj/d_a_obj_puzzle_island.cpp @@ -43,7 +43,7 @@ int dAcOpuzzleIsland_c::create() { mMdl.setPriorityDraw(0x1C, 9); mVec3_c min, max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); mCullingDistance = 500000.0f; mBgW.SetRideCallback(rideCallback); return SUCCEEDED; diff --git a/src/REL/d/a/obj/d_a_obj_rail_post.cpp b/src/REL/d/a/obj/d_a_obj_rail_post.cpp index 8105a334..017ade2b 100644 --- a/src/REL/d/a/obj/d_a_obj_rail_post.cpp +++ b/src/REL/d/a/obj/d_a_obj_rail_post.cpp @@ -46,7 +46,7 @@ int dAcORailPost::create() { CREATE_ALLOCATOR(dAcORailPost); mMdl.getBounds(&boundsMin, &boundsMax); - boundingBox.Set(boundsMin, boundsMax); + mBoundingBox.Set(boundsMin, boundsMax); mCullingDistance = 25000.0f; return SUCCEEDED; diff --git a/src/REL/d/a/obj/d_a_obj_ring.cpp b/src/REL/d/a/obj/d_a_obj_ring.cpp index d49aa7ea..1183b921 100644 --- a/src/REL/d/a/obj/d_a_obj_ring.cpp +++ b/src/REL/d/a/obj/d_a_obj_ring.cpp @@ -21,12 +21,12 @@ int dAcOring_c::create() { field_0x388 = getArgFromParams(); - boundingBox.Set(mVec3_c(-100.0f, -100.0f, -100.0f), mVec3_c(100.0f, 100.0f, 100.0f)); + mBoundingBox.Set(mVec3_c(-100.0f, -100.0f, -100.0f), mVec3_c(100.0f, 100.0f, 100.0f)); updateMatrix(); mModel.setScale(mScale); mModel.setLocalMtx(mWorldMtx); - forwardAccel = -5.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = -5.0f; + mMaxSpeed = -40.0f; field_0x38C = dAcPy_c::LINK->mPosition.y; mStateMgr.changeState(StateID_Move); return SUCCEEDED; @@ -39,7 +39,7 @@ int dAcOring_c::doDelete() { int dAcOring_c::actorExecute() { mStateMgr.executeState(); calcVelocity(); - mPosition += velocity; + mPosition += mVelocity; mPosition += mStts.mCcMove; updateMatrix(); mModel.setLocalMtx(mWorldMtx); @@ -54,7 +54,7 @@ int dAcOring_c::draw() { void dAcOring_c::initializeState_Move() {} void dAcOring_c::executeState_Move() { - if (GetLinkage().checkConnection(dLinkage_c::CONNECTION_7)) { + if (getLinkage().checkConnection(dLinkage_c::CONNECTION_7)) { return; } mRotation.addX(0x1000); diff --git a/src/REL/d/a/obj/d_a_obj_rope_base.cpp b/src/REL/d/a/obj/d_a_obj_rope_base.cpp index 09fc5cf2..ac8aa1fc 100644 --- a/src/REL/d/a/obj/d_a_obj_rope_base.cpp +++ b/src/REL/d/a/obj/d_a_obj_rope_base.cpp @@ -26,7 +26,7 @@ int dAcOropeBase_c::create() { CREATE_ALLOCATOR(dAcOropeBase_c); updateMatrix(); mMdl.setLocalMtx(mWorldMtx); - boundingBox.Set(mVec3_c(-525.0f, -0.0f, -500.0f), mVec3_c(-325.0f, 700.0f, -300.0f)); + mBoundingBox.Set(mVec3_c(-525.0f, -0.0f, -500.0f), mVec3_c(-325.0f, 700.0f, -300.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_ruined_save.cpp b/src/REL/d/a/obj/d_a_obj_ruined_save.cpp index 93b2a084..95f9caf7 100644 --- a/src/REL/d/a/obj/d_a_obj_ruined_save.cpp +++ b/src/REL/d/a/obj/d_a_obj_ruined_save.cpp @@ -32,9 +32,9 @@ int dAcOruinedSave_c::create() { CREATE_ALLOCATOR(dAcOruinedSave_c); updateMatrix(); mMdl.setLocalMtx(mWorldMtx); - poscopy2 = mPosition; - poscopy2.y += 300.0f; - poscopy3 = poscopy2; + mPositionCopy2 = mPosition; + mPositionCopy2.y += 300.0f; + mPositionCopy3 = mPositionCopy2; field_0x40C = 0; mStateMgr.changeState(StateID_Wait); return SUCCEEDED; @@ -77,8 +77,8 @@ void dAcOruinedSave_c::initializeState_Vanish() { void dAcOruinedSave_c::executeState_Vanish() { field_0x40C++; if (((u16)field_0x40C & 0xF) == 3) { - poscopy3.z = poscopy2.z + cM::rndFX(50.0f); - poscopy3.y = poscopy2.y - cM::rndFX(20.0f); + mPositionCopy3.z = mPositionCopy2.z + cM::rndFX(50.0f); + mPositionCopy3.y = mPositionCopy2.y - cM::rndFX(20.0f); } mAnmMatClr.play(); if (field_0x408 == mAnmMatClr.getFrame(0)) { diff --git a/src/REL/d/a/obj/d_a_obj_seat_sword.cpp b/src/REL/d/a/obj/d_a_obj_seat_sword.cpp index 94478943..a76cfc26 100644 --- a/src/REL/d/a/obj/d_a_obj_seat_sword.cpp +++ b/src/REL/d/a/obj/d_a_obj_seat_sword.cpp @@ -86,8 +86,8 @@ int dAcOSeatSword_c::create() { mPedestalMdl_s.setPriorityDraw(0x22, 0x9); } - forwardAccel = 0.f; - forwardMaxSpeed = -40.f; + mAcceleration = 0.f; + mMaxSpeed = -40.f; if (mSubtype == 1) { mField_0x7E8 = l_inGroundRot; @@ -102,7 +102,7 @@ int dAcOSeatSword_c::create() { mStateMgr.changeState(StateID_Wait); } - boundingBox.Set(mVec3_c(-75.f, -10.f, -75.f), mVec3_c(75.f, 200.f, 75.f)); + mBoundingBox.Set(mVec3_c(-75.f, -10.f, -75.f), mVec3_c(75.f, 200.f, 75.f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_shrine_after.cpp b/src/REL/d/a/obj/d_a_obj_shrine_after.cpp index 0cf5f125..a44c866d 100644 --- a/src/REL/d/a/obj/d_a_obj_shrine_after.cpp +++ b/src/REL/d/a/obj/d_a_obj_shrine_after.cpp @@ -14,7 +14,7 @@ int dAcOshrineAfter_c::create() { updateMatrix(); mModel.setLocalMtx(mWorldMtx); mModel.setPriorityDraw(0x1C, 0x9); - boundingBox.Set(mVec3_c(-4000.0f, 7000.0f, 5000.0f), mVec3_c(5000.0f, 15000.0f, 14000.0f)); + mBoundingBox.Set(mVec3_c(-4000.0f, 7000.0f, 5000.0f), mVec3_c(5000.0f, 15000.0f, 14000.0f)); mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_shrine_bef_inside.cpp b/src/REL/d/a/obj/d_a_obj_shrine_bef_inside.cpp index 137c4470..05f1d359 100644 --- a/src/REL/d/a/obj/d_a_obj_shrine_bef_inside.cpp +++ b/src/REL/d/a/obj/d_a_obj_shrine_bef_inside.cpp @@ -39,7 +39,7 @@ int dAcOshrineBefInside_c::create() { dBgS::GetInstance()->Regist(&mCollision, this); mModel[0].setPriorityDraw(0x1C, 0x9); mModel[1].setPriorityDraw(0x22, 0x9); - boundingBox.Set(mVec3_c(-2000.0f, 7400.0f, 7200.0f), mVec3_c(4400.0f, 10000.0f, 15800.0f)); + mBoundingBox.Set(mVec3_c(-2000.0f, 7400.0f, 7200.0f), mVec3_c(4400.0f, 10000.0f, 15800.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_shrine_before.cpp b/src/REL/d/a/obj/d_a_obj_shrine_before.cpp index b3a4cb84..cf9aa98b 100644 --- a/src/REL/d/a/obj/d_a_obj_shrine_before.cpp +++ b/src/REL/d/a/obj/d_a_obj_shrine_before.cpp @@ -14,7 +14,7 @@ int dAcOshrineBefore_c::create() { updateMatrix(); mModel.setLocalMtx(mWorldMtx); mModel.setPriorityDraw(0x1C, 0x9); - boundingBox.Set(mVec3_c(-4000.0f, 7000.0f, 5000.0f), mVec3_c(4000.0f, 13000.0f, 14000.0f)); + mBoundingBox.Set(mVec3_c(-4000.0f, 7000.0f, 5000.0f), mVec3_c(4000.0f, 13000.0f, 14000.0f)); mCullingDistance = 50000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_smoke.cpp b/src/REL/d/a/obj/d_a_obj_smoke.cpp index 38ff62d3..71d50df2 100644 --- a/src/REL/d/a/obj/d_a_obj_smoke.cpp +++ b/src/REL/d/a/obj/d_a_obj_smoke.cpp @@ -32,7 +32,7 @@ int dAcOsmoke_c::create() { mModel.setLocalMtx(mWorldMtx); mStateMgr.changeState(StateID_Wait); mModel.setPriorityDraw(0x1C, 9); - boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_spike.cpp b/src/REL/d/a/obj/d_a_obj_spike.cpp index 62270f2b..3a38eda4 100644 --- a/src/REL/d/a/obj/d_a_obj_spike.cpp +++ b/src/REL/d/a/obj/d_a_obj_spike.cpp @@ -64,7 +64,7 @@ int dAcOspike_c::create() { mCollision.cM3dGUnk::Set(tmp2, tmp3); mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-10.0f, -250.0f, -480.0f), mVec3_c(80.0f, 260.0f, 490.0f)); + mBoundingBox.Set(mVec3_c(-10.0f, -250.0f, -480.0f), mVec3_c(80.0f, 260.0f, 490.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_stage_cover.cpp b/src/REL/d/a/obj/d_a_obj_stage_cover.cpp index 16b6faf9..b2c62eed 100644 --- a/src/REL/d/a/obj/d_a_obj_stage_cover.cpp +++ b/src/REL/d/a/obj/d_a_obj_stage_cover.cpp @@ -19,7 +19,7 @@ int dAcOstageCover_c::create() { mStateMgr.changeState(StateID_Wait); mModel.setPriorityDraw(0x1C, 9); - boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_stream_lava.cpp b/src/REL/d/a/obj/d_a_obj_stream_lava.cpp index 742488e7..7f1622fc 100644 --- a/src/REL/d/a/obj/d_a_obj_stream_lava.cpp +++ b/src/REL/d/a/obj/d_a_obj_stream_lava.cpp @@ -84,7 +84,7 @@ int dAcOstreamLava_c::create() { mModel.setPriorityDraw(0x1C, 0x9); mVec3_c min, max; mModel.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); mCullingDistance = 50000.0f; int roomId_tmp = mRoomID; @@ -112,7 +112,7 @@ int dAcOstreamLava_c::actorExecute() { setObjectProperty(0x200); return SUCCEEDED; } else { - clearObjectProperty(0x200); + unsetObjectProperty(0x200); return SUCCEEDED; } } diff --git a/src/REL/d/a/obj/d_a_obj_sun_light.cpp b/src/REL/d/a/obj/d_a_obj_sun_light.cpp index 388d1f80..114691a8 100644 --- a/src/REL/d/a/obj/d_a_obj_sun_light.cpp +++ b/src/REL/d/a/obj/d_a_obj_sun_light.cpp @@ -26,7 +26,7 @@ int dAcOsunLight_c::create() { mModel.setAnm(mTexAnm); mStateMgr.changeState(StateID_Wait); mModel.setPriorityDraw(0x1C, 9); - boundingBox.Set(mVec3_c(-200.0f, -100.0f, -200.0f), mVec3_c(200.0f, 600.0f, 500.0f)); + mBoundingBox.Set(mVec3_c(-200.0f, -100.0f, -200.0f), mVec3_c(200.0f, 600.0f, 500.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp b/src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp index 6ebca480..57b5f54b 100644 --- a/src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp +++ b/src/REL/d/a/obj/d_a_obj_tarzan_pole.cpp @@ -55,8 +55,8 @@ int dAcOTarzanPole_c::create() { mCollider.Set(sCcSrc); mCollider.SetStts(mStts); - forwardAccel = 0.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = 0.0f; + mMaxSpeed = -40.0f; mFloat = (s32)(mParams & 0xFF) * 10.0f; if ((s32)(mParams & 0xFF) == 0xFF) { @@ -65,7 +65,7 @@ int dAcOTarzanPole_c::create() { mVec = mVec3_c::Ex * 400.0f; mVec.rotY(mRotation.y); - boundingBox.Set(mVec3_c(-0.0f, -120.0f, -110.0f), mVec3_c(500.0f, 140.0f, 110.0f)); + mBoundingBox.Set(mVec3_c(-0.0f, -120.0f, -110.0f), mVec3_c(500.0f, 140.0f, 110.0f)); return SUCCEEDED; } @@ -87,15 +87,15 @@ int dAcOTarzanPole_c::actorExecute() { mVec = mVec3_c::Ex * sXOffset + mVec3_c::Ey * sYOffset; mVec.rotY(mRotation.y); - poscopy2 = mPosition + mVec; - poscopy3 = poscopy2 + mVec3_c::Ey * 20.0f; + mPositionCopy2 = mPosition + mVec; + mPositionCopy3 = mPositionCopy2 + mVec3_c::Ey * 20.0f; // 0x400000 corresponds to dAcPy_FLG0::FLG0_SWING_ROPE if (player != nullptr && !player->checkActionFlags(0x400000) && dAcItem_c::checkFlag(ITEM_WHIP)) { AttentionManager::GetInstance()->addUnk7Target(*this, 1, 1000.0f, 10.0f, -600.0, 200); } - mCollider.SetC(poscopy2); + mCollider.SetC(mPositionCopy2); dCcS::GetInstance()->Set(&mCollider); return SUCCEEDED; diff --git a/src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp b/src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp index bd3c9795..efb71c64 100644 --- a/src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp +++ b/src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp @@ -53,8 +53,8 @@ int dAcOTimeStageBg_c::actorCreate() { } CREATE_ALLOCATOR(dAcOTimeStageBg_c); - forwardAccel = 0.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = 0.0f; + mMaxSpeed = -40.0f; updateMatrix(); mSceneCallback.attach(mMdl1); mMdl1.setLocalMtx(mWorldMtx); @@ -73,7 +73,7 @@ int dAcOTimeStageBg_c::actorCreate() { mVec3_c min, max; mMdl1.getBounds(&min, &max); mStateMgr.changeState(StateID_Wait); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp b/src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp index e4902b4c..9d8b36c9 100644 --- a/src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp +++ b/src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp @@ -60,13 +60,13 @@ int dAcOtoD3StoneFigure_c::create() { b = getYPos(); b += zero; a = mPosition.x; - poscopy2.x = a; - poscopy2.y = b; - poscopy2.z = c; - poscopy3.x = a; - poscopy3.y = b; - poscopy3.z = c; - // poscopy3 = poscopy2; + mPositionCopy2.x = a; + mPositionCopy2.y = b; + mPositionCopy2.z = c; + mPositionCopy3.x = a; + mPositionCopy3.y = b; + mPositionCopy3.z = c; + // mPositionCopy3 = mPositionCopy2; mCollision.SetTg_0x4C(0x2000); if (!mIsSkyKeepAlreadyOpen) { diff --git a/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp b/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp index 66132df0..b5b16504 100644 --- a/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp +++ b/src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp @@ -40,12 +40,12 @@ int dAcOTowerGearD101_c::actorCreate() { nw4r::g3d::ResMdl mdl = mMdl.getResMdl(); mMdlCallback.init(mdl.GetResNode("model0").GetID()); mMdl.setCallback(&mMdlCallback); - forwardAccel = 0.0f; - forwardMaxSpeed = 0.0f; + mAcceleration = 0.0f; + mMaxSpeed = 0.0f; mStateMgr.changeState(StateID_Wait); mVec3_c s = field_0x3AC; - boundingBox.Set( + mBoundingBox.Set( mVec3_c(s.x * -200.0f, s.y * -200.0f, s.z * -50.0f), mVec3_c(s.x * 200.0f, s.y * 200.0f, s.z * 50.0f) ); diff --git a/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp b/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp index 36416f6f..7279da1d 100644 --- a/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp +++ b/src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp @@ -164,7 +164,7 @@ int dAcOTowerHandD101_c::actorCreate() { dBgS::GetInstance()->Regist(bgW, this); } - boundingBox.Set(getBoundingLower(), getBoundingUpper()); + mBoundingBox.Set(getBoundingLower(), getBoundingUpper()); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp b/src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp index c282e3f9..30ab8033 100644 --- a/src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp +++ b/src/REL/d/a/obj/d_a_obj_trap_rock_1.cpp @@ -32,15 +32,15 @@ int dAcOtrapRock1_c::create() { mBgW.SetCrrFunc(dBgS_MoveBGProc_Typical); dBgS::GetInstance()->Regist(&mBgW, this); - forwardAccel = 0.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = 0.0f; + mMaxSpeed = -40.0f; mStateMgr.changeState(StateID_TrapWait); mVec3_c min, max; mMdl.getBounds(&min, &max); static mVec3_c offset = mVec3_c(50.0f, 50.0f, 50.0f); min -= offset; max += offset; - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_treasure_island.cpp b/src/REL/d/a/obj/d_a_obj_treasure_island.cpp index fb007261..125eb63f 100644 --- a/src/REL/d/a/obj/d_a_obj_treasure_island.cpp +++ b/src/REL/d/a/obj/d_a_obj_treasure_island.cpp @@ -86,7 +86,7 @@ int dAcOtreasureIsland_c::create() { mWater00.setPriorityDraw(0x1C, 0x9); } - boundingBox.Set(mVec3_c(-1850.0f, -2050.0f, -1900.0f), mVec3_c(1950.0f, 2500.0f, 1850.0f)); + mBoundingBox.Set(mVec3_c(-1850.0f, -2050.0f, -1900.0f), mVec3_c(1950.0f, 2500.0f, 1850.0f)); mCullingDistance = 500000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_tubo.cpp b/src/REL/d/a/obj/d_a_obj_tubo.cpp index 520d4328..0d531d3b 100644 --- a/src/REL/d/a/obj/d_a_obj_tubo.cpp +++ b/src/REL/d/a/obj/d_a_obj_tubo.cpp @@ -80,8 +80,8 @@ int dAcOtubo_c::actorCreate() { mSph.SetStts(mStts); mSph.ClrAtSet(); - forwardAccel = -4.f; - forwardMaxSpeed = -40.f; + mAcceleration = -4.f; + mMaxSpeed = -40.f; mbMovingForward = 0; mField_0x9D8 = 2.f; @@ -104,12 +104,12 @@ int dAcOtubo_c::actorCreate() { } mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-100.f, -40.f, -100.f), mVec3_c(100.f, 80.f, 100.f)); - GetLinkage().set(0xC8A0, 28.f, 50.f, 28.f, nullptr); // TODO (ActorCarry Flags) - GetLinkage().field_0x8C = 26.f; - GetLinkage().field_0x90 = 46.f; - GetLinkage().field_0x94 = 28.f; - GetLinkage().field_0x98 = 0.f; + mBoundingBox.Set(mVec3_c(-100.f, -40.f, -100.f), mVec3_c(100.f, 80.f, 100.f)); + getLinkage().set(0xC8A0, 28.f, 50.f, 28.f, nullptr); // TODO (ActorCarry Flags) + getLinkage().field_0x8C = 26.f; + getLinkage().field_0x90 = 46.f; + getLinkage().field_0x94 = 28.f; + getLinkage().field_0x98 = 0.f; return SUCCEEDED; } @@ -162,12 +162,12 @@ int dAcOtubo_c::actorExecute() { if (!bOffGround) { if (!checkCarryType()) { calcVelocity(); - mPosition += velocity; + mPosition += mVelocity; mPosition += mStts.GetCcMove(); mField_0x9DC += mPosition.y - mOldPosition.y; adjustRoll(); } - GetLinkage().bushTpFunc(mObjAcch); + getLinkage().bushTpFunc(mObjAcch); } if (mStateMgr.isState(StateID_Wait) || mStateMgr.isState(StateID_Slope)) { @@ -176,15 +176,15 @@ int dAcOtubo_c::actorExecute() { mSph.SetC(getCenter()); dCcS::GetInstance()->Set(&mSph); - GetLinkage().fn_800511E0(this); + getLinkage().fn_800511E0(this); mField_0x8F0.modifyMtx(); calcRoll(); mMdl.setLocalMtx(mWorldMtx); mMdl.calc(false); - poscopy2 = mPosition + mVec3_c(0.f, 28.f, 0.f); - poscopy3 = poscopy2; - poscopy3.y += 48.f; + mPositionCopy2 = mPosition + mVec3_c(0.f, 28.f, 0.f); + mPositionCopy3 = mPositionCopy2; + mPositionCopy3.y += 48.f; mbField_0x9EB = 0; return SUCCEEDED; @@ -203,7 +203,7 @@ int dAcOtubo_c::draw() { static mQuat_c quat(0.f, 30.f, 0.f, 40.f); - if (yoffset >= 0.f) { + if (mYOffset >= 0.f) { drawShadow(mShdw, nullptr, mWorldMtx, &quat, -1, -1, -1, -1, -1, mPosition.y - mObjAcch.GetGroundH()); } return SUCCEEDED; @@ -244,9 +244,9 @@ void dAcOtubo_c::executeState_Wait() { } adjustSpeed(); - if (forwardSpeed < 1.f) { + if (mSpeed < 1.f) { mbMovingForward = 0; - sLib::chase(&forwardSpeed, 0.f, 0.05f); + sLib::chase(&mSpeed, 0.f, 0.05f); mField_0x9D8 = 2.f; } @@ -269,8 +269,8 @@ void dAcOtubo_c::executeState_Wait() { void dAcOtubo_c::finalizeState_Wait() {} void dAcOtubo_c::initializeState_Grab() { - velocity = mVec3_c::Zero; - angle = mAng3_c::Zero; + mVelocity = mVec3_c::Zero; + mAngle = mAng3_c::Zero; mbMovingForward = 0; mSph.SetCo_0x400(); unsetActorProperty(AC_PROP_0x1); @@ -286,23 +286,23 @@ void dAcOtubo_c::executeState_Grab() { dAcNpcCeLady_c *lady = mCeLady.get(); dAcNpcCeFriend_c *ceFriend = mCeFriend.get(); if (ceFriend && ceFriend->fn_11_17C0(this)) { - GetLinkage().fn_80050EA0(this); + getLinkage().fn_80050EA0(this); } else if (lady && lady->fn_12_1C20(this)) { - GetLinkage().fn_80050EA0(this); + getLinkage().fn_80050EA0(this); } } - if (GetLinkage().checkConnection(dLinkage_c::CONNECTION_5) && sLib::calcTimer(&mTimer_0x9F5) == 0 && + if (getLinkage().checkConnection(dLinkage_c::CONNECTION_5) && sLib::calcTimer(&mTimer_0x9F5) == 0 && (mObjAcch.ChkGndHit() || mObjAcch.ChkWallHit(nullptr) || mObjAcch.ChkRoofHit())) { destroy(); } else if (dAcPy_c::GetLink()->getCurrentAction() == 66 /* Put Down Medium */) { // TODO (Link Action ID) mStateMgr.changeState(StateID_Put); } else { - if (!GetLinkage().checkState(dLinkage_c::STATE_DELETE)) { - if (GetLinkage().checkConnection(dLinkage_c::CONNECTION_5)) { + if (!getLinkage().checkState(dLinkage_c::STATE_DELETE)) { + if (getLinkage().checkConnection(dLinkage_c::CONNECTION_5)) { mField_0x9F6 = dLinkage_c::STATE_0; } else { - mField_0x9F6 = GetLinkage().getState(); + mField_0x9F6 = getLinkage().getState(); } } @@ -313,12 +313,12 @@ void dAcOtubo_c::executeState_Grab() { } void dAcOtubo_c::finalizeState_Grab() { mField_0x9DC = 0.f; - if (forwardSpeed > 0.f) { + if (mSpeed > 0.f) { mbMovingForward = 1; } mField_0x9D4 = cM::rndF(40.f); mSph.ClrCo_0x400(); - if ((u8)GetLinkage().mState == 2) { + if ((u8)getLinkage().mState == 2) { mSph.OnAtSet(); } mObjAcch.ClrRoofNone(); @@ -343,18 +343,18 @@ void dAcOtubo_c::finalizeState_Put() { nw4r::math::FAbs(mPosition.y - dBgS_ObjGndChk::GetGroundHeight()) < 100.f)) { mSph.OnAtSet(); } - forwardSpeed = 0.f; + mSpeed = 0.f; } void dAcOtubo_c::initializeState_Slope() { cM3dGPla pla; dBgS::GetInstance()->GetTriPla(mObjAcch.GetGnd(), &pla); - if (cM::isZero(forwardSpeed)) { - angle.y = pla.GetAngleY(); + if (cM::isZero(mSpeed)) { + mAngle.y = pla.GetAngleY(); } mAng plaAng = pla.GetAngleY(); - mField_0x9C4 = (plaAng - angle.y); - mAng other = labs((s16)(angle.y - mField_0x9C4)); + mField_0x9C4 = (plaAng - mAngle.y); + mAng other = labs((s16)(mAngle.y - mField_0x9C4)); mField_0x9C6 = nw4r::math::FSqrt(other.degree2() / 180.f) * 910.f; } void dAcOtubo_c::executeState_Slope() { @@ -367,11 +367,11 @@ void dAcOtubo_c::executeState_Slope() { adjustAngle(); } else { mbMovingForward = 0; - forwardSpeed = 0.f; - velocity = mVec3_c::Zero; + mSpeed = 0.f; + mVelocity = mVec3_c::Zero; cM3dGPla pla; dBgS::GetInstance()->GetTriPla(mObjAcch.GetGnd(), &pla); - angle.y = cM::atan2s(pla.GetN().x, pla.GetN().z); + mAngle.y = cM::atan2s(pla.GetN().x, pla.GetN().z); } adjustSpeed(); if (mSph.ChkAtSet()) { @@ -398,14 +398,14 @@ void dAcOtubo_c::initializeState_Rebirth() { mQuat_0x98C.set(1.f, 0.f, 0.f, 0.f); - forwardSpeed = 0.f; - velocity.y = 0.f; + mSpeed = 0.f; + mVelocity.y = 0.f; mField_0x9DC = 0.f; mSph.ClrCoSet(); mSph.ClrTgSet(); setObjectProperty(0x200); - GetLinkage().fn_80050EA0(this); + getLinkage().fn_80050EA0(this); int item_drop_table = getParams2UpperByte(); switch (item_drop_table) { @@ -438,7 +438,7 @@ void dAcOtubo_c::finalizeState_Rebirth() { mSph.OnCoSet(); mSph.OnTgSet(); mpPosition = &mPosition; - clearObjectProperty(0x200); + unsetObjectProperty(0x200); setActorProperty(AC_PROP_0x1); } @@ -454,10 +454,10 @@ void dAcOtubo_c::destroy() { return; } fn_80022BE0(dLightEnv_c::GetPInstance(), mPosition); - GetLinkage().fn_80050EA0(this); + getLinkage().fn_80050EA0(this); dEmitterBase_c *fx_thing = dJEffManager_c::spawnEffect( - PARTICLE_RESOURCE_ID_MAPPING_211_, poscopy2, nullptr, nullptr, nullptr, nullptr, 0, 0 + PARTICLE_RESOURCE_ID_MAPPING_211_, mPositionCopy2, nullptr, nullptr, nullptr, nullptr, 0, 0 ); if (fx_thing) { fx_thing->attachEmitterCallbackId(mSubtype != 0 ? dJEffManager_c::TsuboB : dJEffManager_c::TsuboA); @@ -486,14 +486,14 @@ void dAcOtubo_c::calcRoll() { bool onLog = checkOnLog_0xE4E(); if (mbMovingForward || onLog) { if (onLog) { - velocity = mPosition - mOldPosition; - forwardSpeed = EGG::Math<f32>::sqrt(velocity.x * velocity.x + velocity.z * velocity.z); - angle.y = cM::atan2s(velocity.x, velocity.z); + mVelocity = mPosition - mOldPosition; + mSpeed = EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z); + mAngle.y = cM::atan2s(mVelocity.x, mVelocity.z); } - f32 vel_mag = VEC3Len(velocity); + f32 vel_mag = VEC3Len(mVelocity); f32 f1 = mAng(vel_mag * (mField_0x9D4 + 200.f)).radian(); f32 f2 = mAng(vel_mag * 182.0f * 0.2f).radian(); - f32 f0 = mAng(angle.y - mRotation.y).radian(); + f32 f0 = mAng(mAngle.y - mRotation.y).radian(); mQuat_c q0, q1, q2, q3; q1.setAxisRotation(mVec3_c::Ey, f0); @@ -504,8 +504,8 @@ void dAcOtubo_c::calcRoll() { mQuat_0x98C = q1 * q3 * q2 * q0 * mQuat_0x98C; if (onLog) { - velocity = mVec3_c::Zero; - forwardSpeed = 0.f; + mVelocity = mVec3_c::Zero; + mSpeed = 0.f; } } @@ -522,13 +522,13 @@ void dAcOtubo_c::adjustRoll() { if (!mObjAcch.ChkGndHit()) { return; } - if (cM::isZero(forwardSpeed)) { + if (cM::isZero(mSpeed)) { return; } - s32 adj = forwardSpeed * 182; + s32 adj = mSpeed * 182; - mVec3_c vel = velocity; + mVec3_c vel = mVelocity; vel.y = 0.f; vel.normalize(); @@ -565,12 +565,12 @@ void dAcOtubo_c::fn_272_2670() { } } else { if (mbField_0x9F1 && mField_0x8F0.fn_80051780(mSph)) { - velocity += mField_0x9B8; + mVelocity += mField_0x9B8; mbField_0x9F1 = false; } static const s16 unk = {0}; // needed for rodata ordering if (!cM::isZero(mField_0x9CA)) { - angle.y = (*(s16 *)((u8 *)this + 0x9CA)); // HACK to force load again + mAngle.y = (*(s16 *)((u8 *)this + 0x9CA)); // HACK to force load again mField_0x9CA.set(0); } else { mQuat_c q; @@ -580,10 +580,10 @@ void dAcOtubo_c::fn_272_2670() { } if (mObjAcch.ChkGndHit()) { - if (yoffset >= 0.f && !checkCarryType()) { + if (mYOffset >= 0.f && !checkCarryType()) { mField_0x9DC = 0.f; } else if (checkInvalidGround()) { - forwardSpeed = 0.0f; + mSpeed = 0.0f; mbMovingForward = 0; } } @@ -603,18 +603,18 @@ void dAcOtubo_c::fn_272_2670() { mEff_0x91C.execute(waterH, groundH); if (checkSubmerged()) { - forwardAccel = -0.8f; - forwardMaxSpeed = -7.f; + mAcceleration = -0.8f; + mMaxSpeed = -7.f; mField_0x9DC = 0.f; - cLib::addCalcPosXZ(&velocity, mVec3_c::Zero, 0.05f, 1.0f, 0.2f); - forwardSpeed = EGG::Math<f32>::sqrt(velocity.x * velocity.x + velocity.z * velocity.z); + cLib::addCalcPosXZ(&mVelocity, mVec3_c::Zero, 0.05f, 1.0f, 0.2f); + mSpeed = EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z); if (!noSound) { startSound(SE_O_FALL_WATER_S); } mbSubmerged = true; } else { - forwardAccel = -4.f; - forwardMaxSpeed = -40.f; + mAcceleration = -4.f; + mMaxSpeed = -40.f; mbSubmerged = false; if (checkCarryType()) { mStateMgr.changeState(StateID_Grab); @@ -623,15 +623,15 @@ void dAcOtubo_c::fn_272_2670() { } void dAcOtubo_c::attemptDestroy() { - if (mbField_0x9EF && mSph.ChkCoHit() && mSph.GetCoActor()->profile_name == fProfile::B_MG) { + if (mbField_0x9EF && mSph.ChkCoHit() && mSph.GetCoActor()->mProfileName == fProfile::B_MG) { destroy(); return; } - if (mObjAcch.ChkWallHit(nullptr) && sLib::absDiff(mAcchCir.GetWallAngleY(), angle.y) > mAng::deg2short(70.f)) { + if (mObjAcch.ChkWallHit(nullptr) && sLib::absDiff(mAcchCir.GetWallAngleY(), mAngle.y) > mAng::deg2short(70.f)) { attemptDestroyOnWall(); - angle.y = mAcchCir.GetWallAngleY(); - forwardSpeed *= 0.5f; + mAngle.y = mAcchCir.GetWallAngleY(); + mSpeed *= 0.5f; return; } @@ -641,7 +641,7 @@ void dAcOtubo_c::attemptDestroy() { return; } - if (mObjAcch.ChkGndHit() && yoffset >= 0.f && !checkCarryType()) { + if (mObjAcch.ChkGndHit() && mYOffset >= 0.f && !checkCarryType()) { if ((mField_0x9DC < -100.f && !mbField_0x9EE) || fn_272_3660()) { destroy(); return; @@ -649,8 +649,8 @@ void dAcOtubo_c::attemptDestroy() { mField_0x9DC = 0.f; } if (!mObjAcch.ChkGndHit() && mSph.ChkCoHit()) { - if (GetLinkage().mState != 1 && forwardSpeed > 0.f) { - if (mSph.GetCoActor()->unkByteTargetFiRelated == 4) { + if (getLinkage().mState != 1 && mSpeed > 0.f) { + if (mSph.GetCoActor()->mTargetFiRelated == 4) { destroy(); return; } @@ -674,7 +674,7 @@ void dAcOtubo_c::attemptDestroy() { } void dAcOtubo_c::attemptDestroyOnWall(const u32 ¶m0, const bool ¶m1) { - if (param1 && sLib::absDiff(mAcchCir.GetWallAngleY(), angle.y) > mAng::deg2short(70.f) && 15.f < forwardSpeed) { + if (param1 && sLib::absDiff(mAcchCir.GetWallAngleY(), mAngle.y) > mAng::deg2short(70.f) && 15.f < mSpeed) { destroy(); } } @@ -694,16 +694,16 @@ void dAcOtubo_c::fn_272_2E60(const mVec3_c &vel) { mPosition += mStts.GetCcMove(); mField_0x8F0.fn_800051630(); } - forwardSpeed = 0.f; - velocity = mVec3_c::Zero; + mSpeed = 0.f; + mVelocity = mVec3_c::Zero; mbField_0x9F1 = 1; mField_0x9B8 = vel * 2.f; } else if (mSph.ChkTgAtHitType(AT_TYPE_BELLOWS)) { - velocity.x += vel.x * 0.06f; - velocity.y += vel.y * 0.2f; - velocity.z += vel.z * 0.06f; + mVelocity.x += vel.x * 0.06f; + mVelocity.y += vel.y * 0.2f; + mVelocity.z += vel.z * 0.06f; mField_0x9CA = cM::atan2s(vel.x, vel.z); - forwardSpeed = mField_0x9D0 * EGG::Math<f32>::sqrt(velocity.x * velocity.x + velocity.z * velocity.z); + mSpeed = mField_0x9D0 * EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z); } mbMovingForward = 1; @@ -728,7 +728,7 @@ void dAcOtubo_c::fn_272_3020() { } void dAcOtubo_c::addPickupTarget() { - if (cM::isZero(forwardSpeed)) { + if (cM::isZero(mSpeed)) { AttentionManager *ins = AttentionManager::GetInstance(); ins->addPickUpTarget(*this, 120.f); ins->addUnk3Target(*this, 1, 500.f, -200.f, 200.f); @@ -741,18 +741,18 @@ void dAcOtubo_c::adjustAngle() { // ?? f32 mult = 1.f; - velocity.x += pla.mNormal.x * mult; - velocity.z += pla.mNormal.z * mult; + mVelocity.x += pla.mNormal.x * mult; + mVelocity.z += pla.mNormal.z * mult; - velocity.y = -(velocity.x * pla.GetN().x + velocity.z * pla.GetN().z) / pla.GetN().y; - forwardSpeed = nw4r::math::FSqrt(velocity.x * velocity.x + velocity.z * velocity.z); - forwardSpeed = cM::minMaxLimit(forwardSpeed, -30.f, 30.f); + mVelocity.y = -(mVelocity.x * pla.GetN().x + mVelocity.z * pla.GetN().z) / pla.GetN().y; + mSpeed = nw4r::math::FSqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z); + mSpeed = cM::minMaxLimit(mSpeed, -30.f, 30.f); mAng a = mAng::fromVec(pla.GetN()); // Probably mean to be angle from Ey - if (sLib::absDiff(a, angle.y) < mAng::deg2short(90.f)) { - sLib::addCalcAngle(angle.y.ref(), pla.GetAngleY(), 5, 0x71C, 0x100); + if (sLib::absDiff(a, mAngle.y) < mAng::deg2short(90.f)) { + sLib::addCalcAngle(mAngle.y.ref(), pla.GetAngleY(), 5, 0x71C, 0x100); } else { - angle.y = mAng::fromVec(velocity); + mAngle.y = mAng::fromVec(mVelocity); } } @@ -764,17 +764,17 @@ void dAcOtubo_c::adjustSpeed() { step *= gndAngle.cos(); if (gndAngle < mAng::deg2short(5) || - sLib::absDiff(cM::atan2s(pla.mNormal.x, pla.mNormal.z), angle.y) > mAng::deg2short(90)) { - f32 stepSize = yoffset; - sLib::chase(&forwardSpeed, 0.f, step + stepSize * -0.05f); + sLib::absDiff(cM::atan2s(pla.mNormal.x, pla.mNormal.z), mAngle.y) > mAng::deg2short(90)) { + f32 stepSize = mYOffset; + sLib::chase(&mSpeed, 0.f, step + stepSize * -0.05f); } else { if (!mbMovingForward) { step *= -1.f; } - forwardSpeed = cM::minMaxLimit(forwardSpeed + step, 0.f, 30.f); + mSpeed = cM::minMaxLimit(mSpeed + step, 0.f, 30.f); } - mbMovingForward = forwardSpeed > 0.f; + mbMovingForward = mSpeed > 0.f; } bool dAcOtubo_c::checkSlope() { @@ -805,7 +805,7 @@ bool dAcOtubo_c::checkOnLava() { } bool dAcOtubo_c::checkCarryType() const { - const dLinkage_c &linkage = GetLinkage(); + const dLinkage_c &linkage = getLinkage(); return linkage.checkConnection(dLinkage_c::CONNECTION_1) || linkage.checkConnection(dLinkage_c::CONNECTION_7) || linkage.checkConnection(dLinkage_c::CONNECTION_5); } @@ -825,7 +825,7 @@ bool dAcOtubo_c::fn_272_38C0() { bool dAcOtubo_c::checkOnLog_0xE4E() const { if (mObjAcch.ChkGndHit() && dBgS::GetInstance()->ChkMoveBG(mObjAcch.mGnd, true)) { const dAcObjBase_c *obj = dBgS::GetInstance()->GetActorPointer(mObjAcch.mGnd); - if (obj && obj->profile_name == fProfile::OBJ_LOG) { + if (obj && obj->mProfileName == fProfile::OBJ_LOG) { return static_cast<const dAcOlog_c *>(obj)->getField_0xE4E() >= 4; } } @@ -833,13 +833,13 @@ bool dAcOtubo_c::checkOnLog_0xE4E() const { } bool dAcOtubo_c::checkRollHitMaybe() { - if (15.f < forwardSpeed) { + if (15.f < mSpeed) { return true; } if (mObjAcch.ChkWallHit(nullptr)) { mVec3_c a = mVec3_c::Ez * 60.f; mVec3_c start = getCenter(); - a.rotY(mAng::fromVec(velocity)); + a.rotY(mAng::fromVec(mVelocity)); mVec3_c end = start + a; if (dBgS_ObjLinChk::LineCross(&start, &end, this)) { return false; @@ -849,7 +849,7 @@ bool dAcOtubo_c::checkRollHitMaybe() { } void dAcOtubo_c::playRollSound() { - if (!(forwardSpeed > 0.f)) { + if (!(mSpeed > 0.f)) { return; } @@ -857,7 +857,7 @@ void dAcOtubo_c::playRollSound() { return; } - holdSoundWithFloatParam(SE_Tubo_ROLL_LV, forwardSpeed); + holdSoundWithFloatParam(SE_Tubo_ROLL_LV, mSpeed); } void float_order() { diff --git a/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp b/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp index b41e69e9..7ae5e2a4 100644 --- a/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp +++ b/src/REL/d/a/obj/d_a_obj_tumble_weed.cpp @@ -62,8 +62,8 @@ int dAcOTumbleWeed_c::actorCreate() { mDowsingTarget.initialize(DowsingTarget::SLOT_TREASURE, 0, nullptr, 0.0f); mDowsingTarget.doRegister(); - forwardAccel = -2.f; - forwardMaxSpeed = -40.f; + mAcceleration = -2.f; + mMaxSpeed = -40.f; mField_0x974 = 0.0f; mField_0x98B = true; @@ -80,7 +80,7 @@ int dAcOTumbleWeed_c::actorCreate() { mStateMgr.changeState(StateID_Wait); - boundingBox.Set(mVec3_c(-50.f, -20.f, -50.f), mVec3_c(50.f, 60.f, 50.f)); + mBoundingBox.Set(mVec3_c(-50.f, -20.f, -50.f), mVec3_c(50.f, 60.f, 50.f)); return SUCCEEDED; } @@ -94,8 +94,8 @@ int dAcOTumbleWeed_c::doDelete() { } int dAcOTumbleWeed_c::actorExecute() { - if (!mField_0x98C && !isStopped()) { - mField_0x968 = velocity; + if (!mField_0x98C && !checkStopped()) { + mField_0x968 = mVelocity; mField_0x968.y = 0.0f; mField_0x968.normalize(); mField_0x98C = true; @@ -108,7 +108,7 @@ int dAcOTumbleWeed_c::actorExecute() { dLightEnv_c::GetInstance().setWind(mField_0x968, mField_0x980); calcVelocity(); - mPosition += velocity; + mPosition += mVelocity; mPosition += mStts.GetCcMove(); mObjAcch.CrrPos(*dBgS::GetInstance()); @@ -177,15 +177,15 @@ void dAcOTumbleWeed_c::executeState_Wait() { return; } - velocity.y = 0.f; + mVelocity.y = 0.f; mField_0x974 = 0.f; if (checkSlope()) { mStateMgr.changeState(StateID_Slope); } else { adjustSpeed(); - if (forwardSpeed < 0.1f) { + if (mSpeed < 0.1f) { mField_0x98B = false; - sLib::chase(&forwardSpeed, 0.f, 0.05f); + sLib::chase(&mSpeed, 0.f, 0.05f); } } } @@ -204,7 +204,7 @@ void dAcOTumbleWeed_c::executeState_Slope() { return; } - velocity.y = 0.f; + mVelocity.y = 0.f; adjustAngle(); adjustSpeed(); if (!checkSlope()) { @@ -215,7 +215,7 @@ void dAcOTumbleWeed_c::executeState_Slope() { void dAcOTumbleWeed_c::finalizeState_Slope() {} bool dAcOTumbleWeed_c::checkBreak() { - if (mObjAcch.ChkWallHit(nullptr) && forwardSpeed > 5.f) { + if (mObjAcch.ChkWallHit(nullptr) && mSpeed > 5.f) { return true; } @@ -270,10 +270,10 @@ void dAcOTumbleWeed_c::doBreak() { void dAcOTumbleWeed_c::calcMatrix() { if (mField_0x98B) { - f32 vel_mag = VEC3Len(velocity); + f32 vel_mag = VEC3Len(mVelocity); f32 f1 = mAng(vel_mag * (mField_0x978 + 200.f)).radian(); f32 f2 = mAng(vel_mag * 182.0f * 0.2f).radian(); - f32 f0 = mAng(angle.y - mRotation.y).radian(); + f32 f0 = mAng(mAngle.y - mRotation.y).radian(); mQuat_c q0, q1, q2, q3; q1.setAxisRotation(mVec3_c::Ey, f0); @@ -297,8 +297,8 @@ void dAcOTumbleWeed_c::calcMatrix() { void dAcOTumbleWeed_c::adjustAngle() { cM3dGPla pla; dBgS::GetInstance()->GetTriPla(mObjAcch.mGnd, &pla); - mVec3_c vel = velocity; // ok? - angle.y = mAng::fromVec(velocity); + mVec3_c vel = mVelocity; // ok? + mAngle.y = mAng::fromVec(mVelocity); } void dAcOTumbleWeed_c::adjustSpeed() { @@ -320,27 +320,27 @@ void dAcOTumbleWeed_c::adjustSpeed() { // Flat Ground or not in the direction of the slope // Slows down if (gndAngle < mAng::deg2short(1) || - sLib::absDiff(cM::atan2s(pla.GetN().x, pla.GetN().z), GetAngle().y) > mAng::deg2short(90)) { - sLib::chase(&forwardSpeed, mSpeedTarget, step); + sLib::absDiff(cM::atan2s(pla.GetN().x, pla.GetN().z), getAngle().y) > mAng::deg2short(90)) { + sLib::chase(&mSpeed, mSpeedTarget, step); } // Sloped Ground and in the direction of the slope // Speeds up else { - forwardSpeed = cM::minMaxLimit(forwardSpeed + step, mSpeedTarget, mSpeedTarget + 5.0f); + mSpeed = cM::minMaxLimit(mSpeed + step, mSpeedTarget, mSpeedTarget + 5.0f); } } void dAcOTumbleWeed_c::tumbleBounceMaybe() { - velocity.y *= -0.75f; - forwardSpeed *= 0.9f; + mVelocity.y *= -0.75f; + mSpeed *= 0.9f; - if (forwardSpeed < 15.f) { - forwardSpeed = mSpeedTarget; + if (mSpeed < 15.f) { + mSpeed = mSpeedTarget; } mbOnGround = false; - if (velocity.y < 5.f) { - velocity.y = 0.f; + if (mVelocity.y < 5.f) { + mVelocity.y = 0.f; mbOnGround = true; } } @@ -361,11 +361,11 @@ void dAcOTumbleWeed_c::adjustTimeScale() { void dAcOTumbleWeed_c::adjustTumble(const mVec3_c &dir) { mField_0x98B = true; - velocity.x += dir.x; - velocity.z += dir.z; + mVelocity.x += dir.x; + mVelocity.z += dir.z; - forwardSpeed = mField_0x97C * EGG::Math<f32>::sqrt(velocity.x * velocity.x + velocity.z * velocity.z); - angle.y = mAng::fromVec(dir); + mSpeed = mField_0x97C * EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z); + mAngle.y = mAng::fromVec(dir); } void dAcOTumbleWeed_c::setWind(const mVec3_c &wind) { @@ -375,8 +375,8 @@ void dAcOTumbleWeed_c::setWind(const mVec3_c &wind) { void dAcOTumbleWeed_c::calcWind() { if (!isWindStop() && sLib::calcTimer(&mWindTimer) == 0) { - velocity.y = cM::rndFX(3.0f) + 15.f; - forwardSpeed = cM::rndFX(5.0f) + 15.f; + mVelocity.y = cM::rndFX(3.0f) + 15.f; + mSpeed = cM::rndFX(5.0f) + 15.f; mWind = mVec3_c::Zero; mField_0x980 = 0.f; diff --git a/src/REL/d/a/obj/d_a_obj_under_cloud.cpp b/src/REL/d/a/obj/d_a_obj_under_cloud.cpp index 031de641..0af63227 100644 --- a/src/REL/d/a/obj/d_a_obj_under_cloud.cpp +++ b/src/REL/d/a/obj/d_a_obj_under_cloud.cpp @@ -29,7 +29,7 @@ int dAcOunderCloud_c::create() { updateMatrix(); mMdl.setLocalMtx(mWorldMtx); mMdl.setPriorityDraw(0x1C, 9); - boundingBox.Set(mVec3_c(-550000.0f, -30000.0f, -500000.0f), mVec3_c(500000.0f, -10000.0f, 500000.0f)); + mBoundingBox.Set(mVec3_c(-550000.0f, -30000.0f, -500000.0f), mVec3_c(500000.0f, -10000.0f, 500000.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_underground_switch.cpp b/src/REL/d/a/obj/d_a_obj_underground_switch.cpp index 787e84ac..2424d2d1 100644 --- a/src/REL/d/a/obj/d_a_obj_underground_switch.cpp +++ b/src/REL/d/a/obj/d_a_obj_underground_switch.cpp @@ -57,7 +57,7 @@ int dAcOUgSwitch_c::create() { } else { mStateMgr.changeState(StateID_On); } - boundingBox.Set(mVec3_c(-50.0f, -20.0f, -50.0f), mVec3_c(50.0f, 20.0f, 50.0f)); + mBoundingBox.Set(mVec3_c(-50.0f, -20.0f, -50.0f), mVec3_c(50.0f, 20.0f, 50.0f)); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp b/src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp index 1a08e05d..2f0b48d3 100644 --- a/src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp +++ b/src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp @@ -41,7 +41,7 @@ int dAcOutaDemoPedest_c::create() { mMdl.setPriorityDraw(0x1C, 9); mVec3_c l, u; mMdl.getBounds(&l, &u); - boundingBox.Set(l, u); + mBoundingBox.Set(l, u); return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_utajima.cpp b/src/REL/d/a/obj/d_a_obj_utajima.cpp index 5dff4b03..d25bacc9 100644 --- a/src/REL/d/a/obj/d_a_obj_utajima.cpp +++ b/src/REL/d/a/obj/d_a_obj_utajima.cpp @@ -61,7 +61,7 @@ int dAcOutajima_c::create() { mVec3_c min; mVec3_c max; mMdls[0].getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); mCullingDistance = 500000.0f; mBgW.SetRideCallback(rideCallback); diff --git a/src/REL/d/a/obj/d_a_obj_utajima_island.cpp b/src/REL/d/a/obj/d_a_obj_utajima_island.cpp index 490fa7ab..b38a3cac 100644 --- a/src/REL/d/a/obj/d_a_obj_utajima_island.cpp +++ b/src/REL/d/a/obj/d_a_obj_utajima_island.cpp @@ -61,7 +61,7 @@ int dAcOutajimaIsland_c::actorCreate() { mVec3_c min; mVec3_c max; mMdl.getBounds(&min, &max); - boundingBox.Set(min, max); + mBoundingBox.Set(min, max); mCullingDistance = 500000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_utajima_lv2.cpp b/src/REL/d/a/obj/d_a_obj_utajima_lv2.cpp index 2d2523db..39906b7c 100644 --- a/src/REL/d/a/obj/d_a_obj_utajima_lv2.cpp +++ b/src/REL/d/a/obj/d_a_obj_utajima_lv2.cpp @@ -31,7 +31,7 @@ int dAcOutajimaLv2_c::create() { dBgS::GetInstance()->Regist(&mBgW, this); dBgS::GetInstance()->RegistBg(&mBgW, this); mMdl.setPriorityDraw(0x1C, 9); - boundingBox.Set(mVec3_c(-2800.0f, -4000.0f, -2600.0f), mVec3_c(2600.0f, 1900.0f, 2700.0f)); + mBoundingBox.Set(mVec3_c(-2800.0f, -4000.0f, -2600.0f), mVec3_c(2600.0f, 1900.0f, 2700.0f)); mCullingDistance = 500000.0f; return SUCCEEDED; } diff --git a/src/REL/d/a/obj/d_a_obj_water_shield.cpp b/src/REL/d/a/obj/d_a_obj_water_shield.cpp index 564ed57d..2ae69e37 100644 --- a/src/REL/d/a/obj/d_a_obj_water_shield.cpp +++ b/src/REL/d/a/obj/d_a_obj_water_shield.cpp @@ -31,7 +31,7 @@ int dAcOwaterShield_c::create() { mMdl.setPriorityDraw(0x1C, 0x9); - boundingBox.Set(mVec3_c(-12000.0f, -2000.0f, -14000.0f), mVec3_c(12000.0f, 11000.0f, 12000.0f)); + mBoundingBox.Set(mVec3_c(-12000.0f, -2000.0f, -14000.0f), mVec3_c(12000.0f, 11000.0f, 12000.0f)); return SUCCEEDED; } diff --git a/src/REL/d/t/d_t_action.cpp b/src/REL/d/t/d_t_action.cpp index 874ee3d5..0bab0b68 100644 --- a/src/REL/d/t/d_t_action.cpp +++ b/src/REL/d/t/d_t_action.cpp @@ -50,7 +50,7 @@ int dTgAction_c::actorExecute() { if (pObj == nullptr) { break; } - if (pObj->profile_name == fProfile::BOMB) { + if (pObj->mProfileName == fProfile::BOMB) { if (checkIfVec3fInMatrix(mActiveMtx, pObj->getPosition())) { reinterpret_cast<dAcBomb_c *>(pObj)->On_0xA3C(0x20000000); } diff --git a/src/REL/d/t/d_t_reaction.cpp b/src/REL/d/t/d_t_reaction.cpp index 47b26a31..26918ab6 100644 --- a/src/REL/d/t/d_t_reaction.cpp +++ b/src/REL/d/t/d_t_reaction.cpp @@ -47,7 +47,7 @@ int dTgReaction_c::create() { } field_0x4E0 = mRotation.x & 0xFF; - mRotation.x = angle.x = 0; + mRotation.x = mAngle.x = 0; if (field_0x4E0 < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, field_0x4E0)) { return FAILED; diff --git a/src/d/a/d_a_base.cpp b/src/d/a/d_a_base.cpp index 8c8bf58b..922bfda5 100644 --- a/src/d/a/d_a_base.cpp +++ b/src/d/a/d_a_base.cpp @@ -77,10 +77,10 @@ dAcBase_c::dAcBase_c() setActorRef(s_Create_Parent); } - fProfile::fActorProfile_c *profile = (fProfile::fActorProfile_c *)((*fProfile::sProfileList)[profile_name]); + fProfile::fActorProfile_c *profile = (fProfile::fActorProfile_c *)((*fProfile::sProfileList)[mProfileName]); mActorProperties = profile->mActorProperties; if (mpActorInfo == nullptr) { - mpActorInfo = getActorInfoByProfileAndSubtype(profile_name, mActorSubtype); + mpActorInfo = getActorInfoByProfileAndSubtype(mProfileName, mActorSubtype); } someStr[0] = '\0'; } @@ -194,7 +194,7 @@ int dAcBase_c::preDelete() { } if (!checkActorProperty(AC_PROP_0x800) && checkActorProperty(AC_PROP_0x10000000) && - fBase_c::getConnectParent()->lifecycle_state != TO_BE_DELETED) { + fBase_c::getConnectParent()->mLifecycleState != TO_BE_DELETED) { if (itemDroppingAndGivingRelated(nullptr, 0) != 0) { setEnemyDefeatFlag(); } @@ -382,9 +382,9 @@ dAcBase_c *dAcBase_c::findActor(char *objName, dAcBase_c *parent) { FORCE_INLINE dAcBase_c *findActor(dAcBase_c *parent) { dAcBase_c *foundActor; if (!parent) { - foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(dBase_c::ACTOR, nullptr); - } else if (parent->group_type == 2) { - foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(dBase_c::ACTOR, parent); + foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(fBase_c::ACTOR, nullptr); + } else if (parent->mGroupType == fBase_c::ACTOR) { + foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(fBase_c::ACTOR, parent); } else { foundActor = nullptr; } @@ -498,7 +498,7 @@ f32 dAcBase_c::getSquareDistToPlayer() { // Some weirdness with the float registers being used // 8002d4b0 void dAcBase_c::updateRoomId(f32 yOffset) { - if (getConnectParent()->profile_name != fProfile::ROOM) { + if (getConnectParent()->mProfileName != fProfile::ROOM) { mVec3_c actorPos(mPosition.x, mPosition.y + yOffset, mPosition.z); if (dBgS_ObjGndChk::CheckPos(actorPos)) { @@ -750,8 +750,8 @@ void dAcBase_c::roundAngleToNearest90(s16 *dst_angle, s16 *src_angle) { void dAcBase_c::incrementKillCounter() { dAcObjBase_c *object = (dAcObjBase_c *)this; // Probably wrong - if (group_type == ACTOR && object->unkByteTargetFiRelated == 1) { - int killCounterId = object->targetFiTextId; + if (mGroupType == ACTOR && object->mTargetFiRelated == 1) { + int killCounterId = object->mTargetFiTextID; if (killCounterId < 91 && (killCounterId & 0x300) == 0) { FileManager *fileMgr = FileManager::GetInstance(); diff --git a/src/d/a/d_a_insect.cpp b/src/d/a/d_a_insect.cpp index 995b2077..0360de38 100644 --- a/src/d/a/d_a_insect.cpp +++ b/src/d/a/d_a_insect.cpp @@ -30,7 +30,7 @@ bool dAcOInsect_c::checkForLinkScare() { mLinkNearby = 1; return true; } - } else if (dAcPy_c::LINK->forwardSpeed > 1.f) { + } else if (dAcPy_c::LINK->mSpeed > 1.f) { if (dAcPy_c::LINK->getDistanceTo(mPosition) < 30.f) { mLinkNearby = 1; return true; @@ -62,7 +62,7 @@ bool dAcOInsect_c::isLinkUsingBugNet() { s32 dAcOInsect_c::getLinkSpeedLevel() { if (dAcPy_c::LINK != nullptr) { - f32 speed = fabsf(dAcPy_c::LINK->forwardSpeed); + f32 speed = fabsf(dAcPy_c::LINK->mSpeed); if (speed < 0.1f) { return 0; } else if (speed < 10.0f) { @@ -139,9 +139,9 @@ void dAcOInsect_c::addAttentionTarget() { } void dAcOInsect_c::preAttention() { - poscopy2 = mPosition; - poscopy2.y += 20.f; - poscopy3 = poscopy2; + mPositionCopy2 = mPosition; + mPositionCopy2.y += 20.f; + mPositionCopy3 = mPositionCopy2; } f32 dAcOInsect_c::dAcOInsect_0x80() { @@ -200,15 +200,15 @@ bool dAcOInsect_c::fn_8018FAA0() { } bool dAcOInsect_c::fn_8018FAD0() { - f32 speed = fabsf(forwardSpeed); + f32 speed = fabsf(mSpeed); if (cM::isLessThanZero(speed)) { fn_8018FDF0(mPlane_0x3A8.GetN()); return true; } else { - f32 clampSpeed = speed < 5.0f ? forwardSpeed > 0.f ? forwardSpeed : -5.f : 5.f; + f32 clampSpeed = speed < 5.0f ? mSpeed > 0.f ? mSpeed : -5.f : 5.f; mVec3_c pos0 = mPosition + field_0x360; - mVec3_c pos1 = pos0 + field_0x36C * forwardSpeed; + mVec3_c pos1 = pos0 + field_0x36C * mSpeed; int linType = fn_801900B0(pos0, pos1); field_0x410[0] = pos0; field_0x434[0] = pos1; diff --git a/src/d/a/d_a_item.cpp b/src/d/a/d_a_item.cpp index 56ee740f..52b14820 100644 --- a/src/d/a/d_a_item.cpp +++ b/src/d/a/d_a_item.cpp @@ -320,9 +320,19 @@ STATE_DEFINE(dAcItem_c, WaitTurnOff); STATE_DEFINE(dAcItem_c, WaitSacredDewGetEffect); dAcItem_c::dAcItem_c() - : mStateMgr(*this, sStateID::null), mEff_0x8F4(this), mEff_0x928(this), mEff_0x95C(this), mEff_0x990(this), - mEff_0x9C4(this), mEff_0x9F8(this), mEff_0xA2C(this), mEff_0xA60(this), mNode(this), - mEventRelated(*this, nullptr), mDowsingTarget(this, DowsingTarget::SLOT_NONE), mItemQueuePrev(nullptr), + : mStateMgr(*this, sStateID::null), + mEff_0x8F4(this), + mEff_0x928(this), + mEff_0x95C(this), + mEff_0x990(this), + mEff_0x9C4(this), + mEff_0x9F8(this), + mEff_0xA2C(this), + mEff_0xA60(this), + mNode(this), + mEventRelated(*this, nullptr), + mDowsingTarget(this, DowsingTarget::SLOT_NONE), + mItemQueuePrev(nullptr), mItemQueueNext(nullptr) { mField_0xCD8 = 1.0f; mBaseScale = 1.0f; @@ -348,7 +358,7 @@ dAcItem_c::dAcItem_c() mField_0xD66 = 0; sItemList.append(&mNode); - unkByteTargetFiRelated = 3; + mTargetFiRelated = 3; } dAcItem_c::~dAcItem_c() { delete mField_0xB3C; diff --git a/src/d/a/d_a_salbage_obj.cpp b/src/d/a/d_a_salbage_obj.cpp index cadf6137..ceedf95c 100644 --- a/src/d/a/d_a_salbage_obj.cpp +++ b/src/d/a/d_a_salbage_obj.cpp @@ -51,7 +51,7 @@ void dSalvageIfObj_c::doDemoThrow() { int dAcSalbageObj_c::actorExecute() { executeInternal(); calcVelocity(); - mPosition += velocity; + mPosition += mVelocity; mPosition += mStts.GetCcMove(); if (isInStateWait()) { updateCc(); @@ -155,9 +155,9 @@ void dAcSalbageObj_c::initSalbageObj() { } else { switch (mBehavior) { case BEHAVIOR_CARRY: { - forwardSpeed = 0.0f; - velocity.set(0.0f, 0.0f, 0.0f); - forwardAccel = 0.0f; + mSpeed = 0.0f; + mVelocity.set(0.0f, 0.0f, 0.0f); + mAcceleration = 0.0f; mSalvageIf.setHidden(); if (dSalvageMgr_c::sInstance->getCurrentSalvageObjId() != mSalvageIf.getSalvageObjId()) { mStateMgr.changeState(StateID_Kill); @@ -169,9 +169,9 @@ void dAcSalbageObj_c::initSalbageObj() { break; } case BEHAVIOR_FLY: { - forwardSpeed = 0.0f; - velocity.set(0.0f, 0.0f, 0.0f); - forwardAccel = 0.0f; + mSpeed = 0.0f; + mVelocity.set(0.0f, 0.0f, 0.0f); + mAcceleration = 0.0f; mStateMgr.changeState(StateID_Fly); break; } @@ -181,12 +181,12 @@ void dAcSalbageObj_c::initSalbageObj() { return; } else { mBehavior = BEHAVIOR_STATIONARY; - forwardAccel = -1.0f; - forwardMaxSpeed = -40.0f; + mAcceleration = -1.0f; + mMaxSpeed = -40.0f; initCcAndBg(); - forwardSpeed = 0.0f; - forwardAccel = 0.0f; - velocity.set(0.0f, 0.0f, 0.0f); + mSpeed = 0.0f; + mAcceleration = 0.0f; + mVelocity.set(0.0f, 0.0f, 0.0f); mStateMgr.changeState(StateID_Wait); } break; @@ -301,10 +301,10 @@ void dAcSalbageObj_c::updateMdl() { } f32 scale = mScale.x; - poscopy3 = mPosition; - poscopy3.y += getPoscopy3YOffset() * scale; - poscopy2 = mPosition; - poscopy2.y += getPoscopy2YOffset() * scale; + mPositionCopy3 = mPosition; + mPositionCopy3.y += getPoscopy3YOffset() * scale; + mPositionCopy2 = mPosition; + mPositionCopy2.y += getPoscopy2YOffset() * scale; } void dAcSalbageObj_c::loadBehaviorFromParams() { @@ -367,10 +367,10 @@ void dAcSalbageObj_c::initializeState_DemoThrow() { mRotation.y = result.atan2sX_Z(); mRotation.x = -cM::atan2s(result.y, result.absXZ()); mRotation.z = field_0x904; - angle.x = 0; - angle.y = mRotation.y; - angle.z = 0; - forwardMaxSpeed = -40.0f; + mAngle.x = 0; + mAngle.y = mRotation.y; + mAngle.z = 0; + mMaxSpeed = -40.0f; mBgObjAcch.Set(this, 1, &mBgAcchCir); mBgObjAcch.SetWaterNone(); mBgObjAcch.SetRoofNone(); diff --git a/src/d/a/npc/d_a_npc.cpp b/src/d/a/npc/d_a_npc.cpp index d9116af4..bab54cd3 100644 --- a/src/d/a/npc/d_a_npc.cpp +++ b/src/d/a/npc/d_a_npc.cpp @@ -41,9 +41,9 @@ bool dFlowNpc_c::handleEventInternal(const MsbFlowInfo *element) { extract2xU16Params(element, &exitId, &trial); if (field_0x10) { dAcBase_c *ac = EventManager::getMainActorInEvent(); - if (ac != nullptr && ac->profile_name == fProfile::NPC_TKE) { + if (ac != nullptr && ac->mProfileName == fProfile::NPC_TKE) { static_cast<daNpcTke_c *>(ac)->setFinishFlags(); - } else if (mpOwner->profile_name == fProfile::NPC_TKE) { + } else if (mpOwner->mProfileName == fProfile::NPC_TKE) { static_cast<daNpcTke_c *>(mpOwner)->setFinishFlags(); } } diff --git a/src/d/a/obj/d_a_obj_arrow.cpp b/src/d/a/obj/d_a_obj_arrow.cpp index 56bf272f..ae95ba89 100644 --- a/src/d/a/obj/d_a_obj_arrow.cpp +++ b/src/d/a/obj/d_a_obj_arrow.cpp @@ -79,7 +79,7 @@ int dAcArrow_c::create() { mStateMgr.changeState(StateID_Wait); } - boundingBox.Set(mVec3_c(-6.0f, -6.0f, 0.0f), mVec3_c(6.0f, 6.0f, 110.0f)); + mBoundingBox.Set(mVec3_c(-6.0f, -6.0f, 0.0f), mVec3_c(6.0f, 6.0f, 110.0f)); field_0x684 = -1; field_0x68A = 300; f32 rnd = cM::rndF(20.0f); diff --git a/src/d/a/obj/d_a_obj_boomerang.cpp b/src/d/a/obj/d_a_obj_boomerang.cpp index 14e3a81a..dbc72dfd 100644 --- a/src/d/a/obj/d_a_obj_boomerang.cpp +++ b/src/d/a/obj/d_a_obj_boomerang.cpp @@ -59,7 +59,7 @@ void dAcBoomerang_c::areaCallback(mVec3_c *param1, u32 param2) { setChrAnimation(dAcBoomerang_c::RB_CUT); } void dAcBoomerang_c::atHitCallback(cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB) { - if (i_actorB != nullptr && i_actorB->GetLinkage().checkFlag(0x80)) { + if (i_actorB != nullptr && i_actorB->getLinkage().checkFlag(0x80)) { // Check if beetle can grab things if (dAcPy_c::hasBeetleVariantOrBetter(HOOK_BEETLE)) { // If beetle is already holding the object or is stationary @@ -71,7 +71,7 @@ void dAcBoomerang_c::atHitCallback(cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, if (tryGrabObject(i_actorB)) { setChrAnimation(RB_HOLD); mAnmChr[BOOMERANG_ANIM_PINCERS].setRate(0.f); - mAnmChr[BOOMERANG_ANIM_PINCERS].setFrameOnly(i_actorB->GetLinkage().field_0x24); + mAnmChr[BOOMERANG_ANIM_PINCERS].setFrameOnly(i_actorB->getLinkage().field_0x24); return; } } @@ -86,10 +86,10 @@ void dAcBoomerang_c::atHitCallback(cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, field_0x8D8.y = 0.f; if (cM::isZero(field_0x8D8.normalize())) { - field_0x8D8.set(-angle.y.sin(), 0.f, -angle.y.cos()); + field_0x8D8.set(-mAngle.y.sin(), 0.f, -mAngle.y.cos()); } - field_0x8D8 *= velocity.absXZ(); - field_0x8D8.y = -velocity.y; + field_0x8D8 *= mVelocity.absXZ(); + field_0x8D8.y = -mVelocity.y; field_0x8D8.normalize(); @@ -292,7 +292,7 @@ const dAcBoomerang_c::ChrAnimation_t dAcBoomerang_c::sChrAnims[dAcBoomerang_c::R bool dAcBoomerang_c::tryGrabObject(dAcObjBase_c *pObj) { dAcPy_c *player = dAcPy_c::GetLink2(); - if (checkField_0x8CC(FLAG_CONTROLLABLE) && GetLinkage().checkFlag(0x80)) {} + if (checkField_0x8CC(FLAG_CONTROLLABLE) && getLinkage().checkFlag(0x80)) {} } // ... @@ -370,7 +370,7 @@ void dAcBoomerang_c::initializeState_Wait() { dAcPy_c::GetLink2()->onModelUpdateFlag(dAcPy_c::UPDATE_MODEL_BEETLE); } void dAcBoomerang_c::executeState_Wait() { - forwardSpeed = 0.f; + mSpeed = 0.f; placeOnArm(); if (checkField_0x8CC(FLAG_REQUEST_MOVE)) { mStateMgr.changeState(StateID_Move); @@ -388,7 +388,7 @@ void dAcBoomerang_c::initializeState_ReturnWait() { placeOnArm(); } void dAcBoomerang_c::executeState_ReturnWait() { - forwardSpeed = 0.f; + mSpeed = 0.f; placeOnArm(); if (mAnmChr[BOOMERANG_ANIM_PINCERS].isStop() || !dAcPy_c::GetLink2()->checkActionFlagsCont(0x10)) { startSound(SE_BE_CATCH); @@ -409,7 +409,7 @@ void dAcBoomerang_c::initializeState_Move() { field_0x8C8 = 0; dAcPy_c *player = dAcPy_c::GetLink2(); - forwardSpeed = player->getBeetleNormalSpeed(); + mSpeed = player->getBeetleNormalSpeed(); mSph0.ClrAtHit(); mSph1.ClrTgHit(); @@ -420,10 +420,10 @@ void dAcBoomerang_c::initializeState_Move() { unsetField_0x8CC(FLAG_REQUEST_MOVE | FLAG_WING_EFFECT_ACTIVE | FLAG_0x10000); setField_0x8CC(FLAG_CONTROLLABLE | FLAG_0x80000); - angle.x = 2000 - player->vt_0x198(); + mAngle.x = 2000 - player->vt_0x198(); - mRotation.x.set(-angle.x); - mRotation.y.set(angle.y); + mRotation.x.set(-mAngle.x); + mRotation.y.set(mAngle.y); mRotation.z.set(0); field_0x8B2 = 0; @@ -435,9 +435,9 @@ void dAcBoomerang_c::initializeState_Move() { field_0x8B8 = daPlayerActBase_c::fn_8005BAA0(); // TODO regswap - field_0x8BE = angle.x - dPad::ex_c::m_current_ex->mMPLS.getVerticalAngle(); + field_0x8BE = mAngle.x - dPad::ex_c::m_current_ex->mMPLS.getVerticalAngle(); - field_0x8E4.fromXY(angle.x, angle.y, forwardSpeed); + field_0x8E4.fromXY(mAngle.x, mAngle.y, mSpeed); startSound(SE_BE_THROW); dJEffManager_c::spawnUIEffect(PARTICLE_RESOURCE_ID_MAPPING_3_, mVec3_c::Zero, nullptr, nullptr, nullptr, nullptr); @@ -528,14 +528,14 @@ int dAcBoomerang_c::actorExecute() { setRoomId(); mMdl.calc(false); - mMdl.getNodeWorldMtxMultVecZero(0, poscopy2); - poscopy3 = poscopy2; + mMdl.getNodeWorldMtxMultVecZero(0, mPositionCopy2); + mPositionCopy3 = mPositionCopy2; if (checkField_0x8CC(FLAG_WING_EFFECT_ACTIVE)) { mEff0.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_6_, mWorldMtx, nullptr, nullptr); mEff1.setTransform(mWorldMtx); - f32 ang = field_0x8E4.angle(velocity); + f32 ang = field_0x8E4.angle(mVelocity); ang = 10.f - mAng::fromRad(ang) * (7.f / 256.f); ang = nw4r::ut::Max(ang, 3.f); mEff1.setAwayFromCenterSpeed(ang); diff --git a/src/d/a/obj/d_a_obj_fairy.cpp b/src/d/a/obj/d_a_obj_fairy.cpp index 5de9133a..fe12be21 100644 --- a/src/d/a/obj/d_a_obj_fairy.cpp +++ b/src/d/a/obj/d_a_obj_fairy.cpp @@ -27,7 +27,7 @@ int dAcObjFairy_c::create() { mStateMgr.changeState(StateID_CureStart); mStateMgr.changeState(StateID_Wait); mModel.getModel().setPriorityDraw(0x7F, 0x7F); - boundingBox.Set(mVec3_c(-20.0f, -200.0f, -20.0f), mVec3_c(20.0f, 20.0f, 20.0f)); + mBoundingBox.Set(mVec3_c(-20.0f, -200.0f, -20.0f), mVec3_c(20.0f, 20.0f, 20.0f)); return SUCCEEDED; } @@ -96,7 +96,7 @@ void dAcObjFairy_c::executeState_CatchDemo() { } void dAcObjFairy_c::finalizeState_CatchDemo() { field_0xB89 = 0; - clearObjectProperty(0x200); + unsetObjectProperty(0x200); } bool dAcObjFairy_c::shouldAvoidLink() const { @@ -104,7 +104,7 @@ bool dAcObjFairy_c::shouldAvoidLink() const { if (dAcPy_c::LINK->isUsingBugnet()) { mVec3_c dist = dAcPy_c::LINK->getBugNetPos() - mPosition; bool isClose = false; - if (dist.mag() < 100.0f && velocity.dot(dist) > 0.0f) { + if (dist.mag() < 100.0f && mVelocity.dot(dist) > 0.0f) { isClose = true; } diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp index 353c0524..6bd51b37 100644 --- a/src/d/a/obj/d_a_obj_switch.cpp +++ b/src/d/a/obj/d_a_obj_switch.cpp @@ -33,8 +33,8 @@ void dAcOswMdlCallback_c::timingB(u32 nodeId, nw4r::g3d::WorldMtxManip *manip, n } static bool isPushableBlock(dAcBase_c *actor) { - return actor->isActorPlayer() || actor->profile_name == fProfile::OBJ_PUSH_BLOCK || - actor->profile_name == fProfile::OBJ_KIBAKO; + return actor->isActorPlayer() || actor->mProfileName == fProfile::OBJ_PUSH_BLOCK || + actor->mProfileName == fProfile::OBJ_KIBAKO; } void dAcOsw_c::rideCallback(dBgW *unknown, dAcObjBase_c *actor, dAcObjBase_c *interactor) { @@ -49,12 +49,12 @@ void dAcOsw_c::rideCallback(dBgW *unknown, dAcObjBase_c *actor, dAcObjBase_c *in return; } if (link->checkFlags0x340(0x800000) && - !(link->getCurrentCarriedActor() && link->getCurrentCarriedActor()->GetLinkage().checkFlag(0x04))) { + !(link->getCurrentCarriedActor() && link->getCurrentCarriedActor()->getLinkage().checkFlag(0x04))) { return; } } - if (interactor->GetLinkage().checkState(dLinkage_c::STATE_ACTIVE)) { + if (interactor->getLinkage().checkState(dLinkage_c::STATE_ACTIVE)) { return; } @@ -107,7 +107,7 @@ int dAcOsw_c::actorCreate() { } else { mStateMgr.changeState(StateID_OnWait); } - boundingBox.Set(mVec3_c(-90.0f, -10.0f, -90.0f), mVec3_c(90.0f, 70.0f, 90.0f)); + mBoundingBox.Set(mVec3_c(-90.0f, -10.0f, -90.0f), mVec3_c(90.0f, 70.0f, 90.0f)); return SUCCEEDED; } diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp index 9863b382..c61e6886 100644 --- a/src/d/a/obj/d_a_obj_tbox.cpp +++ b/src/d/a/obj/d_a_obj_tbox.cpp @@ -823,7 +823,7 @@ dAcTbox_c::dAcTbox_c() field_0x120E = 0; mDoObstructedCheck = false; sTboxActorList.append(&mTboxListNode); - unkByteTargetFiRelated = 2; + mTargetFiRelated = 2; } dAcTbox_c::~dAcTbox_c() { @@ -1125,22 +1125,22 @@ int dAcTbox_c::create() { case NORMAL: { static mVec3_c bbLo = mVec3_c(-65.0f, 0.0f, -100.0f); static mVec3_c bbUp = mVec3_c(65.0f, 150.0f, 45.0f); - boundingBox.Set(bbLo, bbUp); + mBoundingBox.Set(bbLo, bbUp); } break; case SMALL: { static mVec3_c bbLo = mVec3_c(-38.0f, 0.0f, -70.0f); static mVec3_c bbUp = mVec3_c(38.0f, 110.0f, 35.0f); - boundingBox.Set(bbLo, bbUp); + mBoundingBox.Set(bbLo, bbUp); } break; case BOSS: { static mVec3_c bbLo = mVec3_c(-90.0f, 0.0f, -140.0f); static mVec3_c bbUp = mVec3_c(90.0f, 170.0f, 60.0f); - boundingBox.Set(bbLo, bbUp); + mBoundingBox.Set(bbLo, bbUp); } break; case GODDESS: { static mVec3_c bbLo = mVec3_c(-65.0f, 0.0f, -100.0f); static mVec3_c bbUp = mVec3_c(65.0f, 150.0f, 50.0f); - boundingBox.Set(bbLo, bbUp); + mBoundingBox.Set(bbLo, bbUp); } break; } @@ -1194,7 +1194,7 @@ int dAcTbox_c::actorExecute() { if (hasFlags) { setObjectProperty(0x200); } else { - clearObjectProperty(0x200); + unsetObjectProperty(0x200); } if (hasFlags) { @@ -1330,7 +1330,7 @@ int dAcTbox_c::actorExecuteInEvent() { if (hasFlags) { setObjectProperty(0x200); } else { - clearObjectProperty(0x200); + unsetObjectProperty(0x200); } if (hasFlags) { diff --git a/src/d/a/obj/d_a_obj_water_spout.cpp b/src/d/a/obj/d_a_obj_water_spout.cpp index 2a7bfbff..052fa74e 100644 --- a/src/d/a/obj/d_a_obj_water_spout.cpp +++ b/src/d/a/obj/d_a_obj_water_spout.cpp @@ -39,7 +39,7 @@ int dAcOwaterSpout_c::create() { mScale.y *= 4.0f; } mMdl.getModel().setScale(mScale); - boundingBox.Set(mVec3_c(-400.0f, -250.0f, -400.0f), mVec3_c(400.0f, 250.0f, 400.0f)); + mBoundingBox.Set(mVec3_c(-400.0f, -250.0f, -400.0f), mVec3_c(400.0f, 250.0f, 400.0f)); return SUCCEEDED; } diff --git a/src/d/col/bg/d_bg_s_acch.cpp b/src/d/col/bg/d_bg_s_acch.cpp index a57bc638..0affa72e 100644 --- a/src/d/col/bg/d_bg_s_acch.cpp +++ b/src/d/col/bg/d_bg_s_acch.cpp @@ -110,14 +110,14 @@ void dBgS_Acch::Set(dAcObjBase_c *pObj, int tblSize, dBgS_AcchCir *pAcchCir) { mpMyObj = pObj; mActorId = pObj->getID(); mpPos = &pObj->getPosition(); - mpOldPos = &pObj->GetOldPosition(); - mpSpeed = &pObj->GetVelocity(); + mpOldPos = &pObj->getOldPosition(); + mpSpeed = &pObj->getVelocity(); if (mpSpeed) { - mSpeed = pObj->GetVelocity(); + mSpeed = pObj->getVelocity(); } else { mSpeed.set(0.0f, 0.0f, 0.0f); } - mpAngle = &pObj->GetAngle(); + mpAngle = &pObj->getAngle(); mpShapeAngle = &pObj->getRotation(); } diff --git a/src/d/col/cc/d_cc_s.cpp b/src/d/col/cc/d_cc_s.cpp index 702042e4..01e67d6a 100644 --- a/src/d/col/cc/d_cc_s.cpp +++ b/src/d/col/cc/d_cc_s.cpp @@ -62,7 +62,7 @@ void dCcS::Dt() { bool dCcS::ChkRemoveActor(dAcObjBase_c *pActor) { bool ret = false; - if (pActor && (pActor->delete_request || pActor->lifecycle_state == fBase_c::TO_BE_DELETED)) { + if (pActor && (pActor->mDeleteRequest || pActor->mLifecycleState == fBase_c::TO_BE_DELETED)) { ret = true; } return ret; diff --git a/src/d/d_base.cpp b/src/d/d_base.cpp index ac9a7810..44a9718f 100644 --- a/src/d/d_base.cpp +++ b/src/d/d_base.cpp @@ -5,7 +5,7 @@ u32 dBase_c::s_DrawControlFlags; u32 dBase_c::s_NextExecuteControlFlags; dBase_c::dBase_c() : fBase_c() { - mBaseProperties = (*fProfile::sProfileList)[profile_name]->mBaseProperties; + mBaseProperties = (*fProfile::sProfileList)[mProfileName]->mBaseProperties; } void dBase_c::postDraw(fBase_c::MAIN_STATE_e status) { @@ -53,7 +53,7 @@ void dBase_c::resetFlags() { } bool dBase_c::isActorPlayer() { - return profile_name == fProfile::PLAYER; + return mProfileName == fProfile::PLAYER; } int dBase_c::loadAsyncCallback() { diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index 7097c5a3..8d60b22f 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -18,7 +18,7 @@ int dJntCol_c::init(dAcObjBase_c *i_actorP, dJntColData_c const *i_jntColP, m3d: field_0x10 = 0; if (i_actorP) { - i_actorP->SetJntCol(this); + i_actorP->setJntCol(this); mpActor = i_actorP; } diff --git a/src/d/d_linkage.cpp b/src/d/d_linkage.cpp index 4be6c775..b2e3f719 100644 --- a/src/d/d_linkage.cpp +++ b/src/d/d_linkage.cpp @@ -72,8 +72,8 @@ bool dLinkage_c::tryAttach( return false; } } - pActor->clearObjectProperty(0x1000); - pActor->clearObjectProperty(0x4); + pActor->unsetObjectProperty(0x1000); + pActor->unsetObjectProperty(0x4); mControllingActor.link(pSrc); mState = STATE_ACTIVE; mType = type; @@ -88,7 +88,7 @@ bool dLinkage_c::tryAttach( pLinkedActor = pRef; pRef->link(pActor); if ((pSrc == dAcPy_c::GetLink2() || type == CONNECTION_5) && - pActor->getConnectParent()->profile_name == fProfile::ROOM) { + pActor->getConnectParent()->mProfileName == fProfile::ROOM) { pActor->addActorToRoom(-1); onFlag(0x20000000); pActor->setActorProperty(dAcBase_c::AC_PROP_0x2000000); @@ -110,9 +110,9 @@ void dLinkage_c::fn_80050E00(dAcObjBase_c *pActor, const f32 speed, const f32 ve void dLinkage_c::fn_80050E40(dAcObjBase_c *pActor, const f32 speed, const f32 velocityY, mAng rot) { fn_80050EB0(pActor); - pActor->forwardSpeed = speed; - pActor->velocity.y = velocityY; - pActor->angle.y = rot; + pActor->mSpeed = speed; + pActor->mVelocity.y = velocityY; + pActor->mAngle.y = rot; } void dLinkage_c::fn_80050EA0(dAcObjBase_c *pActor) { @@ -134,11 +134,11 @@ void dLinkage_c::fn_80050EB0(dAcObjBase_c *pActor) { MTXIdentity(carryTransMtx); } else if (mType == CONNECTION_4) { if (pActor) { - pActor->clearObjectProperty(0x4); + pActor->unsetObjectProperty(0x4); } } else if (mType == CONNECTION_7) { if (pActor) { - pActor->clearObjectProperty(0x1000); + pActor->unsetObjectProperty(0x1000); } } @@ -204,7 +204,7 @@ void dLinkage_c::fn_80051190(dAcObjBase_c *pActor) { // If the Actor is linked to itself, return? dAcObjBase_c *pLinked = static_cast<dAcObjBase_c *>(pLinkedActor->p_owner); - if (pLinked && &pLinked->GetLinkage() == this) { + if (pLinked && &pLinked->getLinkage() == this) { return; } } @@ -223,7 +223,7 @@ void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) { } mMtx_c &mtx = pActor->mWorldMtx; f32 y = field_0x1C * pActor->mScale.y; - mtx.transS(pActor->getPosition().x, pActor->getPosition().y + pActor->GetYOffset(), pActor->getPosition().z); + mtx.transS(pActor->getPosition().x, pActor->getPosition().y + pActor->getYOffset(), pActor->getPosition().z); if (mType == CONNECTION_1) { MTXConcat(mtx, carryTransMtx, mtx); } @@ -247,5 +247,5 @@ void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) { bool dLinkage_c::fn_800513C0() const { return (mState == STATE_ACTIVE && (mType == CONNECTION_1 || mType == CONNECTION_6)) && - !(mControllingActor.p_owner && mControllingActor.p_owner->profile_name == fProfile::E_GEROCK); + !(mControllingActor.p_owner && mControllingActor.p_owner->mProfileName == fProfile::E_GEROCK); } diff --git a/src/d/d_player_act.cpp b/src/d/d_player_act.cpp index 12851977..edc03b73 100644 --- a/src/d/d_player_act.cpp +++ b/src/d/d_player_act.cpp @@ -80,11 +80,11 @@ void daPlayerActBase_c::setPosRot(const mVec3_c *pos, const mAng3_c *rot, bool f if (pos != nullptr) { mPosition = *pos; mOldPosition = mPosition; - velocity.y = 0.0f; + mVelocity.y = 0.0f; } if (rot != nullptr) { mRotation = *rot; - angle.y = mRotation.y; + mAngle.y = mRotation.y; } } } diff --git a/src/d/d_player_mdl.cpp b/src/d/d_player_mdl.cpp index 5b640016..8e67a1bf 100644 --- a/src/d/d_player_mdl.cpp +++ b/src/d/d_player_mdl.cpp @@ -1860,7 +1860,7 @@ void daPlayerModelBase_c::updateCachedPositions() { static const Vec sPos1 = {12.0f, -8.0f, 0.0f}; static const Vec sHeadPos = {0.0f, -28.0f, 0.0f}; - mMainMdl.getNodeWorldMtxMultVec(PLAYER_MAIN_NODE_HEAD, sPos1, poscopy2); + mMainMdl.getNodeWorldMtxMultVec(PLAYER_MAIN_NODE_HEAD, sPos1, mPositionCopy2); mMainMdl.getNodeWorldMtxMultVec(PLAYER_MAIN_NODE_HEAD, sPosAboveLink, mPositionAboveLink); mMainMdl.getNodeWorldMtxMultVec(PLAYER_MAIN_NODE_HEAD, sHeadPos, mHeadTranslation); @@ -1881,7 +1881,7 @@ void daPlayerModelBase_c::updateCachedPositions() { mVec3_c v(0.0f, 18.0f, 0.0f); v.rotX(field_0x1268); v.rotY(mRotation.y + field_0x126A); - poscopy2 += v; + mPositionCopy2 += v; } } @@ -1891,16 +1891,16 @@ void daPlayerModelBase_c::setPosCopy3() { static const Vec posCopy3v2 = {0.0f, 95.0f, 0.0f}; static const Vec posCopy3v3 = {0.0f, 14.0f, 0.0f}; if (checkCurrentAction(/* FREE_FALL*/ 0x13) || checkCurrentAction(/* WALKING_ON_TIGHTROPE */ 0x81)) { - poscopy3 = mPosition; - poscopy3.y += 180.0f; + mPositionCopy3 = mPosition; + mPositionCopy3.y += 180.0f; } else if (checkCurrentAction(/* BEING_PULLED_BY_CLAWS */ 0x5A)) { - poscopy3 = poscopy2; + mPositionCopy3 = mPositionCopy2; } else if (checkActionFlags(FLG0_SWING_ROPE)) { - poscopy3 = mPosition; + mPositionCopy3 = mPosition; } else if (checkActionFlagsCont(0x20000000) || checkCurrentAction(0x70) || checkCurrentAction(/* HANG_ON_ZIP */ 0x85)) { - poscopy3 = mPosition; - poscopy3.y -= 100.0f; + mPositionCopy3 = mPosition; + mPositionCopy3.y -= 100.0f; } else { // TODO maybe fakematch, is there a way to avoid this goto? if (checkActionFlags(FLG0_HANGING_LEDGE)) { @@ -1913,14 +1913,14 @@ void daPlayerModelBase_c::setPosCopy3() { case 0x84: /* CLIMBING_ONTO_TIGHTROPE */ { label: const nw4r::math::MTX34 *c = mHeadMdl.getLocalMtx(); - poscopy3.x = c->_03; - poscopy3.y = c->_13; - poscopy3.z = c->_23; + mPositionCopy3.x = c->_03; + mPositionCopy3.y = c->_13; + mPositionCopy3.z = c->_23; break; } case 0x09: { // SLIDING - poscopy3 = mPosition + mVec3_c(posCopy3v2); + mPositionCopy3 = mPosition + mVec3_c(posCopy3v2); break; } default: { @@ -1940,10 +1940,10 @@ void daPlayerModelBase_c::setPosCopy3() { } f = mtx.m[1][3]; } - poscopy3.copyFrom(v); - poscopy3.x += mPosition.x; - poscopy3.y += f; - poscopy3.z += mPosition.z; + mPositionCopy3.copyFrom(v); + mPositionCopy3.x += mPosition.x; + mPositionCopy3.y += f; + mPositionCopy3.z += mPosition.z; break; } } diff --git a/src/d/d_room.cpp b/src/d/d_room.cpp index a17e411d..9d6c48e7 100644 --- a/src/d/d_room.cpp +++ b/src/d/d_room.cpp @@ -222,7 +222,7 @@ s32 dRoom_c::foreachObject(foreachObjCallback cb) { } for (fBase_c *base = getConnectChild(); base != nullptr && base != start; base = getConnectTreeNext(base)) { - if (base->group_type == ACTOR || base->group_type == STAGE) { + if (base->mGroupType == ACTOR || base->mGroupType == STAGE) { cb(static_cast<dAcBase_c *>(base)); count++; } diff --git a/src/d/d_sc_game.cpp b/src/d/d_sc_game.cpp index ebff6a1e..8c691c33 100644 --- a/src/d/d_sc_game.cpp +++ b/src/d/d_sc_game.cpp @@ -206,7 +206,7 @@ bool dScGame_c::attemptDelete() { if (mStageMgrRef.p_owner == nullptr) { return true; } else { - if (!mStageMgrRef.p_owner->delete_request) { + if (!mStageMgrRef.p_owner->mDeleteRequest) { mStageMgrRef.p_owner->deleteRequest(); } return false; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index c97aeb0d..b86ba605 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -219,7 +219,7 @@ void dStage_c::setRoomVisited(int roomid) { return; } - if (dScGame_c::sInstance == nullptr || dScGame_c::GetInstance()->profile_name == fProfile::GAME) { + if (dScGame_c::sInstance == nullptr || dScGame_c::GetInstance()->mProfileName == fProfile::GAME) { u16 flag, shift; getFlagPositionForRoomVisit(roomid, &flag, &shift); DungeonflagManager *mg = DungeonflagManager::sInstance; diff --git a/src/d/d_tag_processor.cpp b/src/d/d_tag_processor.cpp index 5c76e740..af0c2be7 100644 --- a/src/d/d_tag_processor.cpp +++ b/src/d/d_tag_processor.cpp @@ -3,8 +3,8 @@ #include "common.h" #include "d/a/d_a_base.h" #include "d/d_font_manager.h" -#include "d/d_message.h" #include "d/d_lyt_hio.h" +#include "d/d_message.h" #include "d/d_textwindow_unk.h" #include "d/lyt/d_lyt_util_items.h" #include "d/lyt/d_textbox.h" @@ -26,6 +26,7 @@ #include <libc.h> + #define READ_U8(src, off) (*((const u8 *)((const u8 *)src + off))) #define READ_S8(src, off) (*((const s8 *)((const u8 *)src + off))) #define READ_U16(src, off) (*((const u16 *)((const u8 *)src + off))) @@ -1569,9 +1570,9 @@ void dTagProcessor_c::somethingWithScrapperAndMusic(wchar_t *src) { dAcBase_c *parent = nullptr; while ((parent = ac = static_cast<dAcBase_c *>(fManager_c::searchBaseByGroupType(fBase_c::ACTOR, parent))) != nullptr) { - if ((ac->profile_name >= fProfile::NPC_SLFB && ac->profile_name <= fProfile::NPC_SLFL) || - (ac->profile_name >= fProfile::NPC_SLB && ac->profile_name <= fProfile::FLY_SLB) || - ac->profile_name == fProfile::NPC_SLB2 || ac->profile_name == fProfile::NPC_DRBC) { + if ((ac->mProfileName >= fProfile::NPC_SLFB && ac->mProfileName <= fProfile::NPC_SLFL) || + (ac->mProfileName >= fProfile::NPC_SLB && ac->mProfileName <= fProfile::FLY_SLB) || + ac->mProfileName == fProfile::NPC_SLB2 || ac->mProfileName == fProfile::NPC_DRBC) { dSndPlayerMgr_c::GetInstance()->setMsgActor(dLytMsgWindow_c::getInstance()->getMsgIdx(), ac); return; } diff --git a/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp b/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp index 7e73fea9..cf7423f0 100644 --- a/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp +++ b/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp @@ -436,10 +436,10 @@ bool dLytMeterGanbariGauge_c::execute() { } } - mVec3_c diff = dAcPy_c::GetLink()->poscopy3 - dScGame_c::getCamera(0)->getPositionMaybe(); + mVec3_c diff = dAcPy_c::GetLink()->mPositionCopy3 - dScGame_c::getCamera(0)->getPositionMaybe(); f32 len = diff.mag(); mVec3_c v; - d3d::fn_80016960(v, dAcPy_c::GetLink()->poscopy3); + d3d::fn_80016960(v, dAcPy_c::GetLink()->mPositionCopy3); if (!EventManager::isInEvent()) { field_0x524 = v; } @@ -503,8 +503,7 @@ bool dLytMeterGanbariGauge_c::execute() { mVec2_c scaleV(scale, scale); mLyt.getLayout()->GetRootPane()->SetScale(scaleV); - if (!field_0x534 && len <= dLytMeter_HIO_c::GetInstance()->field_0x138 && !fn_80104710(false) && - !isCrawling()) { + if (!field_0x534 && len <= dLytMeter_HIO_c::GetInstance()->field_0x138 && !fn_80104710(false) && !isCrawling()) { field_0x530 = 1; } else { field_0x530 = 0; @@ -603,7 +602,7 @@ bool dLytMeterGanbariGauge_c::execute() { if (!EventManager::isInEvent() && !dAcPy_c::GetLink()->hasvt_0x1C0() && !dAcPy_c::GetLink()->checkActionFlagsCont(0x10) && - (d3d::fn_80016A90(dAcPy_c::GetLink()->poscopy3) || fn_80104710(false) || isCrawling()) && + (d3d::fn_80016A90(dAcPy_c::GetLink()->mPositionCopy3) || fn_80104710(false) || isCrawling()) && *mStateMgrWheel.getStateID() != StateID_Full && *mStateMgrMain.getStateID() == StateID_InvisibleWait && !field_0x530) { mStateMgrMain.changeState(StateID_In); @@ -612,7 +611,7 @@ bool dLytMeterGanbariGauge_c::execute() { mStateMgrMain.changeState(StateID_OutWait); } else if ((EventManager::isInEvent() || dAcPy_c::GetLink()->hasvt_0x1C0() || dAcPy_c::GetLink()->checkActionFlagsCont(0x10) || - (!d3d::fn_80016A90(dAcPy_c::GetLink()->poscopy3) && !fn_80104710(false) && !isCrawling())) && + (!d3d::fn_80016A90(dAcPy_c::GetLink()->mPositionCopy3) && !fn_80104710(false) && !isCrawling())) && *mStateMgrMain.getStateID() == StateID_Wait) { mStateMgrMain.changeState(StateID_CameraOut); } else if (field_0x530 && *mStateMgrMain.getStateID() == StateID_Wait) { diff --git a/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp b/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp index f21efe7b..9c8ab2bf 100644 --- a/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp @@ -246,7 +246,7 @@ void dLytMeterPlusBtn_c::setCall(bool shouldCall) { bool dLytMeterPlusBtn_c::hasSpecificMapMark() { dTgMapMark_c *mark = nullptr; while ((mark = static_cast<dTgMapMark_c *>(fManager_c::searchBaseByGroupType(fBase_c::STAGE, mark))) != nullptr) { - if (mark->checkActorProperty(dAcBase_c::AC_PROP_0x100) || mark->profile_name != fProfile::T_MAP_MARK || + if (mark->checkActorProperty(dAcBase_c::AC_PROP_0x100) || mark->mProfileName != fProfile::T_MAP_MARK || mark->rotz_shift0_0xf == 1) { continue; } diff --git a/src/d/lyt/msg_window/d_lyt_msg_window.cpp b/src/d/lyt/msg_window/d_lyt_msg_window.cpp index d43b29d9..4e08a12a 100644 --- a/src/d/lyt/msg_window/d_lyt_msg_window.cpp +++ b/src/d/lyt/msg_window/d_lyt_msg_window.cpp @@ -2,16 +2,17 @@ #include "common.h" #include "d/a/obj/d_a_obj_base.h" +#include "d/d_lyt_hio.h" #include "d/d_message.h" #include "d/d_pad.h" #include "d/d_stage_mgr.h" #include "d/d_tag_processor.h" -#include "d/d_lyt_hio.h" #include "d/d_textwindow_unk.h" #include "d/lyt/d_lyt_control_game.h" #include "d/lyt/d_lyt_map.h" #include "d/lyt/d_textbox.h" + // clang-format off // vtable order #include "d/lyt/meter/d_lyt_meter.h" @@ -263,8 +264,8 @@ void dLytMsgWindow_c::initializeState_In() { param = 2; } else if (mpTagProcessor->getField_0x90D() == 3) { param = 1; - } else if (obj != nullptr && d3d::fn_80016A90(obj->poscopy2)) { - d3d::fn_80016960(field_0x768, obj->poscopy2); + } else if (obj != nullptr && d3d::fn_80016A90(obj->mPositionCopy2)) { + d3d::fn_80016960(field_0x768, obj->mPositionCopy2); mVec3_c v = field_0x768; v.z = 0.f; field_0x768 = v; diff --git a/src/f/f_base.cpp b/src/f/f_base.cpp index c1b51e8b..f03964d5 100644 --- a/src/f/f_base.cpp +++ b/src/f/f_base.cpp @@ -25,9 +25,9 @@ void (*fBase_c::sUnloadCallback)(); fBase_c::fBase_c() : mID(m_rootUniqueID), mParams(m_tmpCtData.params), - profile_name(m_tmpCtData.prof_name), - group_type(m_tmpCtData.group_type), - manager(this) { + mProfileName(m_tmpCtData.prof_name), + mGroupType(m_tmpCtData.group_type), + mManager(this) { m_rootUniqueID = (fBaseID_e)(m_rootUniqueID + 1); if (m_rootUniqueID == INVALID) { for (;;) { @@ -35,14 +35,14 @@ fBase_c::fBase_c() } } - fManager_c::m_connectManage.addTreeNode(&manager.connect_node, m_tmpCtData.connect_parent); - int searchTableIdx = manager.getSearchTableNum(); - fManager_c::m_searchManage[searchTableIdx].prepend(&manager.search_node); + fManager_c::m_connectManage.addTreeNode(&mManager.connect_node, m_tmpCtData.connect_parent); + int searchTableIdx = mManager.getSearchTableNum(); + fManager_c::m_searchManage[searchTableIdx].prepend(&mManager.search_node); - const fProfile::fBaseProfile_c *profile = (*fProfile::sProfileList)[profile_name]; + const fProfile::fBaseProfile_c *profile = (*fProfile::sProfileList)[mProfileName]; if (profile != nullptr) { - manager.execute_node.setOrder(profile->m_execute_order); - manager.draw_node.setOrder(profile->m_draw_order); + mManager.execute_node.setOrder(profile->m_execute_order); + mManager.draw_node.setOrder(profile->m_draw_order); } fBase_c *parent = getConnectParent(); @@ -62,10 +62,10 @@ fBase_c::~fBase_c() { // that causes a weak destructor to spawn that actually needs to be in f_manager. // And it's not like any of fLiMgBa_c's methods are accessed via actor_list, // so who can tell? Maybe there's yet another type? - fLiNdBa_c *node = static_cast<fLiNdBa_c *>(actor_list.getFirst()); + fLiNdBa_c *node = static_cast<fLiNdBa_c *>(mActorList.getFirst()); while (node != nullptr) { node->unlink(); - node = static_cast<fLiNdBa_c *>(actor_list.getFirst()); + node = static_cast<fLiNdBa_c *>(mActorList.getFirst()); } } @@ -107,13 +107,13 @@ int fBase_c::preCreate() { /* 802e15e0 */ void fBase_c::postCreate(MAIN_STATE_e state) { if (state == SUCCESS) { - fManager_c::m_createManage.remove(&manager.execute_node); + fManager_c::m_createManage.remove(&mManager.execute_node); if (fManager_c::m_nowLoopProc == fManager_c::EXECUTE) { - update_request = true; + mUpdateRequest = true; } else { - fManager_c::m_executeManage.addNode(&manager.execute_node); - fManager_c::m_drawManage.addNode(&manager.draw_node); - lifecycle_state = ACTIVE; + fManager_c::m_executeManage.addNode(&mManager.execute_node); + fManager_c::m_drawManage.addNode(&mManager.draw_node); + mLifecycleState = ACTIVE; } } else if (state == ERROR) { deleteRequest(); @@ -133,7 +133,7 @@ int fBase_c::createPack() { /* 802e1730 */ int fBase_c::preDelete() { - if (p_helper != nullptr && !p_helper->LoadOnlyOne()) { + if (mpHelper != nullptr && !mpHelper->LoadOnlyOne()) { return NOT_READY; } @@ -156,17 +156,17 @@ void fBase_c::postDelete(MAIN_STATE_e state) { // Helper Delete I guess // - Finally Destroy the Object and ppoof it goes if (state == SUCCESS) { - fManager_c::m_connectManage.removeTreeNode(&manager.connect_node); - int searchTableIdx = manager.getSearchTableNum(); - fManager_c::m_searchManage[searchTableIdx].remove(&manager.search_node); - fManager_c::m_deleteManage.remove(&manager.execute_node); + fManager_c::m_connectManage.removeTreeNode(&mManager.connect_node); + int searchTableIdx = mManager.getSearchTableNum(); + fManager_c::m_searchManage[searchTableIdx].remove(&mManager.search_node); + fManager_c::m_deleteManage.remove(&mManager.execute_node); - if (p_heap != nullptr) { - p_heap->destroy(); + if (mpHeap != nullptr) { + mpHeap->destroy(); } - if (p_helper != nullptr) { - p_helper->Delete(); + if (mpHelper != nullptr) { + mpHelper->Delete(); } delete this; @@ -187,7 +187,7 @@ int fBase_c::execute() { /* 802e1920 */ int fBase_c::preExecute() { // Do not execute if it has been flagged for deletion or marked as non-execute - if (delete_request || checkProcControl(DISABLE_EXECUTE)) { + if (mDeleteRequest || checkProcControl(DISABLE_EXECUTE)) { return NOT_READY; } @@ -225,7 +225,7 @@ int fBase_c::draw() { /* 802e1aa0 */ int fBase_c::preDraw() { // Do not draw if it has been flagged for deletion or marked as non-draw - if (delete_request || checkProcControl(DISABLE_DRAW)) { + if (mDeleteRequest || checkProcControl(DISABLE_DRAW)) { return NOT_READY; } @@ -249,24 +249,24 @@ void fBase_c::deleteReady() {} /* 802e1ba0 */ int fBase_c::connectProc() { - if (delete_request) { - delete_request = false; - if (lifecycle_state == ACTIVE) { - if (update_request != UPDATE_FORCE) { - fManager_c::m_executeManage.remove(&manager.execute_node); - update_request = UPDATING; + if (mDeleteRequest) { + mDeleteRequest = false; + if (mLifecycleState == ACTIVE) { + if (mUpdateRequest != UPDATE_FORCE) { + fManager_c::m_executeManage.remove(&mManager.execute_node); + mUpdateRequest = UPDATING; } - fManager_c::m_drawManage.remove(&manager.draw_node); + fManager_c::m_drawManage.remove(&mManager.draw_node); } else { - fManager_c::m_createManage.remove(&manager.execute_node); + fManager_c::m_createManage.remove(&mManager.execute_node); } // Add to Deletion list and flag as to be deleted - fManager_c::m_deleteManage.prepend(&manager.execute_node); - lifecycle_state = TO_BE_DELETED; + fManager_c::m_deleteManage.prepend(&mManager.execute_node); + mLifecycleState = TO_BE_DELETED; // Add all children to be marked as ready to delete - for (fTrNdBa_c *node = manager.connect_node.getChild(); node != nullptr; node = node->getBrNext()) { + for (fTrNdBa_c *node = mManager.connect_node.getChild(); node != nullptr; node = node->getBrNext()) { node->p_owner->deleteRequest(); } } else { @@ -286,44 +286,44 @@ int fBase_c::connectProc() { } // If Actor is already Active - if (lifecycle_state == ACTIVE) { + if (mLifecycleState == ACTIVE) { // If flaged for update, add to the global execute list - if (update_request == UPDATE_FORCE) { - fManager_c::m_executeManage.addNode(&manager.execute_node); - update_request = UPDATING; + if (mUpdateRequest == UPDATE_FORCE) { + fManager_c::m_executeManage.addNode(&mManager.execute_node); + mUpdateRequest = UPDATING; } // Change the priority nodes if order has changed - fLiNdPrio_c *ex = &manager.execute_node; + fLiNdPrio_c *ex = &mManager.execute_node; if (ex->isPriorityChange()) { fManager_c::m_executeManage.remove(ex); - fLiNdPrio_c *t = &manager.execute_node; + fLiNdPrio_c *t = &mManager.execute_node; t->updatePriority(); fManager_c::m_executeManage.addNode(t); } - fLiNdPrio_c *draw = &manager.draw_node; + fLiNdPrio_c *draw = &mManager.draw_node; if (draw->isPriorityChange()) { fManager_c::m_drawManage.remove(draw); - fLiNdPrio_c *t = &manager.draw_node; + fLiNdPrio_c *t = &mManager.draw_node; t->updatePriority(); fManager_c::m_drawManage.addNode(t); } } // If Actor Is Waiting for Creation - else if (lifecycle_state != TO_BE_DELETED) { - if (create_request) { - create_request = false; - fManager_c::m_createManage.append(&manager.execute_node); + else if (mLifecycleState != TO_BE_DELETED) { + if (mCreateRequest) { + mCreateRequest = false; + fManager_c::m_createManage.append(&mManager.execute_node); } else { - if ((u8)update_request != UPDATING) { - update_request = UPDATING; - fManager_c::m_executeManage.addNode(&manager.execute_node); - fManager_c::m_drawManage.addNode(&manager.draw_node); - lifecycle_state = ACTIVE; + if ((u8)mUpdateRequest != UPDATING) { + mUpdateRequest = UPDATING; + fManager_c::m_executeManage.addNode(&mManager.execute_node); + fManager_c::m_drawManage.addNode(&mManager.draw_node); + mLifecycleState = ACTIVE; } } } @@ -334,11 +334,11 @@ int fBase_c::connectProc() { /* 802e1e00 */ void fBase_c::deleteRequest() { - if (!delete_request && lifecycle_state != TO_BE_DELETED) { - delete_request = true; + if (!mDeleteRequest && mLifecycleState != TO_BE_DELETED) { + mDeleteRequest = true; deleteReady(); // Add all children to be marked as ready to delete - for (fTrNdBa_c *node = manager.connect_node.getChild(); node != nullptr; node = node->getBrNext()) { + for (fTrNdBa_c *node = mManager.connect_node.getChild(); node != nullptr; node = node->getBrNext()) { node->p_owner->deleteRequest(); } } @@ -347,12 +347,12 @@ void fBase_c::deleteRequest() { /* 802e1e80 */ void fBase_c::forceUpdate() { // There is probably an inline active here - if (((!delete_request && lifecycle_state != TO_BE_DELETED) && lifecycle_state != ACTIVE) && - (update_request == UPDATE_REQUEST && fManager_c::m_nowLoopProc == fManager_c::EXECUTE)) { - update_request = UPDATE_FORCE; - fManager_c::m_drawManage.addNode(&manager.draw_node); - lifecycle_state = ACTIVE; - m_forceExecuteList.append(&manager.execute_node); + if (((!mDeleteRequest && mLifecycleState != TO_BE_DELETED) && mLifecycleState != ACTIVE) && + (mUpdateRequest == UPDATE_REQUEST && fManager_c::m_nowLoopProc == fManager_c::EXECUTE)) { + mUpdateRequest = UPDATE_FORCE; + fManager_c::m_drawManage.addNode(&mManager.draw_node); + mLifecycleState = ACTIVE; + m_forceExecuteList.append(&mManager.execute_node); } } @@ -371,7 +371,7 @@ fBase_c *fBase_c::getConnectTreeNext(fBase_c *actor) { if (actor == nullptr) { ret = getConnectRoot(); } else { - fTrNdBa_c *node = actor->manager.connect_node.getTreeNext(); + fTrNdBa_c *node = actor->mManager.connect_node.getTreeNext(); if (node != nullptr) { ret = node->p_owner; } @@ -381,7 +381,7 @@ fBase_c *fBase_c::getConnectTreeNext(fBase_c *actor) { /* 802e1f90 */ fBase_c *fBase_c::getConnectParent() const { - fTrNdBa_c *node = manager.connect_node.getParent(); + fTrNdBa_c *node = mManager.connect_node.getParent(); if (node != nullptr) { return node->p_owner; } @@ -390,7 +390,7 @@ fBase_c *fBase_c::getConnectParent() const { /* 802e1fb0 */ fBase_c *fBase_c::getConnectChild() const { - fTrNdBa_c *node = manager.connect_node.getChild(); + fTrNdBa_c *node = mManager.connect_node.getChild(); if (node != nullptr) { return node->p_owner; } @@ -399,7 +399,7 @@ fBase_c *fBase_c::getConnectChild() const { /* 802e1fd0 */ fBase_c *fBase_c::getConnectBrNext() const { - fTrNdBa_c *node = manager.connect_node.getBrNext(); + fTrNdBa_c *node = mManager.connect_node.getBrNext(); if (node != nullptr) { return node->p_owner; } @@ -408,23 +408,23 @@ fBase_c *fBase_c::getConnectBrNext() const { /* 802e1ff0 */ void fBase_c::updateExecutePriority(u16 order) { - if (lifecycle_state == ACTIVE && update_request != UPDATE_FORCE) { + if (mLifecycleState == ACTIVE && mUpdateRequest != UPDATE_FORCE) { if (fManager_c::m_nowLoopProc == fManager_c::EXECUTE) { - manager.execute_node.m_new_order = order; + mManager.execute_node.m_new_order = order; } else { - fManager_c::m_executeManage.remove(&manager.execute_node); - fLiNdPrio_c *node = &manager.execute_node; + fManager_c::m_executeManage.remove(&mManager.execute_node); + fLiNdPrio_c *node = &mManager.execute_node; node->setOrder(order); fManager_c::m_executeManage.addNode(node); } } else { - manager.execute_node.setOrder(order); + mManager.execute_node.setOrder(order); } } /* 802e2090 */ bool fBase_c::setConnectChild(fBase_c *child) { - if (child == nullptr || child->lifecycle_state == TO_BE_DELETED) { + if (child == nullptr || child->mLifecycleState == TO_BE_DELETED) { return false; } @@ -432,12 +432,12 @@ bool fBase_c::setConnectChild(fBase_c *child) { return false; } - return fManager_c::m_connectManage.insertTreeNode(&manager.connect_node, &child->manager.connect_node); + return fManager_c::m_connectManage.insertTreeNode(&mManager.connect_node, &child->mManager.connect_node); } /* 802e20e0 */ bool fBase_c::entryFrmHeap(size_t size, EGG::Heap *parentHeap) { - if (p_heap != nullptr) { + if (mpHeap != nullptr) { return true; } @@ -457,7 +457,7 @@ bool fBase_c::entryFrmHeap(size_t size, EGG::Heap *parentHeap) { } else { heap_size = mHeap::adjustFrmHeap(new_heap); if (size == heap_size) { - p_heap = new_heap; + mpHeap = new_heap; return true; } } @@ -495,7 +495,7 @@ bool fBase_c::entryFrmHeap(size_t size, EGG::Heap *parentHeap) { larger_heap = nullptr; } else { heap_size = mHeap::adjustFrmHeap(larger_heap); - p_heap = larger_heap; + mpHeap = larger_heap; return true; } } else { @@ -506,7 +506,7 @@ bool fBase_c::entryFrmHeap(size_t size, EGG::Heap *parentHeap) { } if (new_heap != nullptr) { - p_heap = new_heap; + mpHeap = new_heap; return true; } @@ -516,7 +516,7 @@ bool fBase_c::entryFrmHeap(size_t size, EGG::Heap *parentHeap) { /* 802e22e0 */ bool fBase_c::entryFrmHeapNonAdjust(size_t size, EGG::Heap *parentHeap) { - if (p_heap != nullptr) { + if (mpHeap != nullptr) { return true; } @@ -529,7 +529,7 @@ bool fBase_c::entryFrmHeapNonAdjust(size_t size, EGG::Heap *parentHeap) { if (!create_sucess) { mHeap::destroyFrmHeap(new_heap); } else { - p_heap = new_heap; + mpHeap = new_heap; return true; } } @@ -560,23 +560,23 @@ void fBase_c::operator delete(void *block) { /* 802e2420 */ void fBase_c::runCreate() { createPack(); - if ((!delete_request && (u8)update_request == UPDATING) && lifecycle_state == WAITING_FOR_CREATE) { + if ((!mDeleteRequest && (u8)mUpdateRequest == UPDATING) && mLifecycleState == WAITING_FOR_CREATE) { if (fManager_c::m_nowLoopProc == fManager_c::CREATE) { - create_request = true; + mCreateRequest = true; } else { - fManager_c::m_createManage.append(&manager.execute_node); + fManager_c::m_createManage.append(&mManager.execute_node); } } } /* 802e24a0 */ fBase_c *fBase_c::getChildProcessCreateState() const { - const fTrNdBa_c *connect_node = &manager.connect_node; + const fTrNdBa_c *connect_node = &mManager.connect_node; fTrNdBa_c *end = connect_node->getTreeNextNotChild(); fTrNdBa_c *curr = connect_node->getChild(); while (curr != nullptr && curr != end) { - if (curr->p_owner->lifecycle_state == WAITING_FOR_CREATE) { + if (curr->p_owner->mLifecycleState == WAITING_FOR_CREATE) { return curr->p_owner; } curr = curr->getTreeNext(); @@ -622,11 +622,11 @@ fBase_c *fBase_c::createChild(ProfileName profile_name, fBase_c *parent, u32 par return nullptr; } - if (parent->delete_request || parent->lifecycle_state == TO_BE_DELETED) { + if (parent->mDeleteRequest || parent->mLifecycleState == TO_BE_DELETED) { return nullptr; } - return fBase_make(profile_name, &parent->manager.connect_node, param, group_type); + return fBase_make(profile_name, &parent->mManager.connect_node, param, group_type); } /* 802e2640 */ diff --git a/src/f/f_list.cpp b/src/f/f_list.cpp index 7a51c347..3068efe1 100644 --- a/src/f/f_list.cpp +++ b/src/f/f_list.cpp @@ -58,7 +58,7 @@ const fLiNdBa_c *fLiMgBa_c::searchNodeByID(fBaseID_e id) const { const fLiNdBa_c *fLiMgBa_c::searchNodeByProfName(ProfileName name, fLiNdBa_c *start) const { fLiNdBa_c *node = start != nullptr ? start->getNext() : getFirst(); while (node != nullptr) { - if (node->p_owner->profile_name == name) { + if (node->p_owner->mProfileName == name) { return node; } node = node->getNext(); @@ -74,14 +74,14 @@ void fLiNdBa_c::link(fBase_c *link) { if (link != nullptr) { p_owner = link; - link->actor_list.append(this); + link->mActorList.append(this); } } /* 802e2830 */ void fLiNdBa_c::unlink() { if (p_owner != nullptr) { - p_owner->actor_list.remove(this); + p_owner->mActorList.remove(this); p_owner = nullptr; } } diff --git a/src/f/f_manager.cpp b/src/f/f_manager.cpp index 47a22df5..cebedaa7 100644 --- a/src/f/f_manager.cpp +++ b/src/f/f_manager.cpp @@ -29,7 +29,7 @@ fBase_c *fManager_c::searchBaseByID(fBaseID_e id) { /* 802e2920 */ fBase_c *fManager_c::searchBaseByProfName(ProfileName profID, const fBase_c *parent) { - const fTrNdBa_c *connect_node = parent != nullptr ? &parent->manager.connect_node : nullptr; + const fTrNdBa_c *connect_node = parent != nullptr ? &parent->mManager.connect_node : nullptr; const fTrNdBa_c *node = m_connectManage.searchNodeByProfName(profID, connect_node); @@ -42,7 +42,7 @@ fBase_c *fManager_c::searchBaseByProfName(ProfileName profID, const fBase_c *par /* 802e2980 */ fBase_c *fManager_c::searchBaseByGroupType(unsigned char groupType, const fBase_c *parent) { - const fTrNdBa_c *connect_node = parent != nullptr ? &parent->manager.connect_node : nullptr; + const fTrNdBa_c *connect_node = parent != nullptr ? &parent->mManager.connect_node : nullptr; const fTrNdBa_c *node = m_connectManage.searchNodeByGroupType(groupType, connect_node); diff --git a/src/toBeSorted/attention.cpp b/src/toBeSorted/attention.cpp index 5dd9cc4c..8b898ffb 100644 --- a/src/toBeSorted/attention.cpp +++ b/src/toBeSorted/attention.cpp @@ -13,7 +13,7 @@ mVec3_c attnVectors[4]; mVec3_c getPosCopy3(const dAcObjBase_c &actor) { - return actor.poscopy3; + return actor.mPositionCopy3; } class dAttention_HIO_c { diff --git a/src/toBeSorted/d_emitter.cpp b/src/toBeSorted/d_emitter.cpp index f487e389..4fb19c71 100644 --- a/src/toBeSorted/d_emitter.cpp +++ b/src/toBeSorted/d_emitter.cpp @@ -371,7 +371,7 @@ bool EffectsStruct::areAllEmittersDone() { } void EffectsStruct::execute() { - if (mpOwner != nullptr && (mpOwner->delete_request || mpOwner->lifecycle_state == fBase_c::TO_BE_DELETED)) { + if (mpOwner != nullptr && (mpOwner->mDeleteRequest || mpOwner->mLifecycleState == fBase_c::TO_BE_DELETED)) { mpOwner = nullptr; } if (dJEffManager_c::shouldBePaused(mpOwner)) { @@ -403,7 +403,7 @@ void EffectsStruct::execute() { } bool EffectsStruct::getOwnerPolyAttrs(s32 *pOut1, s32 *pOut2) { - if (mpOwner != nullptr && mpOwner->group_type == fBase_c::ACTOR) { + if (mpOwner != nullptr && mpOwner->mGroupType == fBase_c::ACTOR) { dAcBase_c *actor = static_cast<dAcBase_c *>(mpOwner); *pOut1 = actor->mPolyAttr0; *pOut2 = actor->mPolyAttr1; @@ -519,8 +519,8 @@ void dMassObjEmitterCallback_c::executeAfter(JPABaseEmitter *emitter) { void dMassObjEmitterCallback_c::execute() { for (s32 i = field_0x654 - 1; i >= 0; i--) { if (field_0x588[i] != nullptr) { - if (!dJEffManager_c::shouldBePaused(field_0x588[i]) || field_0x588[i]->delete_request || - field_0x588[i]->lifecycle_state == fBase_c::TO_BE_DELETED) { + if (!dJEffManager_c::shouldBePaused(field_0x588[i]) || field_0x588[i]->mDeleteRequest || + field_0x588[i]->mLifecycleState == fBase_c::TO_BE_DELETED) { if (field_0x654 != 0 && i != field_0x654 - 1) { field_0x588[i] = field_0x588[field_0x654 - 1]; field_0x268[i] = field_0x268[field_0x654 - 1]; @@ -1273,7 +1273,7 @@ void dWaterEffect_c::execute(f32 water, f32 ground) { mVec3_c pos(ac->mPosition.x, water, ac->mPosition.z); mVec3_c scale(mScale, mScale, mScale); mEff.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_127_, pos, nullptr, &scale, nullptr, nullptr); - f32 rate = nw4r::math::FAbs(ac->forwardSpeed) * 0.02f; + f32 rate = nw4r::math::FAbs(ac->mSpeed) * 0.02f; rate = rate > 0.95f ? 0.95f : rate; mEff.setRate(rate + 0.05f); } diff --git a/src/toBeSorted/file_manager.cpp b/src/toBeSorted/file_manager.cpp index 9c74c9f7..1f822dca 100644 --- a/src/toBeSorted/file_manager.cpp +++ b/src/toBeSorted/file_manager.cpp @@ -458,7 +458,7 @@ extern "C" void fn_800C01F0(); // todo flag managers bool FileManager::isFileInactive() const { fBase_c *actor = fManager_c::searchBaseByGroupType(1, nullptr); if (actor) { - if (actor->profile_name == fProfile::TITLE && !mAntiCommitFlag) { + if (actor->mProfileName == fProfile::TITLE && !mAntiCommitFlag) { return true; } return false; diff --git a/src/toBeSorted/save_manager.cpp b/src/toBeSorted/save_manager.cpp index 221d129a..ae42e9b6 100644 --- a/src/toBeSorted/save_manager.cpp +++ b/src/toBeSorted/save_manager.cpp @@ -401,7 +401,7 @@ void SaveMgr::executeCreateFiles() { if (NandResultTracker::GetInstance()->isFailure(status)) { return; } - if (dScGame_c::GetInstance() != nullptr && dScGame_c::GetInstance()->profile_name == fProfile::GAME) { + if (dScGame_c::GetInstance() != nullptr && dScGame_c::GetInstance()->mProfileName == fProfile::GAME) { fileMgr->copySelectedFileSkipData(); } fileMgr->setField0xA842(1); |