diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-12-19 11:06:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 12:06:32 -0700 |
| commit | ca71275bbecc7db9a4eeca3a6ac4215b66de4318 (patch) | |
| tree | c2851f8cec211216fe0cb6a31a0260a62fc3bf53 /src/d/d_attention.cpp | |
| parent | 1114b13da81ab0b52fd4bb56a32f32331a21e581 (diff) | |
big d_a_alink pass (#214)
* d_a_alink pass1 wip
* more d_a_alink work
* remove asm
* more daalink work
* 20% dol code decompiled
* fixed some nonmatchings for building
* a few daalink functions and labeling some HIO data
Diffstat (limited to 'src/d/d_attention.cpp')
| -rw-r--r-- | src/d/d_attention.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index f279e51cd1..d21038f7c3 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1081,10 +1081,10 @@ bool dAttention_c::chaseAttention() { if (!chkFlag(0x4000)) { cSGlobe g1(actor->mAttentionInfo.mPosition - mOwnerAttnPos); - cSAngle a1(g1.U() - mpPlayer->mCollisionRot.y); + cSAngle a1(g1.U() - mpPlayer->shape_angle.y); cSGlobe g2(mOwnerAttnPos - actor->mAttentionInfo.mPosition); - cSAngle a2(g2.U() - actor->mCollisionRot.y); + cSAngle a2(g2.U() - actor->shape_angle.y); u32 type; f32 weight = calcWeight(0x4C, actor, g1.R(), a1.Val(), a2.Val(), &type); @@ -1850,7 +1850,7 @@ f32 dAttention_c::LockonReleaseDistanse() { int idx = mLockOnList[mLockOnOffset].mType + actor->mAttentionInfo.field_0x0[0]; cSGlobe tmp_g(actor->mAttentionInfo.mPosition - mOwnerAttnPos); - cSAngle tmp_a(tmp_g.U() - mpPlayer->mCollisionRot.y); + cSAngle tmp_a(tmp_g.U() - mpPlayer->shape_angle.y); return distace_angle_adjust(dist_table[idx].field_0x8, tmp_a, 1.0f) + dist_table[idx].field_0x4; } |