diff options
Diffstat (limited to 'src/14_Land/Actor/Player/ActorRefill.cpp')
| -rw-r--r-- | src/14_Land/Actor/Player/ActorRefill.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/14_Land/Actor/Player/ActorRefill.cpp b/src/14_Land/Actor/Player/ActorRefill.cpp index 75e2c2c4..91efd351 100644 --- a/src/14_Land/Actor/Player/ActorRefill.cpp +++ b/src/14_Land/Actor/Player/ActorRefill.cpp @@ -44,13 +44,13 @@ ARM ActorRefill::~ActorRefill() {} ARM bool ActorRefill::Init() { ItemManager *itemManager; - if (this->vfunc_b4() == ItemFlag_None) { + if (this->GetAmmoItem() == ItemFlag_None) { if (data_027e0d38->func_ov000_02078b40() != 3) { return false; } } else { ItemManager *itemManager = gItemManager; - ItemFlag item = this->vfunc_b4(); + ItemFlag item = this->GetAmmoItem(); if (!itemManager->HasItem(item)) { return false; } @@ -111,11 +111,11 @@ ARM void ActorRefill::vfunc_14(u32 param1) { case 4: case 5: if (this->CollidesWithPlayer(PlayerCollide_PickupFlags) != 0) { - if (this->vfunc_b4() == -1) { + if (this->GetAmmoItem() == -1) { data_027e103c->func_ov000_020cfbf0(mUnk_158 * 60, 1, 0); } else { ItemManager *itemManager = gItemManager; - itemManager->GiveAmmo(this->vfunc_b4(), mUnk_158); + itemManager->GiveAmmo(this->GetAmmoItem(), mUnk_158); } func_ov000_020d7ad4(&data_ov000_020eec9c, 0x100); this->func_ov014_02135364(3); @@ -227,7 +227,7 @@ ARM ActorRefillBombs::ActorRefillBombs() : ARM ActorRefillBombs::~ActorRefillBombs() {} -ARM ItemFlag ActorRefillBombs::vfunc_b4() { +ARM ItemFlag ActorRefillBombs::GetAmmoItem() { return ItemFlag_BombBag; } @@ -239,7 +239,7 @@ ARM ActorRefillBombchus::ActorRefillBombchus() : ARM ActorRefillBombchus::~ActorRefillBombchus() {} -ARM ItemFlag ActorRefillBombchus::vfunc_b4() { +ARM ItemFlag ActorRefillBombchus::GetAmmoItem() { return ItemFlag_BombchuBag; } @@ -251,7 +251,7 @@ ARM ActorRefillArrows::ActorRefillArrows() : ARM ActorRefillArrows::~ActorRefillArrows() {} -ARM ItemFlag ActorRefillArrows::vfunc_b4() { +ARM ItemFlag ActorRefillArrows::GetAmmoItem() { return ItemFlag_Bow; } @@ -293,7 +293,7 @@ ARM bool ActorRefillTime::Init() { return true; } -ARM ItemFlag ActorRefillTime::vfunc_b4() { +ARM ItemFlag ActorRefillTime::GetAmmoItem() { return ItemFlag_None; } @@ -335,6 +335,6 @@ ARM bool ActorLSTM::Init() { return true; } -ARM ItemFlag ActorLSTM::vfunc_b4() { +ARM ItemFlag ActorLSTM::GetAmmoItem() { return ItemFlag_None; } |
