PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-11 17:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match & link CScriptPickup

Browse Source 
Former-commit-id: a7cefd7c4b
This commit is contained in:
Luke Street
2022-10-08 01:12:48 -04:00
parent 3cbf350f85
commit dbd1477d01
9 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/MetroidPrime/Player/CPlayer.hpp
View File

@@ -140,7 +140,8 @@ public:
// CPhysicsActor
const CCollisionPrimitive* GetCollisionPrimitive() const override;
CTransform4f GetPrimitiveTransform() const override;
void CollidedWith(TUniqueId id, const CCollisionInfoList& list, CStateManager& mgr) override;
void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list,
CStateManager& mgr) override;
f32 GetStepDownHeight() const override;
f32 GetStepUpHeight() const override;
f32 GetWeight() const override;
@@ -172,7 +173,7 @@ public:
ESurfaceRestraints GetSurfaceRestraint() const {
return x2b0_outOfWaterTicks == 2 ? GetCurrentSurfaceRestraint() : kSR_Water;
}
TUniqueId GetOrbitTargetId() const { return x310_orbitTargetId; }
TUniqueId GetOrbitNextTargetId() const { return x33c_orbitNextTargetId; }
TUniqueId GetScanningObjectId() const { return x3b4_scanningObject; }