PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-12 10:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert override removal

Browse Source 
Former-commit-id: b6ddfcfc35
This commit is contained in:
Luke Street
2023-02-06 12:01:01 -05:00
parent 03f6f75516
commit 9b99045882
148 changed files with 1030 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/MetroidPrime/ScriptObjects/CScriptTrigger.hpp
View File

@@ -60,15 +60,15 @@ public:
uint triggerFlags, bool active, bool deactivateOnEntered, bool deactivateOnExited);
~CScriptTrigger();
void Touch(CActor&, CStateManager&);
void Touch(CActor&, CStateManager&) override;
CAABox GetTriggerBoundsWR() const;
rstl::optional_object<CAABox> GetTouchBounds() const;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
rstl::optional_object<CAABox> GetTouchBounds() const override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
void UpdateInhabitants(float, CStateManager&);
const rstl::list<CObjectTracker>& GetInhabitants() const;
const CScriptTrigger::CObjectTracker* FindObject(TUniqueId);
void Accept(IVisitor& visitor);
void Accept(IVisitor& visitor) override;
virtual void InhabitantAdded(CActor&, CStateManager&);
virtual void InhabitantIdle(CActor&, CStateManager&);
virtual void InhabitantExited(CActor&, CStateManager&);