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

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

@@ -117,8 +117,8 @@ public:
// CEntity
~CPlayer() 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
@@ -142,9 +142,9 @@ public:
CTransform4f GetPrimitiveTransform() const override;
void CollidedWith(const TUniqueId& id, const CCollisionInfoList& list,
CStateManager& mgr) override;
f32 GetStepDownHeight() const override;
f32 GetStepUpHeight() const override;
f32 GetWeight() const override;
float GetStepDownHeight() const override;
float GetStepUpHeight() const override;
float GetWeight() const override;
// CPlayer
virtual bool IsTransparent();
@@ -186,163 +186,163 @@ public:
private:
struct CVisorSteam {
f32 x0_curTargetAlpha;
f32 x4_curAlphaInDur;
f32 x8_curAlphaOutDur;
float x0_curTargetAlpha;
float x4_curAlphaInDur;
float x8_curAlphaOutDur;
CAssetId xc_tex;
f32 x10_nextTargetAlpha;
f32 x14_nextAlphaInDur;
f32 x18_nextAlphaOutDur;
float x10_nextTargetAlpha;
float x14_nextAlphaInDur;
float x18_nextAlphaOutDur;
CAssetId x1c_txtr;
f32 x20_alpha;
f32 x24_delayTimer;
float x20_alpha;
float x24_delayTimer;
bool x28_affectsThermal;
public:
CVisorSteam(f32 targetAlpha, f32 alphaInDur, f32 alphaOutDur, CAssetId tex)
CVisorSteam(float targetAlpha, float alphaInDur, float alphaOutDur, CAssetId tex)
: x0_curTargetAlpha(targetAlpha)
, x4_curAlphaInDur(alphaInDur)
, x8_curAlphaOutDur(alphaOutDur)
, xc_tex(tex) {}
CAssetId GetTextureId() const;
void SetSteam(f32 targetAlpha, f32 alphaInDur, f32 alphaOutDur, CAssetId txtr,
void SetSteam(float targetAlpha, float alphaInDur, float alphaOutDur, CAssetId txtr,
bool affectsThermal);
void Update(f32 dt);
f32 GetAlpha() const { return x20_alpha; }
void Update(float dt);
float GetAlpha() const { return x20_alpha; }
bool AffectsThermal() const { return x28_affectsThermal; }
};
NPlayer::EPlayerMovementState x258_movementState;
rstl::vector< CToken > x25c_ballTransitionsRes;
TUniqueId x26c_attachedActor;
f32 x270_attachedActorTime;
float x270_attachedActorTime;
CPlayerEnergyDrain x274_energyDrain;
f32 x288_startingJumpTimeout;
f32 x28c_sjTimer;
f32 x290_minJumpTimeout;
f32 x294_jumpCameraTimer;
float x288_startingJumpTimeout;
float x28c_sjTimer;
float x290_minJumpTimeout;
float x294_jumpCameraTimer;
uint x298_jumpPresses;
f32 x29c_fallCameraTimer;
f32 x2a0_;
float x29c_fallCameraTimer;
float x2a0_;
bool x2a4_cancelCameraPitch;
f32 x2a8_timeSinceJump;
float x2a8_timeSinceJump;
ESurfaceRestraints x2ac_surfaceRestraint;
uint x2b0_outOfWaterTicks;
rstl::reserved_vector< f32, 6 > x2b4_accelerationTable;
rstl::reserved_vector< float, 6 > x2b4_accelerationTable;
uint x2d0_curAcceleration;
f32 x2d4_accelerationChangeTimer;
float x2d4_accelerationChangeTimer;
CAABox x2d8_fpBounds;
f32 x2f0_ballTransHeight;
float x2f0_ballTransHeight;
EPlayerCameraState x2f4_cameraState;
EPlayerMorphBallState x2f8_morphBallState;
EPlayerMorphBallState x2fc_spawnedMorphBallState;
f32 x300_fallingTime;
float x300_fallingTime;
EPlayerOrbitState x304_orbitState;
EPlayerOrbitType x308_orbitType;
EPlayerOrbitRequest x30c_orbitRequest;
TUniqueId x310_orbitTargetId;
CVector3f x314_orbitPoint;
CVector3f x320_orbitVector;
f32 x32c_orbitModeTimer;
float x32c_orbitModeTimer;
EPlayerZoneInfo x330_orbitZoneMode;
EPlayerZoneType x334_orbitType;
uint x338_;
TUniqueId x33c_orbitNextTargetId;
bool m_deferredOrbitObject;
f32 x340_;
float x340_;
rstl::vector< TUniqueId > x344_nearbyOrbitObjects;
rstl::vector< TUniqueId > x354_onScreenOrbitObjects;
rstl::vector< TUniqueId > x364_offScreenOrbitObjects;
bool x374_orbitLockEstablished;
f32 x378_orbitPreventionTimer;
float x378_orbitPreventionTimer;
bool x37c_sidewaysDashing;
f32 x380_strafeInputAtDash;
f32 x384_dashTimer;
f32 x388_dashButtonHoldTime;
float x380_strafeInputAtDash;
float x384_dashTimer;
float x388_dashButtonHoldTime;
bool x38c_doneSidewaysDashing;
uint x390_orbitSource;
bool x394_orbitingEnemy;
f32 x398_dashSpeedMultiplier;
float x398_dashSpeedMultiplier;
bool x39c_noStrafeDashBlend;
f32 x3a0_dashDuration;
f32 x3a4_strafeDashBlendDuration;
float x3a0_dashDuration;
float x3a4_strafeDashBlendDuration;
EPlayerScanState x3a8_scanState;
f32 x3ac_scanningTime;
f32 x3b0_curScanTime;
float x3ac_scanningTime;
float x3b0_curScanTime;
TUniqueId x3b4_scanningObject;
EGrappleState x3b8_grappleState;
f32 x3bc_grappleSwingTimer;
float x3bc_grappleSwingTimer;
CVector3f x3c0_grappleSwingAxis;
f32 x3cc_;
f32 x3d0_;
f32 x3d4_;
f32 x3d8_grappleJumpTimeout;
float x3cc_;
float x3d0_;
float x3d4_;
float x3d8_grappleJumpTimeout;
bool x3dc_inFreeLook;
bool x3dd_lookButtonHeld;
bool x3de_lookAnalogHeld;
f32 x3e0_curFreeLookCenteredTime;
f32 x3e4_freeLookYawAngle;
f32 x3e8_horizFreeLookAngleVel;
f32 x3ec_freeLookPitchAngle;
f32 x3f0_vertFreeLookAngleVel;
float x3e0_curFreeLookCenteredTime;
float x3e4_freeLookYawAngle;
float x3e8_horizFreeLookAngleVel;
float x3ec_freeLookPitchAngle;
float x3f0_vertFreeLookAngleVel;
TUniqueId x3f4_aimTarget;
CVector3f x3f8_targetAimPosition;
TReservedAverage< CVector3f, 10 > x404_aimTargetAverage;
CVector3f x480_assistedTargetAim;
f32 x48c_aimTargetTimer;
float x48c_aimTargetTimer;
rstl::single_ptr< CPlayerGun > x490_gun;
f32 x494_gunAlpha;
float x494_gunAlpha;
EGunHolsterState x498_gunHolsterState;
f32 x49c_gunHolsterRemTime;
float x49c_gunHolsterRemTime;
rstl::single_ptr< CFailsafeTest > x4a0_failsafeTest;
TReservedAverage< f32, 20 > x4a4_moveSpeedAvg;
f32 x4f8_moveSpeed;
f32 x4fc_flatMoveSpeed;
TReservedAverage< float, 20 > x4a4_moveSpeedAvg;
float x4f8_moveSpeed;
float x4fc_flatMoveSpeed;
CVector3f x500_lookDir;
CVector3f x50c_moveDir;
CVector3f x518_leaveMorphDir;
CVector3f x524_lastPosForDirCalc;
CVector3f x530_gunDir;
f32 x53c_timeMoving;
float x53c_timeMoving;
CVector3f x540_controlDir;
CVector3f x54c_controlDirFlat;
bool x558_wasDamaged;
f32 x55c_damageAmt;
f32 x560_prevDamageAmt;
float x55c_damageAmt;
float x560_prevDamageAmt;
CVector3f x564_damageLocation;
f32 x570_immuneTimer;
f32 x574_morphTime;
f32 x578_morphDuration;
float x570_immuneTimer;
float x574_morphTime;
float x578_morphDuration;
uint x57c_;
uint x580_;
int x584_ballTransitionAnim;
f32 x588_alpha;
f32 x58c_transitionVel;
float x588_alpha;
float x58c_transitionVel;
bool x590_leaveMorphballAllowed;
TReservedAverage< CTransform4f, 4 > x594_transisionBeamXfs;
TReservedAverage< CTransform4f, 4 > x658_transitionModelXfs;
TReservedAverage< f32, 4 > x71c_transitionModelAlphas;
TReservedAverage< float, 4 > x71c_transitionModelAlphas;
rstl::vector< rstl::auto_ptr< CModelData > > x730_transitionModels;
f32 x740_staticTimer;
f32 x744_staticOutSpeed;
f32 x748_staticInSpeed;
f32 x74c_visorStaticAlpha;
f32 x750_frozenTimeout;
s32 x754_iceBreakJumps;
f32 x758_frozenTimeoutBias;
s32 x75c_additionalIceBreakJumps;
float x740_staticTimer;
float x744_staticOutSpeed;
float x748_staticInSpeed;
float x74c_visorStaticAlpha;
float x750_frozenTimeout;
int x754_iceBreakJumps;
float x758_frozenTimeoutBias;
int x75c_additionalIceBreakJumps;
bool x760_controlsFrozen;
f32 x764_controlsFrozenTimeout;
float x764_controlsFrozenTimeout;
rstl::single_ptr< CMorphBall > x768_morphball;
rstl::single_ptr< CPlayerCameraBob > x76c_cameraBob;
CSfxHandle x770_damageLoopSfx;
f32 x774_samusVoiceTimeout;
float x774_samusVoiceTimeout;
CSfxHandle x778_dashSfx;
CSfxHandle x77c_samusVoiceSfx;
int x780_samusVoicePriority;
f32 x784_damageSfxTimer;
u16 x788_damageLoopSfxId;
f32 x78c_footstepSfxTimer;
float x784_damageSfxTimer;
ushort x788_damageLoopSfxId;
float x78c_footstepSfxTimer;
EFootstepSfx x790_footstepSfxSel;
CVector3f x794_lastVelocity;
CVisorSteam x7a0_visorSteam;
@@ -354,8 +354,8 @@ private:
CPlayerState::EBeamId x7ec_beam;
rstl::single_ptr< CModelData > x7f0_ballTransitionBeamModel;
CTransform4f x7f4_gunWorldXf;
f32 x824_transitionFilterTimer;
f32 x828_distanceUnderWater;
float x824_transitionFilterTimer;
float x828_distanceUnderWater;
bool x82c_inLava;
TUniqueId x82e_ridingPlatform;
TUniqueId x830_playerHint;
@@ -389,28 +389,28 @@ private:
bool x9c6_31_overrideRadarRadius : 1;
bool x9c7_24_noDamageLoopSfx : 1;
bool x9c7_25_outOfBallLookAtHintActor : 1;
f32 x9c8_eyeZBias;
f32 x9cc_stepCameraZBias;
float x9c8_eyeZBias;
float x9cc_stepCameraZBias;
uint x9d0_bombJumpCount;
s32 x9d4_bombJumpCheckDelayFrames;
int x9d4_bombJumpCheckDelayFrames;
CVector3f x9d8_controlDirOverrideDir;
rstl::reserved_vector< TUniqueId, 5 > x9e4_orbitDisableList;
f32 x9f4_deathTime;
f32 x9f8_controlDirInterpTime;
f32 x9fc_controlDirInterpDur;
float x9f4_deathTime;
float x9f8_controlDirInterpTime;
float x9fc_controlDirInterpDur;
TUniqueId xa00_deathPowerBomb;
f32 xa04_preThinkDt;
float xa04_preThinkDt;
CAssetId xa08_steamTextureId;
CAssetId xa0c_iceTextureId;
uint xa10_envDmgCounter;
f32 xa14_envDmgCameraShakeTimer;
f32 xa18_phazonDamageLag;
f32 xa1c_threatOverride;
f32 xa20_radarXYRadiusOverride;
f32 xa24_radarZRadiusOverride;
f32 xa28_attachedActorStruggle;
float xa14_envDmgCameraShakeTimer;
float xa18_phazonDamageLag;
float xa1c_threatOverride;
float xa20_radarXYRadiusOverride;
float xa24_radarZRadiusOverride;
float xa28_attachedActorStruggle;
int xa2c_damageLoopSfxDelayTicks;
f32 xa30_samusExhaustedVoiceTimer;
float xa30_samusExhaustedVoiceTimer;
};
CHECK_SIZEOF(CPlayer, 0xa38)