summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Zhao <44533763+Pistonight@users.noreply.github.com>2026-02-15 23:43:05 -0800
committerGitHub <noreply@github.com>2026-02-15 23:43:05 -0800
commit8e588c214e1e0f68597a598f2d2330426b6bc58d (patch)
tree2e12ecb02ce7a055ca5aa4eced75a4a0ac57f832
parent17fb613901b329d972b6c1b4cfb6a40700e65454 (diff)
parenta674accb3c6fbf2987a4994b368bda7fb9e8da3f (diff)
Merge pull request #156 from TingleDinkle/cleanup/remove-redundant-virtual
style: clean up redundant virtual
-rw-r--r--src/Game/Damage/dmgStruct20.h2
-rw-r--r--src/KingSystem/World/worldShootingStarMgr.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Game/Damage/dmgStruct20.h b/src/Game/Damage/dmgStruct20.h
index 84c502c2..e3601caf 100644
--- a/src/Game/Damage/dmgStruct20.h
+++ b/src/Game/Damage/dmgStruct20.h
@@ -32,7 +32,7 @@ public:
void reset() override;
- __attribute__((noinline)) virtual void combineMaybe(Struct20Base* other) override;
+ __attribute__((noinline)) void combineMaybe(Struct20Base* other) override;
// Unknown which fields belong in Struct20 vs Struct20Base
u32 mField_8 = 0;
diff --git a/src/KingSystem/World/worldShootingStarMgr.h b/src/KingSystem/World/worldShootingStarMgr.h
index c5ea57c8..49cc7ebd 100644
--- a/src/KingSystem/World/worldShootingStarMgr.h
+++ b/src/KingSystem/World/worldShootingStarMgr.h
@@ -10,12 +10,12 @@ namespace ksys::world {
class ShootingStarMgr : public Job {
public:
ShootingStarMgr();
- virtual ~ShootingStarMgr();
+ ~ShootingStarMgr() override;
JobType getType() const override { return JobType::ShootingStar; }
- virtual void init_(sead::Heap* heap) override;
- virtual void calc_() override;
+ void init_(sead::Heap* heap) override;
+ void calc_() override;
virtual void reset();
static void setScheduled(bool enable);