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

Various rstl fixes; continue CScriptMazeNode & CScriptPlatform

Browse Source 
Former-commit-id: 7608f27ed2
This commit is contained in:
Luke Street
2022-09-18 13:51:07 -04:00
parent 0d94a5a5f3
commit f6f1040fff
25 changed files with 171 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp
View File

@@ -23,6 +23,10 @@ struct SRiders {
TUniqueId x0_uid;
f32 x4_decayTimer;
CTransform4f x8_transform;
SRiders(TUniqueId uid)
: x0_uid(uid), x4_decayTimer(1.f / 6.f), x8_transform(CTransform4f::Identity()) {}
bool operator==(const SRiders& other) const { return x0_uid == other.x0_uid; }
};
class CScriptPlatform : public CPhysicsActor {
@@ -60,6 +64,12 @@ public:
virtual void SplashThink(const CAABox&, const CFluidPlane&, float, CStateManager&) const;
virtual CQuaternion Move(float, CStateManager&);
TUniqueId GetWaypoint(CStateManager& mgr);
TUniqueId GetNext(TUniqueId uid, CStateManager& mgr);
static void AddRider(rstl::vector< SRiders >& riders, TUniqueId riderId,
const CPhysicsActor* ridee, CStateManager& mgr);
private:
TUniqueId x258_currentWaypoint;
TUniqueId x25a_targetWaypoint;