summaryrefslogtreecommitdiff
path: root/src/00_Core/Actor/ActorManager.cpp
diff options
context:
space:
mode:
authorMike <mikebuntu68@gmail.com>2024-05-11 14:30:20 -0400
committerMike <mikebuntu68@gmail.com>2024-07-20 11:37:22 -0400
commitb7a6355bc660424ccf246ad3bfec25a9560a4ddf (patch)
tree9bc4cd4ca64927302e98c43dc5a46a5dca5ce150 /src/00_Core/Actor/ActorManager.cpp
parent481da76f4d47df864d460647e905f74684be26a1 (diff)
Match `ActorManager::Actor_vfunc_10`
Diffstat (limited to 'src/00_Core/Actor/ActorManager.cpp')
-rw-r--r--src/00_Core/Actor/ActorManager.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp
index 9e4d2b88..7390dcda 100644
--- a/src/00_Core/Actor/ActorManager.cpp
+++ b/src/00_Core/Actor/ActorManager.cpp
@@ -115,18 +115,12 @@ static void NONMATCH(func_ov00_020c3484)(ActorRef *ref, Actor *actor, unk32 para
#endif
}
-void NONMATCH(ActorManager::Actor_vfunc_10)(u32 param1) {
- #ifndef NONMATCHING
- #include "../asm/ov00/Actor/ActorManager_Actor_vfunc_10.inc"
- #else
+ARM void ActorManager::Actor_vfunc_10(u32 param1) {
Actor *actor;
- Actor **currentActor;
- u32 uVar1;
int i;
- uVar1 = param1;
-
- currentActor = this->mActorTable;
+ u32 uVar1 = param1;
+ Actor **currentActor = this->mActorTable;
for (i = 0; i < this->mMaxActorIndex; ++i) {
actor = *currentActor;
@@ -136,10 +130,9 @@ void NONMATCH(ActorManager::Actor_vfunc_10)(u32 param1) {
actor->vfunc_10(param1);
}
}
- currentActor = currentActor + 1;
+ currentActor += 1;
}
return;
- #endif
}
Actor* NONMATCH(ActorManager::FindActorById)(s32 id) {