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

12
include/MetroidPrime/CFlameWarp.hpp
View File

@@ -14,7 +14,7 @@ class CColor;
class CFlameWarp : public CWarp {
public:
CFlameWarp(float maxInfluenceDist, const CVector3f& warpPoint, bool collisionWarp);
~CFlameWarp() override;
~CFlameWarp();
const rstl::reserved_vector< CVector3f, 9 >& GetCollisionPoints() const {
return x4_collisionPoints;
@@ -26,14 +26,14 @@ public:
const CVector3f& GetFloatingPoint() const { return x80_floatingPoint; }
void SetMaxDistSq(float d) { x8c_maxDistSq = d; }
void SetStateManager(CStateManager& mgr) { x9c_stateMgr = &mgr; }
bool UpdateWarp() override;
bool UpdateWarp();
void ModifyParticles(int particleCount, int stripe, int*, CVector3f* particlePos,
CVector3f* particlePrevPos, CVector3f* particleVelocity,
CColor* color, float* lineLengthOrSize, float* lineWidthOrRota) override;
void Activate(bool val) override { xa0_24_activated = val; }
bool IsActivated() override;
CColor* color, float* lineLengthOrSize, float* lineWidthOrRota);
void Activate(bool val) { xa0_24_activated = val; }
bool IsActivated();
bool IsProcessed() const { return xa0_26_processed; }
FourCC Get4CharID() override;
FourCC Get4CharID();
void ResetPosition(const CVector3f& pos);
CAABox CalculateBounds() const;