diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-02-13 09:37:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-13 10:37:46 -0700 |
| commit | 6e94efaefba6ea31023fbf52462a4b5c29eb36b4 (patch) | |
| tree | d139bc7f8698273aa39a1e156a10c28ccb7ea866 /src/d/actor/d_a_e_vt.cpp | |
| parent | 2453c0e3333157090e839eeab768d19b6a2b0ba1 (diff) | |
d_a_obj_carry mostly done (#2301)
* d_a_obj_carry mostly done
* cleanup some acch inlines
Diffstat (limited to 'src/d/actor/d_a_e_vt.cpp')
| -rw-r--r-- | src/d/actor/d_a_e_vt.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index fba56f4167..563c5aca89 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -2626,7 +2626,7 @@ void daE_VA_c::executeOpaciDamage() { } break; case 2: - if (mAcch.i_ChkGroundHit() || speed.y <= nREG_F(4) + -30.0f) { + if (mAcch.ChkGroundHit() || speed.y <= nREG_F(4) + -30.0f) { setActionMode(ACTION_OPACI_CHASE_e, 0); } break; @@ -2697,7 +2697,7 @@ void daE_VA_c::executeOpaciChase() { field_0x1324 = 0; } - if (mAcch.i_ChkGroundHit()) { + if (mAcch.ChkGroundHit()) { field_0x1324 = 2; gravity = -5.0f; } @@ -3237,7 +3237,7 @@ void daE_VA_c::calcMagicMove() { mDoMtx_stack_c::multVecZero(&mMagicPos[i]); mMagicOldPos[i] = mMagicPos[i]; - mMagicAcch[i].i_ClrGroundHit(); + mMagicAcch[i].ClrGroundHit(); mMagicAcch[i].ClrWallHit(); mMagicSphs[i].ClrAtHit(); @@ -3258,7 +3258,7 @@ void daE_VA_c::calcMagicMove() { mMagicSphs[i].SetR(50.0f); dComIfG_Ccsp()->Set(&mMagicSphs[i]); - if (mMagicAcch[i].i_ChkGroundHit() || mMagicAcch[i].ChkWallHit() || + if (mMagicAcch[i].ChkGroundHit() || mMagicAcch[i].ChkWallHit() || mMagicSphs[i].ChkAtHit()) { Z2GetAudioMgr()->seStart(Z2SE_EN_VA_FIRE_BURST, &mMagicPos[i], 0, 0, 1.0f, 1.0f, |