PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-13 14:06:07 +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

26
include/MetroidPrime/CCollisionActor.hpp
View File

@@ -30,26 +30,26 @@ public:
float mass);
// CEntity
~CCollisionActor() override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
~CCollisionActor();
void Accept(IVisitor& visitor);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
// CActor
CHealthInfo* HealthInfo(CStateManager&) override;
const CDamageVulnerability* GetDamageVulnerability() const override;
CHealthInfo* HealthInfo(CStateManager&);
const CDamageVulnerability* GetDamageVulnerability() const;
const CDamageVulnerability* GetDamageVulnerability(const CVector3f&, const CVector3f&,
const CDamageInfo&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override;
CVector3f GetOrbitPosition(const CStateManager&) const override;
CVector3f GetScanObjectIndicatorPosition(const CStateManager&) const override;
const CDamageInfo&) const;
rstl::optional_object< CAABox > GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
CVector3f GetOrbitPosition(const CStateManager&) const;
CVector3f GetScanObjectIndicatorPosition(const CStateManager&) const;
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
int /*EProjectileAttrib?*/) const override;
void OnScanStateChange(EScanState, CStateManager&) override;
int /*EProjectileAttrib?*/) const;
void OnScanStateChange(EScanState, CStateManager&);
// CPhysicsActor
CTransform4f GetPrimitiveTransform() const override;
CTransform4f GetPrimitiveTransform() const;
private:
EPrimitiveType x258_primitiveType;