diff options
| author | Aetias <aetias@outlook.com> | 2024-05-23 18:52:36 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-05-23 18:52:36 +0200 |
| commit | c779b21215958c999d2360cd034116c2c323959a (patch) | |
| tree | 80472d6021b32639bde80d5d4a2c1f652e359504 /src | |
| parent | 502425ad80ab19d42d1af2fb90e5e141d2f2a186 (diff) | |
Rename `EquipCollidesWith`, `Cylinder::Overlaps`
Diffstat (limited to 'src')
| -rw-r--r-- | src/00_Core/Item/ItemManager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index df4dbf53..3cc1e185 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -199,14 +199,14 @@ ARM void ItemManager::EquipItem_vfunc_38(unk32 param1) { (*mEquipItems)[equip]->vfunc_38(param1);
}
-ARM bool ItemManager::EquipItem_vfunc_3c(Vec4p *param1, ItemFlag equipId) {
- Vec4p result;
- if ((*mEquipItems)[equipId]->vfunc_3c(&result)) {
+ARM bool ItemManager::EquipCollidesWith(Cylinder *hitbox, ItemFlag equipId) {
+ Cylinder equipHitbox;
+ if ((*mEquipItems)[equipId]->GetHitbox(&equipHitbox)) {
s32 step = (*mEquipItems)[equipId]->vfunc_4c();
if (step > 0) {
- Approach_thunk(&result.y, param1->y, step);
+ Approach_thunk(&equipHitbox.pos.y, hitbox->pos.y, step);
}
- return func_01ffec34(param1, &result);
+ return hitbox->Overlaps(&equipHitbox);
}
return false;
}
|