diff options
| author | Aetias <aetias@outlook.com> | 2025-05-30 18:45:04 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2025-05-30 18:45:04 +0200 |
| commit | fdb4f5ee3f9e1957ffdc3e175c0eb26b650e0dfa (patch) | |
| tree | 68cd53b6c776b134be73e6dce82a4dfaefd37c39 /src/00_Core/Actor | |
| parent | 2bb9bf4fee393bb43be8a69a70a46189258249be (diff) | |
`ActorRefill::vfunc_b4` -> `ActorRefill::GetAmmoItem`
Diffstat (limited to 'src/00_Core/Actor')
| -rw-r--r-- | src/00_Core/Actor/Actor.cpp | 3 | ||||
| -rw-r--r-- | src/00_Core/Actor/ActorManager.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index 20ba75ae..411a6628 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -48,8 +48,7 @@ ARM Actor::Actor() : mUnk_010(0), mUnk_011(0), mUnk_012(0), - mUnk_034(-1), - mUnk_038(-1), + mUnk_034(-1, -1), mUnk_03c(-1), mUnk_040(-1, -1), mGravity(FLOAT_TO_Q20(0.0498)), diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp index fed1075e..955c447d 100644 --- a/src/00_Core/Actor/ActorManager.cpp +++ b/src/00_Core/Actor/ActorManager.cpp @@ -154,7 +154,7 @@ ARM Actor *ActorManager::GetActor(ActorRef *ref) { ARM bool FilterActor::Filter(Actor *actor) { if (mType != actor->mType) return false; - if (mUnk_08 != -1 && mUnk_08 != actor->mUnk_034) return false; + if (mUnk_08 != -1 && mUnk_08 != actor->mUnk_034.id) return false; if (mExcludeRefs != NULL) { for (s32 i = 0; mExcludeRefs[i].id != -1; ++i) { ActorRef *ref = &mExcludeRefs[i]; |
