diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2024-10-19 13:20:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 13:20:17 +0200 |
| commit | ffdfd609fb9bc8f968ddc6f187da1d50731cbf69 (patch) | |
| tree | d13b6142759bc78d50a491d87de56e7e9213c9a4 /include/Player/PlayerBase.hpp | |
| parent | 32c4725191813003e34a263a6d1530f806d1ac7c (diff) | |
| parent | 10c2e3413b3244c5f2adffac1140f37920f13988 (diff) | |
Merge pull request #51 from AetiasHax/dsd
`dsd` integration
Diffstat (limited to 'include/Player/PlayerBase.hpp')
| -rw-r--r-- | include/Player/PlayerBase.hpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index 0b6a5187..578f3e27 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -4,10 +4,9 @@ #include "types.h" #include "Item/Item.hpp" -#include "Player/EquipSword.hpp" -#include "Player/EquipShield.hpp" - #include "Physics/Cylinder.hpp" +#include "Player/EquipShield.hpp" +#include "Player/EquipSword.hpp" #include "Render/FadeControl.hpp" #include "System/SysNew.hpp" @@ -28,14 +27,14 @@ public: /* 04 */ virtual bool vfunc_04(); /* 08 */ virtual ItemFlag GetEquipId(); /* 0c */ virtual bool CanMove(); - /* 10 */ virtual void vfunc_10(Cylinder *param1) = 0; - /* 14 */ virtual void vfunc_14(Cylinder *param1) = 0; - /* 18 */ virtual void vfunc_18() = 0; - /* 1c */ virtual void Init() = 0; - /* 20 */ virtual void vfunc_20() = 0; - /* 24 */ virtual void vfunc_24() = 0; - /* 28 */ virtual void vfunc_28(s32 param1) = 0; - /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) = 0; + /* 10 */ virtual void vfunc_10(Cylinder *param1) = 0; + /* 14 */ virtual void vfunc_14(Cylinder *param1) = 0; + /* 18 */ virtual void vfunc_18() = 0; + /* 1c */ virtual void Init() = 0; + /* 20 */ virtual void vfunc_20() = 0; + /* 24 */ virtual void vfunc_24() = 0; + /* 28 */ virtual void vfunc_28(s32 param1) = 0; + /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) = 0; /* 30 */ virtual bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) = 0; /* 34 */ virtual bool Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5); /* 38 */ virtual bool TeleportToEntrance(unk32 entranceId, bool param2); @@ -49,8 +48,8 @@ public: void SetUpdatePos(bool updatePos); void SetVisible(bool visible); - EquipSword* GetEquipSword(); - EquipShield* GetEquipShield(); + EquipSword *GetEquipSword(); + EquipShield *GetEquipShield(); void LookAt(Vec3p *target); bool func_ov00_020a7c00(s32 param1); bool CollidesWith(Cylinder *cylinder); |