From 4a5752fe520125ed8b674b09da4980603f2422f3 Mon Sep 17 00:00:00 2001
From: Carco_21 <144170194+carter-ktb21@users.noreply.github.com>
Date: Wed, 22 Oct 2025 21:39:18 -0400
Subject: d_a_obj_gm almost matching (#2750)

* linked some objs

* major work

* equivalent

* almost matching

* almost matching

* PR cleanup
---
 src/d/actor/d_a_obj_ito.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/d/actor/d_a_obj_ito.cpp')

diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp
index b0f2c2e591..f3e9dcf036 100644
--- a/src/d/actor/d_a_obj_ito.cpp
+++ b/src/d/actor/d_a_obj_ito.cpp
@@ -72,9 +72,9 @@ static void cut_line_calc(obj_ito_class* i_this, ito_s* param_2, int param_3) {
     cXyz sp11c(0.0f, 0.0f, 0.0f);
     cXyz sp128;
 
-    if (param_2 == &i_this->field_0x103c && actor_p != NULL && actor_p->field_0x60a == 2) {
-        sp11c = *pos - actor_p->current.pos;
-        sp11c *= (XREG_F(2) + 0.0018f) * actor_p->speedF;
+    if (param_2 == &i_this->field_0x103c && actor_p != NULL && actor_p->mAction == 2) {
+        sp11c = *pos - actor_p->actor.current.pos;
+        sp11c *= (XREG_F(2) + 0.0018f) * actor_p->actor.speedF;
     }
 
     cXyz sp134;
@@ -89,7 +89,7 @@ static void cut_line_calc(obj_ito_class* i_this, ito_s* param_2, int param_3) {
     cXyz sp140;
     sp104.y = sp104.z = 0.0f;
 
-    if (actor_p != NULL && actor_p->field_0x60a == 1) {
+    if (actor_p != NULL && actor_p->mAction == 1) {
         bVar1 = true;
         cMtx_YrotS(*calc_mtx, actor_p->field_0x64c[0] + param_3 * (hREG_S(3) + 18000));
         sp104.x = hREG_F(8) + 2.0f;
@@ -248,7 +248,7 @@ static void action(obj_ito_class* i_this) {
         spe8 = i_this->field_0x618 - a_this->current.pos;
         i_this->field_0x624 = a_this->current.pos + (spe8 * 0.5f);
 
-        if (actor_p->field_0x60a == 0) {
+        if (actor_p->mAction == 0) {
             spe8 = actor_p->field_0x654[i_this->field_0x570] - actor_p->field_0x66c[i_this->field_0x570];
             i_this->field_0x624 += spe8 * (TREG_F(5) + 0.25f);
         }
@@ -342,14 +342,14 @@ static void action(obj_ito_class* i_this) {
 
         if (i_this->field_0x678[i].ChkCoHit()) {
             fopAc_ac_c* var_r25 = i_this->field_0x678[i].GetCoHitObj()->GetAc();
-            if (actor_p != NULL && var_r25 != actor_p) {
+            if (actor_p != NULL && var_r25 != &actor_p->actor) {
                 actor_p->field_0xae4 |= 0x4;
             }
         }
     }
 
-    if (actor_p != NULL && actor_p->field_0x567 != 0) {
-        actor_p->field_0x567 = 0;
+    if (actor_p != NULL && actor_p->actor.field_0x567 != 0) {
+        actor_p->actor.field_0x567 = 0;
         actor_p->field_0xae4 |= 2;
         cut_set(i_this, 100);
     }
@@ -403,7 +403,7 @@ static void action(obj_ito_class* i_this) {
             }
         }
 
-        if (i_this->field_0x570 == 0 && actor_p->field_0x60a == 2 && i_this->field_0x1038 == 0) {
+        if (i_this->field_0x570 == 0 && actor_p->mAction == 2 && i_this->field_0x1038 == 0) {
             cut_set(i_this, 100);
         }
     }
@@ -430,7 +430,7 @@ static void action(obj_ito_class* i_this) {
                     i_this->field_0x1038 = 2;
                 }
 
-                a_this->current.angle = actor_p->current.angle;
+                a_this->current.angle = actor_p->actor.current.angle;
                 cMtx_YrotS(*calc_mtx, a_this->current.angle.y);
                 cMtx_XrotM(*calc_mtx, a_this->current.angle.x);
 
-- 
cgit v1.2.3