mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-01 12:18:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_carry mostly done (#2301)

Browse Source 
* d_a_obj_carry mostly done

* cleanup some acch inlines
This commit is contained in:
TakaRikka
2025-02-13 09:37:46 -08:00
committed by GitHub
parent 2453c0e333
commit 6e94efaefb
63 changed files with 4556 additions and 3407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_vt.cpp
+4 -4
View File
@@ -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,