From 00a5edea71a605e7bdad78892b2863000e53624e Mon Sep 17 00:00:00 2001
From: fig02 <fig02srl@gmail.com>
Date: Mon, 18 Jan 2021 16:04:04 -0500
Subject: Actor Struct Changes (and a few related things) (#617)

* reformat header

* type -> category

* done for now i think

* some more stuff

* first -> head

* focus

* flag comment

* ground -> floor

* remove asm, name wrapper funcs

* name func, format

* review

* targetPriority, format

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0305ec2c2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0305ec2c2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* comment

* review

* feet flags

* horse shadow
---
 src/code/code_80043480.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/code/code_80043480.c')

diff --git a/src/code/code_80043480.c b/src/code/code_80043480.c
index 900dd9683..fe8097eb9 100644
--- a/src/code/code_80043480.c
+++ b/src/code/code_80043480.c
@@ -20,8 +20,8 @@ void func_800434B8(DynaPolyActor* dynaActor) {
     dynaActor->unk_160 |= 2;
 }
 
-void func_800434C8(CollisionContext* colCtx, s32 floorPolySource) {
-    DynaPolyActor* dynaActor = (DynaPolyActor*)DynaPoly_GetActor(colCtx, floorPolySource);
+void func_800434C8(CollisionContext* colCtx, s32 floorBgId) {
+    DynaPolyActor* dynaActor = (DynaPolyActor*)DynaPoly_GetActor(colCtx, floorBgId);
 
     if (dynaActor != NULL) {
         func_800434B8(dynaActor);
@@ -32,8 +32,8 @@ void func_800434F8(DynaPolyActor* dynaActor) {
     dynaActor->unk_160 |= 4;
 }
 
-void func_80043508(CollisionContext* colCtx, s32 floorPolySource) {
-    DynaPolyActor* dynaActor = (DynaPolyActor*)DynaPoly_GetActor(colCtx, floorPolySource);
+void func_80043508(CollisionContext* colCtx, s32 floorBgId) {
+    DynaPolyActor* dynaActor = (DynaPolyActor*)DynaPoly_GetActor(colCtx, floorBgId);
 
     if (dynaActor != NULL) {
         func_800434F8(dynaActor);
@@ -93,9 +93,9 @@ s32 func_800435D8(GlobalContext* globalCtx, DynaPolyActor* actor, s16 arg2, s16
     sign = (0.0f <= actor->unk_150) ? 1.0f : -1.0f;
 
     a2 = (f32)arg2 - 0.1f;
-    posA.x = actor->actor.posRot.pos.x + (a2 * cos);
-    posA.y = actor->actor.posRot.pos.y + arg4;
-    posA.z = actor->actor.posRot.pos.z - (a2 * sin);
+    posA.x = actor->actor.world.pos.x + (a2 * cos);
+    posA.y = actor->actor.world.pos.y + arg4;
+    posA.z = actor->actor.world.pos.z - (a2 * sin);
 
     a3 = (f32)arg3 - 0.1f;
     posB.x = sign * a3 * sin + posA.x;
@@ -105,8 +105,8 @@ s32 func_800435D8(GlobalContext* globalCtx, DynaPolyActor* actor, s16 arg2, s16
                                 actor, 0.0f)) {
         return false;
     }
-    posA.x = (actor->actor.posRot.pos.x * 2) - posA.x;
-    posA.z = (actor->actor.posRot.pos.z * 2) - posA.z;
+    posA.x = (actor->actor.world.pos.x * 2) - posA.x;
+    posA.z = (actor->actor.world.pos.z * 2) - posA.z;
     posB.x = sign * a3 * sin + posA.x;
     posB.z = sign * a3 * cos + posA.z;
     if (BgCheck_EntityLineTest3(&globalCtx->colCtx, &posA, &posB, &posResult, &poly, true, false, false, true, &bgId,
-- 
cgit v1.2.3