mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-02 11:55:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename EquipCollidesWith, Cylinder::Overlaps

Browse Source
This commit is contained in:
Aetias
2024-05-23 18:52:36 +02:00
parent 502425ad80
commit c779b21215
32 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Item/ItemManager.hpp
+1 -1
View File
@@ -251,7 +251,7 @@ public:
void Sword_vfunc_38(unk32 param1);
void Shield_vfunc_38(unk32 param1);
void EquipItem_vfunc_38(unk32 param1);
bool EquipItem_vfunc_3c(Vec4p *param1, ItemFlag equipId);
bool EquipCollidesWith(Cylinder *cylinder, ItemFlag equipId);
void EquipItem_vfunc_2c(ItemFlag equipId);
EquipItem* GetEquipItem(ItemFlag equipId);
bool func_ov00_020ad790(unk32 param1);
include/Physics/Cylinder.hpp
+2
View File
@@ -8,4 +8,6 @@
struct Cylinder {
Vec3p pos;
q20 size; // height and radius
bool Overlaps(Cylinder *other);
};
include/Player/EquipHammer.hpp
+1 -1
View File
@@ -31,7 +31,7 @@ public:
/* 2c */ virtual unk32 vfunc_2c() override; // func_ov59_02198fcc
/* 30 */ virtual void vfunc_30() override; // func_ov59_02198e6c
/* 38 */ virtual void vfunc_38(unk32 param1) override; // func_0v59_02198fc8
/* 3c */ virtual bool vfunc_3c(Vec4p *param1) const override; // func_ov14_0213ee10
/* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const override; // func_ov14_0213ee10
/* 4c */ virtual s32 vfunc_4c() const override; // func_ov14_0213eea8
/* 50 */
};
include/Player/EquipItem.hpp
+2 -1
View File
@@ -4,6 +4,7 @@
#include "global.h"
#include "Item/Item.hpp"
#include "Physics/Cylinder.hpp"
#include "System/SysNew.hpp"
class EquipItem : public SysObject {
@@ -33,7 +34,7 @@ public:
/* 30 */ virtual void vfunc_30() = 0;
/* 34 */ virtual void vfunc_34(unk16 *param1); // func_ov00_020be96c
/* 38 */ virtual void vfunc_38(unk32 param1) = 0;
/* 3c */ virtual bool vfunc_3c(Vec4p *param1) const; // func_ov00_020beb90
/* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const; // func_ov00_020beb90
/* 40 */ virtual unk32 vfunc_40() const; // func_ov00_020be970
/* 44 */ virtual unk32 vfunc_44(unk32 param1) const; // func_ov00_020be978
/* 48 */ virtual unk32 vfunc_48(unk32 param1) const; // func_ov00_020be980
include/Player/EquipShield.hpp
+1 -1
View File
@@ -30,6 +30,6 @@ public:
/* 30 */ virtual void vfunc_30() override; // func_ov00_020c0804
/* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov00_020c086c
/* 3c */ virtual bool vfunc_3c(Vec4p *param1) const; // func_ov00_020c0a88
/* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const; // func_ov00_020c0a88
/* 50 */
};
include/Player/EquipSword.hpp
+1 -1
View File
@@ -53,6 +53,6 @@ public:
/* 2c */ virtual u32 vfunc_2c() override; // func_ov00_020c0674
/* 30 */ virtual void vfunc_30() override; // func_ov00_020bf538
/* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov00_020bff94
/* 3c */ virtual bool vfunc_3c(Vec4p *param1) const override; // func_ov00_020c01dc
/* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const override; // func_ov00_020c01dc
/* 50 */
};
include/Player/PlayerBase.hpp
+1 -1
View File
@@ -55,7 +55,7 @@ public:
bool func_ov00_020a7c00(s32 param1);
bool CollidesWith(Cylinder *cylinder);
bool func_ov00_020a7c60(Vec3p *param1, Vec3p *param2, s32 param3);
void EquipItem_vfunc_3c(Cylinder *cylinder, ItemFlag equipId);
bool EquipCollidesWith(Cylinder *cylinder, ItemFlag equipId);
void EquipItem_vfunc_2c();
void SetHealth(s16 health);
};
include/lib/math.h
-1
View File
@@ -63,4 +63,3 @@ extern "C" u32 FastDivide(u32 a, u32 b);
extern "C" u32 Divide(u32 a, u32 b);
extern "C" bool Approach(unk32 *src, unk32 dest, unk32 step);
extern "C" bool Approach_thunk(unk32 *src, unk32 dest, unk32 step);
extern "C" bool func_01ffec34(Vec4p *param1, Vec4p *param2);