AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-18 01:25:24 +00:00
Code Issues Projects Releases Wiki Activity

RuntimeCommon: Use override where applicable

Browse Source 
Continues the override modernization by applying it to the main
RuntimeCommon target. Resolves around 1100+ cases where override can be
used.
This commit is contained in:
Lioncash
2019-08-09 15:46:49 -04:00
parent 5eaa7a23e8
commit 9312eef905
86 changed files with 1173 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Runtime/MP1/World/CEyeball.hpp
View File

@@ -42,21 +42,21 @@ public:
CAssetId beamPulseFxId, CAssetId beamTextureId, CAssetId beamGlowTextureId, u32 anim0, u32 anim1, u32 anim2,
u32 anim3, u32 beamSfx, bool attackDisabled, const CActorParameters& actParms);
void Accept(IVisitor& visitor);
void PreRender(CStateManager&, const zeus::CFrustum&);
void Touch(CActor&, CStateManager&){};
void Death(CStateManager&, const zeus::CVector3f&, EScriptObjectState);
void Accept(IVisitor& visitor) override;
void PreRender(CStateManager&, const zeus::CFrustum&) override;
void Touch(CActor&, CStateManager&) override {}
void Death(CStateManager&, const zeus::CVector3f&, EScriptObjectState) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
void DoUserAnimEvent(CStateManager&, const CInt32POINode&, EUserEventType, float);
void Think(float, CStateManager&);
void Flinch(CStateManager&, EStateMsg, float);
void Active(CStateManager&, EStateMsg, float);
void InActive(CStateManager&, EStateMsg, float);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void DoUserAnimEvent(CStateManager&, const CInt32POINode&, EUserEventType, float) override;
void Think(float, CStateManager&) override;
void Flinch(CStateManager&, EStateMsg, float) override;
void Active(CStateManager&, EStateMsg, float) override;
void InActive(CStateManager&, EStateMsg, float) override;
void Cover(CStateManager&, EStateMsg, float);
void Cover(CStateManager&, EStateMsg, float) override;
bool ShouldAttack(CStateManager&, float) { return x60c_26_alert; }
bool ShouldFire(CStateManager&, float) { return !x60c_27_attackDisabled; }
bool ShouldAttack(CStateManager&, float) override { return x60c_26_alert; }
bool ShouldFire(CStateManager&, float) override { return !x60c_27_attackDisabled; }
};
} // namespace urde::MP1