diff options
| author | Aetias <aetias@outlook.com> | 2025-02-03 23:43:43 +0100 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2025-02-03 23:43:43 +0100 |
| commit | 2bd1bbd10b1ba5a595372a3313e80e4274a4e912 (patch) | |
| tree | 49de846e0516c9490ea31fd14a867cc14253f7e4 /include/Player | |
| parent | 81ac231ddf4c05c01ced962aa0029a6e49ca8032 (diff) | |
Declare all overriden virtual functions as `virtual`
Diffstat (limited to 'include/Player')
| -rw-r--r-- | include/Player/Battle/PlayerBattleLinkControlData.hpp | 36 | ||||
| -rw-r--r-- | include/Player/LinkStateCutscene.hpp | 8 | ||||
| -rw-r--r-- | include/Player/PlayerLink.hpp | 34 | ||||
| -rw-r--r-- | include/Player/PlayerLinkBase.hpp | 32 |
4 files changed, 55 insertions, 55 deletions
diff --git a/include/Player/Battle/PlayerBattleLinkControlData.hpp b/include/Player/Battle/PlayerBattleLinkControlData.hpp index 5c895618..f3f9deaf 100644 --- a/include/Player/Battle/PlayerBattleLinkControlData.hpp +++ b/include/Player/Battle/PlayerBattleLinkControlData.hpp @@ -24,24 +24,24 @@ public: /* 247 */ unk8 mUnk_247; /* 248 */ - /* 04 */ ~PlayerBattleLinkControlData() override; - /* 10 */ unk32 GetCharacterId() override; - /* 14 */ void vfunc_14(s32 param1) override; - /* 18 */ void vfunc_18() override; - /* 20 */ void vfunc_20() override; - /* 2c */ void vfunc_2c() override; - /* 30 */ void vfunc_30() override; - /* 38 */ void vfunc_38(s32 param1, s32 param2) override; - /* 3c */ void vfunc_3c(s32 param1, s32 param2) override; - /* 40 */ void vfunc_40(u16 *param1, Vec3p *param2, unk32 param3, char param4) override; - /* 44 */ void vfunc_44(unk32 param1, unk32 *param2, unk32 param3, unk16 param4) override; - /* 4c */ void vfunc_4c(unk32 param1, Vec3p *param2) override; - /* 60 */ void vfunc_60(unk32 param1, unk32 param2, s32 param3) override; - /* 64 */ void vfunc_64(u32 param1) override; - /* 68 */ void vfunc_68(unk32 param1, unk32 param2) override; - /* 6c */ void vfunc_6c(s32 param1, Vec3p *param2) override; - /* 70 */ void vfunc_70(s32 param1) override; - /* 80 */ void vfunc_80(s32 param1) override; + /* 04 */ virtual ~PlayerBattleLinkControlData() override; + /* 10 */ virtual unk32 GetCharacterId() override; + /* 14 */ virtual void vfunc_14(s32 param1) override; + /* 18 */ virtual void vfunc_18() override; + /* 20 */ virtual void vfunc_20() override; + /* 2c */ virtual void vfunc_2c() override; + /* 30 */ virtual void vfunc_30() override; + /* 38 */ virtual void vfunc_38(s32 param1, s32 param2) override; + /* 3c */ virtual void vfunc_3c(s32 param1, s32 param2) override; + /* 40 */ virtual void vfunc_40(u16 *param1, Vec3p *param2, unk32 param3, char param4) override; + /* 44 */ virtual void vfunc_44(unk32 param1, unk32 *param2, unk32 param3, unk16 param4) override; + /* 4c */ virtual void vfunc_4c(unk32 param1, Vec3p *param2) override; + /* 60 */ virtual void vfunc_60(unk32 param1, unk32 param2, s32 param3) override; + /* 64 */ virtual void vfunc_64(u32 param1) override; + /* 68 */ virtual void vfunc_68(unk32 param1, unk32 param2) override; + /* 6c */ virtual void vfunc_6c(s32 param1, Vec3p *param2) override; + /* 70 */ virtual void vfunc_70(s32 param1) override; + /* 80 */ virtual void vfunc_80(s32 param1) override; /* 84 */ PlayerBattleLinkControlData(); diff --git a/include/Player/LinkStateCutscene.hpp b/include/Player/LinkStateCutscene.hpp index b676b035..224350fd 100644 --- a/include/Player/LinkStateCutscene.hpp +++ b/include/Player/LinkStateCutscene.hpp @@ -14,10 +14,10 @@ public: /* 20 */ unk32 mUnk_20; /* 24 */ - /* 00 */ ~UnkStruct_ov004_0210abb8() override; - /* 08 */ void vfunc_08(unk32 param1) override; - /* 24 */ void vfunc_24(unk32 param1) override; - /* 2c */ unk32 vfunc_2c(s32 param1) override; + /* 00 */ virtual ~UnkStruct_ov004_0210abb8() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 24 */ virtual void vfunc_24(unk32 param1) override; + /* 2c */ virtual unk32 vfunc_2c(s32 param1) override; /* 34 */ }; diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp index 08f37469..51429cea 100644 --- a/include/Player/PlayerLink.hpp +++ b/include/Player/PlayerLink.hpp @@ -21,23 +21,23 @@ public: /* 81 */ unk8 mUnk_81[0x3]; /* 84 */ - /* 00 */ s32 GetMaxHealth() override; - /* 04 */ bool vfunc_04() override; - /* 1c */ void Init() override; - /* 24 */ void UpdatePos() override; - /* 2c */ void vfunc_2c(s32 param1, unk8 param2) override; - /* 40 */ void AddHealth(s16 amount) override; - /* 44 */ void vfunc_44() override; - /* 48 */ void vfunc_48() override; - /* 4c */ void vfunc_4c() override; - /* 50 */ ~PlayerLink() override; - /* 68 */ void vfunc_68() override; - /* 6c */ void vfunc_6c() override; - /* 74 */ void vfunc_74() override; - /* 78 */ unk32 vfunc_78() override; - /* 7c */ void vfunc_7c() override; - /* 80 */ void SetUnk_5e() override; - /* 84 */ void ResetUnk_5e() override; + /* 00 */ virtual s32 GetMaxHealth() override; + /* 04 */ virtual bool vfunc_04() override; + /* 1c */ virtual void Init() override; + /* 24 */ virtual void UpdatePos() override; + /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) override; + /* 40 */ virtual void AddHealth(s16 amount) override; + /* 44 */ virtual void vfunc_44() override; + /* 48 */ virtual void vfunc_48() override; + /* 4c */ virtual void vfunc_4c() override; + /* 50 */ virtual ~PlayerLink() override; + /* 68 */ virtual void vfunc_68() override; + /* 6c */ virtual void vfunc_6c() override; + /* 74 */ virtual void vfunc_74() override; + /* 78 */ virtual unk32 vfunc_78() override; + /* 7c */ virtual void vfunc_7c() override; + /* 80 */ virtual void SetUnk_5e() override; + /* 84 */ virtual void ResetUnk_5e() override; /* 88 */ virtual void OnDeath(bool param1); /* 8c */ diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp index 4732e63f..2a208365 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerLinkBase.hpp @@ -45,22 +45,22 @@ public: /* 6c */ DebugHierarchy *mDebugHierarchy_2; /* 70 */ - /* 00 */ s32 GetMaxHealth() override; - /* 08 */ ItemFlag GetEquipId() override; - /* 0c */ bool CanMove() override; - /* 10 */ void vfunc_10(Cylinder *param1) override; - /* 14 */ void vfunc_14(Cylinder *param1) override; - /* 18 */ void vfunc_18(s32 param1) override; - /* 1c */ void Init() override; - /* 20 */ void vfunc_20() override; - /* 24 */ void UpdatePos() override; - /* 28 */ void vfunc_28(s32 param1) override; - /* 2c */ void vfunc_2c(s32 param1, unk8 param2) override; - /* 30 */ bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) override; - /* 34 */ bool Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) override; - /* 38 */ bool TeleportToEntrance(unk32 entranceId, bool param2) override; - /* 3c */ bool TeleportToLastEntrance(bool param1) override; - /* 50 */ ~PlayerLinkBase() override; + /* 00 */ virtual s32 GetMaxHealth() override; + /* 08 */ virtual ItemFlag GetEquipId() override; + /* 0c */ virtual bool CanMove() override; + /* 10 */ virtual void vfunc_10(Cylinder *param1) override; + /* 14 */ virtual void vfunc_14(Cylinder *param1) override; + /* 18 */ virtual void vfunc_18(s32 param1) override; + /* 1c */ virtual void Init() override; + /* 20 */ virtual void vfunc_20() override; + /* 24 */ virtual void UpdatePos() override; + /* 28 */ virtual void vfunc_28(s32 param1) override; + /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) override; + /* 30 */ virtual bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) override; + /* 34 */ virtual bool Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) override; + /* 38 */ virtual bool TeleportToEntrance(unk32 entranceId, bool param2) override; + /* 3c */ virtual bool TeleportToLastEntrance(bool param1) override; + /* 50 */ virtual ~PlayerLinkBase() override; /* 58 */ virtual bool vfunc_58(); /* 5c */ virtual bool vfunc_5c(); /* 60 */ virtual bool vfunc_60(); |
