PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-11 18:23:59 +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

12
include/MetroidPrime/ScriptObjects/CScriptPickup.hpp
View File

@@ -31,12 +31,12 @@ public:
float startDelay, bool active);
~CScriptPickup();
void Think(float, CStateManager&);
void Touch(CActor&, CStateManager&);
rstl::optional_object< CAABox > GetTouchBounds() const;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
void Render(const CStateManager&) const;
void Accept(IVisitor& visitor);
void Think(float, CStateManager&) override;
void Touch(CActor&, CStateManager&) override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void Render(const CStateManager&) const override;
void Accept(IVisitor& visitor) override;
float GetPossibility() const;
CPlayerState::EItemType GetItem() const;