From ca71275bbecc7db9a4eeca3a6ac4215b66de4318 Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:06:32 -0800
Subject: 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
---
 src/d/d_attention.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/d/d_attention.cpp')

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;
 }
-- 
cgit v1.2.3