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

const bool fixes, remove override define

Browse Source 
Former-commit-id: 72256e77a5
This commit is contained in:
Phillip Stephens
2023-02-05 23:21:28 -08:00
parent f29f76abb5
commit 38b824cda0
296 changed files with 1192 additions and 1199 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&) override;
void Touch(CActor&, CStateManager&);
CAABox GetTriggerBoundsWR() const;
rstl::optional_object<CAABox> GetTouchBounds() const override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
rstl::optional_object<CAABox> GetTouchBounds() const;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
void UpdateInhabitants(float, CStateManager&);
const rstl::list<CObjectTracker>& GetInhabitants() const;
const CScriptTrigger::CObjectTracker* FindObject(TUniqueId);
void Accept(IVisitor& visitor) override;
void Accept(IVisitor& visitor);
virtual void InhabitantAdded(CActor&, CStateManager&);
virtual void InhabitantIdle(CActor&, CStateManager&);
virtual void InhabitantExited(CActor&, CStateManager&);