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

Replace int types in Retro code

Browse Source 
Retro seemingly avoided using the Dolphin
typedefs in most places, opting to use int/uint
instead. This likely means they didn't use
u8/s8/u16/s16/etc either.


Former-commit-id: 133326ae40
This commit is contained in:
Luke Street
2022-10-09 01:37:23 -04:00
parent f0ea5144ea
commit 7ca3a1c0bb
172 changed files with 1525 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ class CFluidPlane;
struct SRiders {
TUniqueId x0_uid;
f32 x4_decayTimer;
float x4_decayTimer;
CTransform4f x8_transform;
SRiders(TUniqueId uid)
@@ -33,8 +33,8 @@ class CScriptPlatform : public CPhysicsActor {
public:
CScriptPlatform(
TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf,
const CModelData& mData, const CActorParameters& actParams, const CAABox& aabb, f32 speed,
bool detectCollision, f32 xrayAlpha, bool active, const CHealthInfo& hInfo,
const CModelData& mData, const CActorParameters& actParams, const CAABox& aabb, float speed,
bool detectCollision, float xrayAlpha, bool active, const CHealthInfo& hInfo,
const CDamageVulnerability& dVuln,
const rstl::optional_object< TLockedToken< CCollidableOBBTreeGroupContainer > >& dcln,
bool rainSplashes, uint maxRainSplashes, uint rainGenRate);
@@ -42,8 +42,8 @@ public:
// CEntity
~CScriptPlatform() override;
void Accept(IVisitor& visitor) override;
void PreThink(f32 dt, CStateManager& mgr) override;
void Think(f32 dt, CStateManager& mgr) override;
void PreThink(float dt, CStateManager& mgr) override;
void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
// CActor
@@ -73,8 +73,8 @@ public:
const CPhysicsActor* ridee, CStateManager& mgr);
static TEntityList BuildNearListFromRiders(CStateManager& mgr,
const rstl::vector< SRiders >& riders);
static void DecayRiders(rstl::vector< SRiders >& riders, f32 dt, CStateManager& mgr);
static void MoveRiders(CStateManager& mgr, f32 dt, bool active, rstl::vector< SRiders >& riders,
static void DecayRiders(rstl::vector< SRiders >& riders, float dt, CStateManager& mgr);
static void MoveRiders(CStateManager& mgr, float dt, bool active, rstl::vector< SRiders >& riders,
rstl::vector< SRiders >& collidedRiders, const CTransform4f& oldXf,
const CTransform4f& newXf, const CVector3f& dragDelta,
CQuaternion rotDelta);
@@ -82,11 +82,11 @@ public:
private:
TUniqueId x258_currentWaypoint;
TUniqueId x25a_targetWaypoint;
f32 x25c_currentSpeed;
f32 x260_moveDelay;
f32 x264_collisionRecoverDelay;
f32 x268_fadeInTime;
f32 x26c_fadeOutTime;
float x25c_currentSpeed;
float x260_moveDelay;
float x264_collisionRecoverDelay;
float x268_fadeInTime;
float x26c_fadeOutTime;
CVector3f x270_dragDelta;
CQuaternion x27c_rotDelta;
CHealthInfo x28c_initialHealth;
@@ -97,7 +97,7 @@ private:
rstl::vector< SRiders > x318_riders;
rstl::vector< SRiders > x328_slavesStatic;
rstl::vector< SRiders > x338_slavesDynamic;
f32 x348_xrayAlpha;
float x348_xrayAlpha;
uint x34c_maxRainSplashes;
uint x350_rainGenRate;
TUniqueId x354_boundsTrigger;