From 2bd1bbd10b1ba5a595372a3313e80e4274a4e912 Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 3 Feb 2025 23:43:43 +0100 Subject: Declare all overriden virtual functions as `virtual` --- include/Actor/Player/ActorArrow.hpp | 16 ++++++++-------- include/Actor/Player/ActorBlast.hpp | 8 ++++---- include/Actor/Player/ActorBomb.hpp | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'include/Actor/Player') diff --git a/include/Actor/Player/ActorArrow.hpp b/include/Actor/Player/ActorArrow.hpp index 031e35cc..a0ced1e3 100644 --- a/include/Actor/Player/ActorArrow.hpp +++ b/include/Actor/Player/ActorArrow.hpp @@ -35,14 +35,14 @@ public: /* 1b7 */ bool mUnk_1b7; /* 1b8 */ - /* 00 */ ~ActorArrow() override; - /* 08 */ bool vfunc_08() override; - /* 10 */ void vfunc_10(u32 param1) override; - /* 14 */ void vfunc_14(u32 param1) override; - /* 18 */ void vfunc_18(u32 param1) override; - /* 20 */ void vfunc_20(bool param1) override; - /* 44 */ bool CollidesWith(Actor *other) override; - /* 48 */ bool vfunc_48(Knockback *param1) override; + /* 00 */ virtual ~ActorArrow() override; + /* 08 */ virtual bool vfunc_08() override; + /* 10 */ virtual void vfunc_10(u32 param1) override; + /* 14 */ virtual void vfunc_14(u32 param1) override; + /* 18 */ virtual void vfunc_18(u32 param1) override; + /* 20 */ virtual void vfunc_20(bool param1) override; + /* 44 */ virtual bool CollidesWith(Actor *other) override; + /* 48 */ virtual bool vfunc_48(Knockback *param1) override; /* b4 */ static ActorArrow *Create(); diff --git a/include/Actor/Player/ActorBlast.hpp b/include/Actor/Player/ActorBlast.hpp index 8b019515..a1e8b5fe 100644 --- a/include/Actor/Player/ActorBlast.hpp +++ b/include/Actor/Player/ActorBlast.hpp @@ -18,10 +18,10 @@ public: /* 160 */ s32 mUnk_160; /* 164 */ - /* 00 */ ~ActorBlast() override; - /* 08 */ bool vfunc_08() override; - /* 14 */ void vfunc_14(u32 param1) override; - /* 18 */ void vfunc_18(u32 param1) override; + /* 00 */ virtual ~ActorBlast() override; + /* 08 */ virtual bool vfunc_08() override; + /* 14 */ virtual void vfunc_14(u32 param1) override; + /* 18 */ virtual void vfunc_18(u32 param1) override; /* b4 */ static ActorBlast *Create(); diff --git a/include/Actor/Player/ActorBomb.hpp b/include/Actor/Player/ActorBomb.hpp index cd5fa969..17538bf8 100644 --- a/include/Actor/Player/ActorBomb.hpp +++ b/include/Actor/Player/ActorBomb.hpp @@ -14,9 +14,9 @@ public: /* 0c */ unk32 mUnk_0c; /* 10 */ - /* 00 */ ~ActorBomb_Unk1() override; - /* 08 */ void vfunc_0c(unk16 *param1) override; - /* 0c */ void vfunc_10(s32 *param1) override; + /* 00 */ virtual ~ActorBomb_Unk1() override; + /* 08 */ virtual void vfunc_0c(unk16 *param1) override; + /* 0c */ virtual void vfunc_10(s32 *param1) override; /* 18 */ }; @@ -53,13 +53,13 @@ public: /* 264 */ unk8 mUnk_264[0x8]; /* 26c */ - /* 00 */ ~ActorBomb() override; - /* 08 */ bool vfunc_08() override; - /* 14 */ void vfunc_14(u32 param1) override; - /* 18 */ void vfunc_18(u32 param1) override; - /* 20 */ void vfunc_20(bool param1) override; - /* 54 */ void vfunc_54() override; - /* 5c */ bool SetVelocity(Vec3p *vel) override; + /* 00 */ virtual ~ActorBomb() override; + /* 08 */ virtual bool vfunc_08() override; + /* 14 */ virtual void vfunc_14(u32 param1) override; + /* 18 */ virtual void vfunc_18(u32 param1) override; + /* 20 */ virtual void vfunc_20(bool param1) override; + /* 54 */ virtual void vfunc_54() override; + /* 5c */ virtual bool SetVelocity(Vec3p *vel) override; /* b4 */ static ActorBomb *Create(); -- cgit v1.2.3