Skip to content

Commit 8e588c2

Browse files
authored
Merge pull request #156 from TingleDinkle/cleanup/remove-redundant-virtual
style: clean up redundant virtual
2 parents 17fb613 + a674acc commit 8e588c2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Game/Damage/dmgStruct20.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Struct20 : public Struct20Base {
3232

3333
void reset() override;
3434

35-
__attribute__((noinline)) virtual void combineMaybe(Struct20Base* other) override;
35+
__attribute__((noinline)) void combineMaybe(Struct20Base* other) override;
3636

3737
// Unknown which fields belong in Struct20 vs Struct20Base
3838
u32 mField_8 = 0;

src/KingSystem/World/worldShootingStarMgr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ namespace ksys::world {
1010
class ShootingStarMgr : public Job {
1111
public:
1212
ShootingStarMgr();
13-
virtual ~ShootingStarMgr();
13+
~ShootingStarMgr() override;
1414

1515
JobType getType() const override { return JobType::ShootingStar; }
1616

17-
virtual void init_(sead::Heap* heap) override;
18-
virtual void calc_() override;
17+
void init_(sead::Heap* heap) override;
18+
void calc_() override;
1919
virtual void reset();
2020

2121
static void setScheduled(bool enable);

0 commit comments

Comments
 (0)