PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix override usage 

Former-commit-id: 989015db6a
This commit is contained in:
Henrique Gemignani Passos Lima 2022-11-08 16:23:03 +02:00
parent d6a754e555
commit 1dd0e2ad4d
40 changed files with 300 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/Kyoto/Particles/CElementGen.hpp
View File

@ -45,32 +45,32 @@ public:
EOptionalSystemFlags = kOSF_One);
~CElementGen() override;
virtual void Update(double);
virtual void Render() const;
virtual void SetOrientation(const CTransform4f& orientation);
virtual void SetTranslation(const CVector3f& translation);
virtual void SetGlobalOrientation(const CTransform4f& orientation);
virtual void SetGlobalTranslation(const CVector3f& translation);
virtual void SetGlobalScale(const CVector3f& scale);
virtual void SetLocalScale(const CVector3f& scale);
virtual void SetParticleEmission(bool emission);
virtual void SetModulationColor(const CColor& col);
virtual void SetGeneratorRate(float rate) {}
virtual const CTransform4f& GetOrientation() const;
virtual const CVector3f& GetTranslation() const;
virtual CTransform4f GetGlobalOrientation() const;
virtual CVector3f GetGlobalTranslation() const;
virtual CVector3f GetGlobalScale() const;
virtual bool GetParticleEmission() const;
virtual CColor GetModulationColor() const;
virtual bool IsSystemDeletable() const;
virtual CAABox GetBounds() const;
virtual int GetParticleCount() const;
virtual bool SystemHasLight() const;
virtual CLight GetLight();
virtual void DestroyParticles();
virtual void AddModifier(CWarp*);
virtual uint Get4CharId() const;
virtual void Update(double) override;
virtual void Render() const override;
virtual void SetOrientation(const CTransform4f& orientation) override;
virtual void SetTranslation(const CVector3f& translation) override;
virtual void SetGlobalOrientation(const CTransform4f& orientation) override;
virtual void SetGlobalTranslation(const CVector3f& translation) override;
virtual void SetGlobalScale(const CVector3f& scale) override;
virtual void SetLocalScale(const CVector3f& scale) override;
virtual void SetParticleEmission(bool emission) override;
virtual void SetModulationColor(const CColor& col) override;
virtual void SetGeneratorRate(float rate) override {}
virtual const CTransform4f& GetOrientation() const override;
virtual const CVector3f& GetTranslation() const override;
virtual CTransform4f GetGlobalOrientation() const override;
virtual CVector3f GetGlobalTranslation() const override;
virtual CVector3f GetGlobalScale() const override;
virtual bool GetParticleEmission() const override;
virtual CColor GetModulationColor() const override;
virtual bool IsSystemDeletable() const override;
virtual CAABox GetBounds() const override;
virtual int GetParticleCount() const override;
virtual bool SystemHasLight() const override;
virtual CLight GetLight() override;
virtual void DestroyParticles() override;
virtual void AddModifier(CWarp*) override;
virtual uint Get4CharId() const override;
int GetEmitterTime() const;

2
include/MetroidPrime/CErrorOutputWindow.hpp
View File

@ -12,7 +12,7 @@ public:
~CErrorOutputWindow() override;
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
bool GetIsContinueDraw() const override;
void Draw() override;
void Draw() const override;
};
#endif // _CERROROUTPUTWINDOW

2
include/MetroidPrime/CSplashScreen.hpp
View File

@ -17,7 +17,7 @@ public:
~CSplashScreen() override;
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
void Draw() override;
void Draw() const override;
};
#endif // _CSPLASHSCREEN

2
include/MetroidPrime/CStateManager.hpp
View File

@ -228,7 +228,7 @@ public:
xef4_pendingScreenTex.xc_extent = extent;
}*/
const SOnScreenTex& GetPendingScreenTex() const { return xef4_pendingScreenTex; }
float IntegrateVisorFog(float f);
float IntegrateVisorFog(float f) const;
void QuitGame() { xf94_25_quitGame = true; }
bool GetWantsToQuit() const { return xf94_25_quitGame; }

2
include/MetroidPrime/Cameras/CGameCamera.hpp
View File

@ -20,7 +20,7 @@ public:
~CGameCamera() override;
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void SetActive(bool active) override;
void SetActive(uchar active) override;
// CGameCamera
virtual void ProcessInput(const CFinalInput&, CStateManager& mgr) = 0;

2
include/MetroidPrime/Enemies/CAi.hpp
View File

@ -30,7 +30,7 @@ public:
const CDamageVulnerability* GetDamageVulnerability() const override { return nullptr; }
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
EProjectileAttrib) const override;
int) const override;
void FluidFXThink(EFluidState, CScriptWater&, CStateManager&) override;
;

2
include/MetroidPrime/ScriptObjects/CScriptActor.hpp
View File

@ -34,7 +34,7 @@ public:
// CPhysicsActor
EWeaponCollisionResponseTypes GetCollisionResponseType(const CVector3f&, const CVector3f&,
const CWeaponMode&,
EProjectileAttrib) const override;
int) const override;
CAABox GetSortingBounds(const CStateManager&) const override;
private:

4
include/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.hpp
View File

@ -14,8 +14,8 @@ public:
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) override const;
void Render(const CStateManager&) override const;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
TUniqueId GetRandomNextWaypointId(const CStateManager& mgr) const;
float GetHFov() const { return xe8_hfov; }

4
include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp
View File

@ -127,8 +127,8 @@ public:
void Think(float, CStateManager&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void PreRender(CStateManager&, const CFrustumPlanes&) override;
void AddToRenderer(const CFrustumPlanes&, CStateManager&) override;
void Render(CStateManager&) override;
void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override;
void Render(const CStateManager&) const override;
rstl::optional_object< CAABox > GetTouchBounds() const override { return x1c8_touchBounds; }
void SkipCinematic(CStateManager&);

238
include/MetroidPrime/Tweaks/CTweakGui.hpp
View File

@ -22,125 +22,125 @@ public:
kHelmet_HelmetOnly
};
float GetMapAlphaInterpolant() const override { return x8_mapAlphaInterp; }
float GetPauseBlurFactor() const override { return xc_pauseBlurFactor; }
float GetRadarXYRadius() const override { return x10_radarXYRadius; }
float GetRadarZRadius() const override { return x24_radarZRadius; }
float GetRadarZCloseRadius() const override { return x28_radarZCloseRadius; }
float GetEnergyBarFilledSpeed() const override { return x34_energyBarFilledSpeed; }
float GetEnergyBarShadowSpeed() const override { return x38_energyBarShadowSpeed; }
float GetEnergyBarDrainDelay() const override { return x3c_energyBarDrainDelay; }
bool GetEnergyBarAlwaysResetDelay() const override { return x40_energyBarAlwaysResetDelay; }
float GetHudDamagePracticalsGainConstant() const override { return x44_hudDamagePracticalsGainConstant; }
float GetHudDamagePracticalsGainLinear() const override { return x48_hudDamagePracticalsGainLinear; }
float GetHudDamagePracticalsInitConstant() const override { return x4c_hudDamagePracticalsInitConstant; }
float GetHudDamagePracticalsInitLinear() const override { return x50_hudDamagePracticalsInitLinear; }
float GetHudDamageLightSpotAngle() const override { return x54_hudDamageLightSpotAngle; }
float GetDamageLightAngleC() const override { return x58_damageLightAngleC; }
float GetDamageLightAngleL() const override { return x5c_damageLightAngleL; }
float GetDamageLightAngleQ() const override { return x60_damageLightAngleQ; }
CVector3f GetDamageLightPreTranslate() const override { return x64_damageLightPreTranslate; }
CVector3f GetDamageLightCenterTranslate() const override { return x70_damageLightCenterTranslate; }
float GetDamageLightXfXAngle() const override { return x7c_damageLightXfXAngle; }
float GetDamageLightXfZAngle() const override { return x80_damageLightXfZAngle; }
float GetHudDecoShakeTranslateVelConstant() const override { return x84_hudDecoShakeTranslateVelConstant; }
float GetHudDecoShakeTranslateVelLinear() const override { return x88_hudDecoShakeTranslateVelLinear; }
float GetMaxDecoDamageShakeTranslate() const override { return x8c_maxDecoDamageShakeTranslate; }
float GetDecoDamageShakeDeceleration() const override { return x90_decoDamageShakeDeceleration; }
float GetDecoShakeGainConstant() const override { return x94_decoShakeGainConstant; }
float GetDecoShakeGainLinear() const override { return x98_decoShakeGainLinear; }
float GetDecoShakeInitConstant() const override { return x9c_decoShakeInitConstant; }
float GetDecoShakeInitLinear() const override { return xa0_decoShakeInitLinear; }
float GetMaxDecoDamageShakeRotate() const override { return xa4_maxDecoDamageShakeRotate; }
uint GetHudCamFovTweak() const override { return xa8_hudCamFovTweak; }
uint GetHudCamYTweak() const override { return xac_hudCamYTweak; }
uint GetHudCamZTweak() const override { return xb0_hudCamZTweak; }
float GetBeamVisorMenuAnimTime() const override { return xc0_beamVisorMenuAnimTime; }
float GetVisorBeamMenuItemActiveScale() const override { return xc4_visorBeamMenuItemActiveScale; }
float GetVisorBeamMenuItemInactiveScale() const override { return xc8_visorBeamMenuItemInactiveScale; }
float GetVisorBeamMenuItemTranslate() const override { return xcc_visorBeamMenuItemTranslate; }
float GetThreatRange() const override { return xe4_threatRange; }
float GetRadarScopeCoordRadius() const override { return xe8_radarScopeCoordRadius; }
float GetRadarPlayerPaintRadius() const override { return xec_radarPlayerPaintRadius; }
float GetRadarEnemyPaintRadius() const override { return xf0_radarEnemyPaintRadius; }
float GetMissileArrowVisTime() const override { return xf4_missileArrowVisTime; }
EHudVisMode GetHudVisMode() const override { return xf8_hudVisMode; }
EHelmetVisMode GetHelmetVisMode() const override { return xfc_helmetVisMode; }
uint GetEnableAutoMapper() const override { return x100_enableAutoMapper; }
uint GetEnableTargetingManager() const override { return x108_enableTargetingManager; }
uint GetEnablePlayerVisor() const override { return x10c_enablePlayerVisor; }
float GetThreatWarningFraction() const override { return x110_threatWarningFraction; }
float GetMissileWarningFraction() const override { return x114_missileWarningFraction; }
float GetFreeLookFadeTime() const override { return x118_freeLookFadeTime; }
float GetFreeLookSfxPitchScale() const override { return x12c_freeLookSfxPitchScale; }
bool GetNoAbsoluteFreeLookSfxPitch() const override { return x130_noAbsoluteFreeLookSfxPitch; }
float GetFaceReflectionOrthoWidth() const override { return x13c_faceReflectionOrthoWidth; }
float GetFaceReflectionOrthoHeight() const override { return x140_faceReflectionOrthoHeight; }
float GetFaceReflectionDistance() const override { return x144_faceReflectionDistance; }
float GetFaceReflectionHeight() const override { return x148_faceReflectionHeight; }
float GetFaceReflectionAspect() const override { return x14c_faceReflectionAspect; }
float GetMissileWarningPulseTime() const override { return x1a0_missileWarningPulseTime; }
float GetExplosionLightFalloffMultConstant() const override { return x1a4_explosionLightFalloffMultConstant; }
float GetExplosionLightFalloffMultLinear() const override { return x1a8_explosionLightFalloffMultLinear; }
float GetExplosionLightFalloffMultQuadratic() const override { return x1ac_explosionLightFalloffMultQuadratic; }
float GetHudDamagePeakFactor() const override { return x1b4_hudDamagePeakFactor; }
float GetHudDamageFilterGainConstant() const override { return x1b8_hudDamageFilterGainConstant; }
float GetHudDamageFilterGainLinear() const override { return x1bc_hudDamageFilterGainLinear; }
float GetHudDamageFilterInitConstant() const override { return x1c0_hudDamageFilterInitConstant; }
float GetHudDamageFilterInitLinear() const override { return x1c4_hudDamageFilterInitLinear; }
float GetEnergyDrainModPeriod() const override { return x1c8_energyDrainModPeriod; }
bool GetEnergyDrainSinusoidalPulse() const override { return x1cc_energyDrainSinusoidalPulse; }
bool GetEnergyDrainFilterAdditive() const override { return x1cd_energyDrainFilterAdditive; }
float GetHudDamagePulseDuration() const override { return x1d0_hudDamagePulseDuration; }
float GetHudDamageColorGain() const override { return x1d4_hudDamageColorGain; }
float GetHudDecoShakeTranslateGain() const override { return x1d8_hudDecoShakeTranslateGain; }
float GetHudLagOffsetScale() const override { return x1dc_hudLagOffsetScale; }
float GetXrayBlurScaleLinear() const override { return x204_xrayBlurScaleLinear; }
float GetXrayBlurScaleQuadratic() const override { return x208_xrayBlurScaleQuadratic; }
float GetScanSidesAngle() const override { return x210_scanSidesAngle; }
float GetScanSidesXScale() const override { return x214_scanSidesXScale; }
float GetScanSidesPositionEnd() const override { return x218_scanSidesPositionEnd; }
float GetScanSidesDuration() const override { return x220_scanSidesDuration; }
float GetScanSidesStartTime() const override { return x224_scanSidesStartTime; }
float GetScanSidesEndTime() const override { return x228_scanSidesEndTime; }
float GetScanDataDotRadius() const override { return x22c_scanDataDotRadius; }
float GetScanDataDotPosRandMagnitude() const override { return x230_scanDataDotPosRandMag; }
float GetScanDataDotSeekDurationMin() const override { return x234_scanDataDotSeekDurationMin; }
float GetScanDataDotSeekDurationMax() const override { return x238_scanDataDotSeekDurationMax; }
float GetScanDataDotHoldDurationMin() const override { return x23c_scanDataDotHoldDurationMin; }
float GetScanDataDotHoldDurationMax() const override { return x240_scanDataDotHoldDurationMax; }
float GetScanAppearanceDuration() const override { return x244_scanAppearanceDuration; }
float GetScanPaneFlashFactor() const override { return x248_scanPaneFlashFactor; }
float GetScanPaneFadeInTime() const override { return x24c_scanPaneFadeInTime; }
float GetScanPaneFadeOutTime() const override { return x250_scanPaneFadeOutTime; }
float GetBallViewportYReduction() const override { return x254_ballViewportYReduction; }
float GetScanWindowIdleWidth() const override { return x258_scanWindowIdleW; }
float GetScanWindowIdleHeight() const override { return x25c_scanWindowIdleH; }
float GetScanWindowActiveWidth() const override { return x260_scanWindowActiveW; }
float GetScanWindowActiveHeight() const override { return x264_scanWindowActiveH; }
float GetScanWindowMagnification() const override { return x268_scanWindowMagnification; }
float GetScanWindowScanningAspect() const override { return x26c_scanWindowScanningAspect; }
float GetScanSidesPositionStart() const override { return x270_scanSidesPositionStart; }
bool GetShowAutomapperInMorphball() const override { return x274_showAutomapperInMorphball; }
bool GetLatchArticleText() const override { return x275_latchArticleText; }
float GetWorldTransManagerCharsPerSfx() const override { return x278_wtMgrCharsPerSfx; }
uint GetXRayFogMode() const override { return x27c_xrayFogMode; }
float GetXRayFogNearZ() const override { return x280_xrayFogNearZ; }
float GetXRayFogFarZ() const override { return x284_xrayFogFarZ; }
const CColor& GetXRayFogColor() const override { return x288_xrayFogColor; }
float GetThermalVisorLevel() const override { return x28c_thermalVisorLevel; }
const CColor& GetThermalVisorColor() const override { return x290_thermalVisorColor; }
const CColor& GetVisorHudLightAdd(int v) const override { return x294_hudLightAddPerVisor[v]; }
const CColor& GetVisorHudLightMultiply(int v) const override { return x2a4_hudLightMultiplyPerVisor[v]; }
const CColor& GetHudReflectivityLightColor() const override { return x2b4_hudReflectivityLightColor; }
float GetHudLightAttMulConstant() const override { return x2b8_hudLightAttMulConstant; }
float GetHudLightAttMulLinear() const override { return x2bc_hudLightAttMulLinear; }
float GetHudLightAttMulQuadratic() const override { return x2c0_hudLightAttMulQuadratic; }
const rstl::string& GetCreditsTable() const override { return x2d0_creditsTable; }
const rstl::string& GetCreditsFont() const override { return x2e0_creditsFont; }
const rstl::string& GetJapaneseCreditsFont() const override { return x2f0_japaneseCreditsFont; }
const CColor& GetCreditsTextFontColor() const override { return x300_; }
const CColor& GetCreditsTextBorderColor() const override { return x304_; }
float GetMapAlphaInterpolant() const { return x8_mapAlphaInterp; }
float GetPauseBlurFactor() const { return xc_pauseBlurFactor; }
float GetRadarXYRadius() const { return x10_radarXYRadius; }
float GetRadarZRadius() const { return x24_radarZRadius; }
float GetRadarZCloseRadius() const { return x28_radarZCloseRadius; }
float GetEnergyBarFilledSpeed() const { return x34_energyBarFilledSpeed; }
float GetEnergyBarShadowSpeed() const { return x38_energyBarShadowSpeed; }
float GetEnergyBarDrainDelay() const { return x3c_energyBarDrainDelay; }
bool GetEnergyBarAlwaysResetDelay() const { return x40_energyBarAlwaysResetDelay; }
float GetHudDamagePracticalsGainConstant() const { return x44_hudDamagePracticalsGainConstant; }
float GetHudDamagePracticalsGainLinear() const { return x48_hudDamagePracticalsGainLinear; }
float GetHudDamagePracticalsInitConstant() const { return x4c_hudDamagePracticalsInitConstant; }
float GetHudDamagePracticalsInitLinear() const { return x50_hudDamagePracticalsInitLinear; }
float GetHudDamageLightSpotAngle() const { return x54_hudDamageLightSpotAngle; }
float GetDamageLightAngleC() const { return x58_damageLightAngleC; }
float GetDamageLightAngleL() const { return x5c_damageLightAngleL; }
float GetDamageLightAngleQ() const { return x60_damageLightAngleQ; }
CVector3f GetDamageLightPreTranslate() const { return x64_damageLightPreTranslate; }
CVector3f GetDamageLightCenterTranslate() const { return x70_damageLightCenterTranslate; }
float GetDamageLightXfXAngle() const { return x7c_damageLightXfXAngle; }
float GetDamageLightXfZAngle() const { return x80_damageLightXfZAngle; }
float GetHudDecoShakeTranslateVelConstant() const { return x84_hudDecoShakeTranslateVelConstant; }
float GetHudDecoShakeTranslateVelLinear() const { return x88_hudDecoShakeTranslateVelLinear; }
float GetMaxDecoDamageShakeTranslate() const { return x8c_maxDecoDamageShakeTranslate; }
float GetDecoDamageShakeDeceleration() const { return x90_decoDamageShakeDeceleration; }
float GetDecoShakeGainConstant() const { return x94_decoShakeGainConstant; }
float GetDecoShakeGainLinear() const { return x98_decoShakeGainLinear; }
float GetDecoShakeInitConstant() const { return x9c_decoShakeInitConstant; }
float GetDecoShakeInitLinear() const { return xa0_decoShakeInitLinear; }
float GetMaxDecoDamageShakeRotate() const { return xa4_maxDecoDamageShakeRotate; }
uint GetHudCamFovTweak() const { return xa8_hudCamFovTweak; }
uint GetHudCamYTweak() const { return xac_hudCamYTweak; }
uint GetHudCamZTweak() const { return xb0_hudCamZTweak; }
float GetBeamVisorMenuAnimTime() const { return xc0_beamVisorMenuAnimTime; }
float GetVisorBeamMenuItemActiveScale() const { return xc4_visorBeamMenuItemActiveScale; }
float GetVisorBeamMenuItemInactiveScale() const { return xc8_visorBeamMenuItemInactiveScale; }
float GetVisorBeamMenuItemTranslate() const { return xcc_visorBeamMenuItemTranslate; }
float GetThreatRange() const { return xe4_threatRange; }
float GetRadarScopeCoordRadius() const { return xe8_radarScopeCoordRadius; }
float GetRadarPlayerPaintRadius() const { return xec_radarPlayerPaintRadius; }
float GetRadarEnemyPaintRadius() const { return xf0_radarEnemyPaintRadius; }
float GetMissileArrowVisTime() const { return xf4_missileArrowVisTime; }
EHudVisMode GetHudVisMode() const { return xf8_hudVisMode; }
EHelmetVisMode GetHelmetVisMode() const { return xfc_helmetVisMode; }
uint GetEnableAutoMapper() const { return x100_enableAutoMapper; }
uint GetEnableTargetingManager() const { return x108_enableTargetingManager; }
uint GetEnablePlayerVisor() const { return x10c_enablePlayerVisor; }
float GetThreatWarningFraction() const { return x110_threatWarningFraction; }
float GetMissileWarningFraction() const { return x114_missileWarningFraction; }
float GetFreeLookFadeTime() const { return x118_freeLookFadeTime; }
float GetFreeLookSfxPitchScale() const { return x12c_freeLookSfxPitchScale; }
bool GetNoAbsoluteFreeLookSfxPitch() const { return x130_noAbsoluteFreeLookSfxPitch; }
float GetFaceReflectionOrthoWidth() const { return x13c_faceReflectionOrthoWidth; }
float GetFaceReflectionOrthoHeight() const { return x140_faceReflectionOrthoHeight; }
float GetFaceReflectionDistance() const { return x144_faceReflectionDistance; }
float GetFaceReflectionHeight() const { return x148_faceReflectionHeight; }
float GetFaceReflectionAspect() const { return x14c_faceReflectionAspect; }
float GetMissileWarningPulseTime() const { return x1a0_missileWarningPulseTime; }
float GetExplosionLightFalloffMultConstant() const { return x1a4_explosionLightFalloffMultConstant; }
float GetExplosionLightFalloffMultLinear() const { return x1a8_explosionLightFalloffMultLinear; }
float GetExplosionLightFalloffMultQuadratic() const { return x1ac_explosionLightFalloffMultQuadratic; }
float GetHudDamagePeakFactor() const { return x1b4_hudDamagePeakFactor; }
float GetHudDamageFilterGainConstant() const { return x1b8_hudDamageFilterGainConstant; }
float GetHudDamageFilterGainLinear() const { return x1bc_hudDamageFilterGainLinear; }
float GetHudDamageFilterInitConstant() const { return x1c0_hudDamageFilterInitConstant; }
float GetHudDamageFilterInitLinear() const { return x1c4_hudDamageFilterInitLinear; }
float GetEnergyDrainModPeriod() const { return x1c8_energyDrainModPeriod; }
bool GetEnergyDrainSinusoidalPulse() const { return x1cc_energyDrainSinusoidalPulse; }
bool GetEnergyDrainFilterAdditive() const { return x1cd_energyDrainFilterAdditive; }
float GetHudDamagePulseDuration() const { return x1d0_hudDamagePulseDuration; }
float GetHudDamageColorGain() const { return x1d4_hudDamageColorGain; }
float GetHudDecoShakeTranslateGain() const { return x1d8_hudDecoShakeTranslateGain; }
float GetHudLagOffsetScale() const { return x1dc_hudLagOffsetScale; }
float GetXrayBlurScaleLinear() const { return x204_xrayBlurScaleLinear; }
float GetXrayBlurScaleQuadratic() const { return x208_xrayBlurScaleQuadratic; }
float GetScanSidesAngle() const { return x210_scanSidesAngle; }
float GetScanSidesXScale() const { return x214_scanSidesXScale; }
float GetScanSidesPositionEnd() const { return x218_scanSidesPositionEnd; }
float GetScanSidesDuration() const { return x220_scanSidesDuration; }
float GetScanSidesStartTime() const { return x224_scanSidesStartTime; }
float GetScanSidesEndTime() const { return x228_scanSidesEndTime; }
float GetScanDataDotRadius() const { return x22c_scanDataDotRadius; }
float GetScanDataDotPosRandMagnitude() const { return x230_scanDataDotPosRandMag; }
float GetScanDataDotSeekDurationMin() const { return x234_scanDataDotSeekDurationMin; }
float GetScanDataDotSeekDurationMax() const { return x238_scanDataDotSeekDurationMax; }
float GetScanDataDotHoldDurationMin() const { return x23c_scanDataDotHoldDurationMin; }
float GetScanDataDotHoldDurationMax() const { return x240_scanDataDotHoldDurationMax; }
float GetScanAppearanceDuration() const { return x244_scanAppearanceDuration; }
float GetScanPaneFlashFactor() const { return x248_scanPaneFlashFactor; }
float GetScanPaneFadeInTime() const { return x24c_scanPaneFadeInTime; }
float GetScanPaneFadeOutTime() const { return x250_scanPaneFadeOutTime; }
float GetBallViewportYReduction() const { return x254_ballViewportYReduction; }
float GetScanWindowIdleWidth() const { return x258_scanWindowIdleW; }
float GetScanWindowIdleHeight() const { return x25c_scanWindowIdleH; }
float GetScanWindowActiveWidth() const { return x260_scanWindowActiveW; }
float GetScanWindowActiveHeight() const { return x264_scanWindowActiveH; }
float GetScanWindowMagnification() const { return x268_scanWindowMagnification; }
float GetScanWindowScanningAspect() const { return x26c_scanWindowScanningAspect; }
float GetScanSidesPositionStart() const { return x270_scanSidesPositionStart; }
bool GetShowAutomapperInMorphball() const { return x274_showAutomapperInMorphball; }
bool GetLatchArticleText() const { return x275_latchArticleText; }
float GetWorldTransManagerCharsPerSfx() const { return x278_wtMgrCharsPerSfx; }
uint GetXRayFogMode() const { return x27c_xrayFogMode; }
float GetXRayFogNearZ() const { return x280_xrayFogNearZ; }
float GetXRayFogFarZ() const { return x284_xrayFogFarZ; }
const CColor& GetXRayFogColor() const { return x288_xrayFogColor; }
float GetThermalVisorLevel() const { return x28c_thermalVisorLevel; }
const CColor& GetThermalVisorColor() const { return x290_thermalVisorColor; }
const CColor& GetVisorHudLightAdd(int v) const { return x294_hudLightAddPerVisor[v]; }
const CColor& GetVisorHudLightMultiply(int v) const { return x2a4_hudLightMultiplyPerVisor[v]; }
const CColor& GetHudReflectivityLightColor() const { return x2b4_hudReflectivityLightColor; }
float GetHudLightAttMulConstant() const { return x2b8_hudLightAttMulConstant; }
float GetHudLightAttMulLinear() const { return x2bc_hudLightAttMulLinear; }
float GetHudLightAttMulQuadratic() const { return x2c0_hudLightAttMulQuadratic; }
const rstl::string& GetCreditsTable() const { return x2d0_creditsTable; }
const rstl::string& GetCreditsFont() const { return x2e0_creditsFont; }
const rstl::string& GetJapaneseCreditsFont() const { return x2f0_japaneseCreditsFont; }
const CColor& GetCreditsTextFontColor() const { return x300_; }
const CColor& GetCreditsTextBorderColor() const { return x304_; }
private:
bool x4_;

158
include/MetroidPrime/Tweaks/CTweakGuiColors.hpp
View File

@ -7,85 +7,85 @@
class CTweakGuiColors : public ITweakObject {
public:
const CColor& GetPauseBlurFilterColor() const override { return x4_pauseBlurFilterColor; }
const CColor& GetRadarStuffColor() const override { return x8_radarStuffColor; }
const CColor& GetRadarPlayerPaintColor() const override { return xc_radarPlayerPaintColor; }
const CColor& GetRadarEnemyPaintColor() const override { return x10_radarEnemyPaintColor; }
const CColor& GetHudMessageFill() const override { return x14_hudMessageFill; }
const CColor& GetHudMessageOutline() const override { return x18_hudMessageOutline; }
const CColor& GetHudFrameColor() const override { return x1c_hudFrameColor; }
const CColor& GetMissileIconColorActive() const override { return x28_missileIconColorActive; }
const CColor& GetVisorBeamMenuItemActive() const override { return x2c_visorBeamMenuItemActive; }
const CColor& GetVisorBeamMenuItemInactive() const override { return x30_visorBeamMenuColorInactive; }
const CColor& GetEnergyBarFilledLowEnergy() const override { return x34_energyBarFilledLowEnergy; }
const CColor& GetEnergyBarShadowLowEnergy() const override { return x38_energyBarShadowLowEnergy; }
const CColor& GetEnergyBarEmptyLowEnergy() const override { return x3c_energyBarEmptyLowEnergy; }
const CColor& GetHudDamageLightColor() const override { return x40_hudDamageLightColor; }
const CColor& GetVisorMenuTextFont() const override { return x4c_visorMenuTextFont; }
const CColor& GetVisorMenuTextOutline() const override { return x50_visorMenuTextOutline; }
const CColor& GetBeamMenuTextFont() const override { return x54_beamMenuTextFont; }
const CColor& GetBeamMenuTextOutline() const override { return x58_beamMenuTextOutline; }
const CColor& GetEnergyWarningFont() const override { return x5c_energyWarningFont; }
const CColor& GetThreatWarningFont() const override { return x60_threatWarningFont; }
const CColor& GetMissileWarningFont() const override { return x64_missileWarningFont; }
const CColor& GetThreatBarFilled() const override { return x68_threatBarFilled; }
const CColor& GetThreatBarShadow() const override { return x6c_threatBarShadow; }
const CColor& GetThreatBarEmpty() const override { return x70_threatBarEmpty; }
const CColor& GetMissileBarFilled() const override { return x74_missileBarFilled; }
const CColor& GetMissileBarShadow() const override { return x78_missileBarShadow; }
const CColor& GetMissileBarEmpty() const override { return x7c_missileBarEmpty; }
const CColor& GetThreatIconColor() const override { return x80_threatIconColor; }
const CColor& GetTickDecoColor() const override { return x88_tickDecoColor; }
const CColor& GetHelmetLightColor() const override { return x8c_helmetLightColor; }
const CColor& GetThreatIconSafeColor() const override { return x90_threatIconSafeColor; }
const CColor& GetMissileIconColorInactive() const override { return x94_missileIconColorInactive; }
const CColor& GetMissileIconColorChargedCanAlt() const override { return x98_missileIconColorChargedCanAlt; }
const CColor& GetMissileIconColorChargedNoAlt() const override { return x9c_missileIconColorChargedNoAlt; }
const CColor& GetMissileIconColorDepleteAlt() const override { return xa0_missileIconColorDepleteAlt; }
const CColor& GetVisorBeamMenuLozColor() const override { return xb0_visorBeamMenuLozColor; }
const CColor& GetEnergyWarningOutline() const override { return xb4_energyWarningOutline; }
const CColor& GetThreatWarningOutline() const override { return xb8_threatWarningOutline; }
const CColor& GetMissileWarningOutline() const override { return xbc_missileWarningOutline; }
const CColor& GetDamageAmbientColor() const override { return xc4_damageAmbientColor; }
const CColor& GetScanFrameInactiveColor() const override { return xc8_scanFrameInactiveColor; }
const CColor& GetScanFrameActiveColor() const override { return xcc_scanFrameActiveColor; }
const CColor& GetScanFrameImpulseColor() const override { return xd0_scanFrameImpulseColor; }
const CColor& GetScanVisorHudLightMultiply() const override { return xd4_scanVisorHudLightMultiply; }
const CColor& GetScanVisorScreenDimColor() const override { return xd8_scanVisorScreenDimColor; }
const CColor& GetThermalVisorHudLightMultiply() const override { return xdc_thermalVisorHudLightMultiply; }
const CColor& GetEnergyDrainFilterColor() const override { return xe0_energyDrainFilterColor; }
const CColor& GetDamageAmbientPulseColor() const override { return xe4_damageAmbientPulseColor; }
const CColor& GetEnergyBarFlashColor() const override { return xe8_energyBarFlashColor; }
const CColor& GetXRayEnergyDecoColor() const override { return x100_xrayEnergyDecoColor; }
const CColor& GetScanDataDotColor() const override { return x138_scanDataDotColor; }
const CColor& GetPowerBombDigitAvailableFont() const override { return x13c_powerBombDigitAvailableFont; }
const CColor& GetPowerBombDigitAvailableOutline() const override { return x140_powerBombDigitAvailableOutline; }
const CColor& GetBallBombFilledColor() const override { return x148_ballBombFilled; }
const CColor& GetBallBombEmptyColor() const override { return x14c_ballBombEmpty; }
const CColor& GetPowerBombIconAvailableColor() const override { return x150_powerBombIconAvailable; }
const CColor& GetBallBombEnergyColor() const override { return x158_ballEnergyDeco; }
const CColor& GetBallBombDecoColor() const override { return x15c_ballBombDeco; }
const CColor& GetPowerBombDigitDelpetedFont() const override { return x160_powerBombDigitDepletedFont; }
const CColor& GetPowerBombDigitDelpetedOutline() const override { return x164_powerBombDigitDepletedOutline; }
const CColor& GetPowerBombIconDepletedColor() const override { return x168_powerBombIconUnavailable; }
const CColor& GetScanDisplayImagePaneColor() const override { return x174_scanDisplayImagePaneColor; }
const CColor& GetThreatIconWarningColor() const override { return x17c_threatIconWarningColor; }
const CColor& GetHudCounterFill() const override { return x180_hudCounterFill; }
const CColor& GetHudCounterOutline() const override { return x184_hudCounterOutline; }
const CColor& GetScanIconCriticalColor() const override { return x188_scanIconCriticalColor; }
const CColor& GetScanIconCriticalDimColor() const override { return x18c_scanIconCriticalDimColor; }
const CColor& GetScanIconNoncriticalColor() const override { return x190_scanIconNoncriticalColor; }
const CColor& GetScanIconNoncriticalDimColor() const override { return x194_scanIconNoncriticalDimColor; }
const CColor& GetScanReticuleColor() const override { return x198_scanReticuleColor; }
const CColor& GetThreatDigitsFont() const override { return x19c_threatDigitsFont; }
const CColor& GetThreatDigitsOutline() const override { return x1a0_threatDigitsOutline; }
const CColor& GetMissileDigitsFont() const override { return x1a4_missileDigitsFont; }
const CColor& GetMissileDigitsOutline() const override { return x1a8_missileDigitsOutline; }
const CColor& GetThermalDecoColor() const override { return x1ac_thermalDecoColor; }
const CColor& GetThermalOutlinesColor() const override { return x1b0_thermalOutlinesColor; }
const CColor& GetThermalLockColor() const override { return x1b8_thermalLockColor; }
const CColor& GetPauseItemAmberColor() const override { return x1bc_pauseItemAmber; }
const CColor& GetPauseItemBlueColor() const override { return x1c0_pauseItemBlue; }
const CColor& GetPauseBlurFilterColor() const { return x4_pauseBlurFilterColor; }
const CColor& GetRadarStuffColor() const { return x8_radarStuffColor; }
const CColor& GetRadarPlayerPaintColor() const { return xc_radarPlayerPaintColor; }
const CColor& GetRadarEnemyPaintColor() const { return x10_radarEnemyPaintColor; }
const CColor& GetHudMessageFill() const { return x14_hudMessageFill; }
const CColor& GetHudMessageOutline() const { return x18_hudMessageOutline; }
const CColor& GetHudFrameColor() const { return x1c_hudFrameColor; }
const CColor& GetMissileIconColorActive() const { return x28_missileIconColorActive; }
const CColor& GetVisorBeamMenuItemActive() const { return x2c_visorBeamMenuItemActive; }
const CColor& GetVisorBeamMenuItemInactive() const { return x30_visorBeamMenuColorInactive; }
const CColor& GetEnergyBarFilledLowEnergy() const { return x34_energyBarFilledLowEnergy; }
const CColor& GetEnergyBarShadowLowEnergy() const { return x38_energyBarShadowLowEnergy; }
const CColor& GetEnergyBarEmptyLowEnergy() const { return x3c_energyBarEmptyLowEnergy; }
const CColor& GetHudDamageLightColor() const { return x40_hudDamageLightColor; }
const CColor& GetVisorMenuTextFont() const { return x4c_visorMenuTextFont; }
const CColor& GetVisorMenuTextOutline() const { return x50_visorMenuTextOutline; }
const CColor& GetBeamMenuTextFont() const { return x54_beamMenuTextFont; }
const CColor& GetBeamMenuTextOutline() const { return x58_beamMenuTextOutline; }
const CColor& GetEnergyWarningFont() const { return x5c_energyWarningFont; }
const CColor& GetThreatWarningFont() const { return x60_threatWarningFont; }
const CColor& GetMissileWarningFont() const { return x64_missileWarningFont; }
const CColor& GetThreatBarFilled() const { return x68_threatBarFilled; }
const CColor& GetThreatBarShadow() const { return x6c_threatBarShadow; }
const CColor& GetThreatBarEmpty() const { return x70_threatBarEmpty; }
const CColor& GetMissileBarFilled() const { return x74_missileBarFilled; }
const CColor& GetMissileBarShadow() const { return x78_missileBarShadow; }
const CColor& GetMissileBarEmpty() const { return x7c_missileBarEmpty; }
const CColor& GetThreatIconColor() const { return x80_threatIconColor; }
const CColor& GetTickDecoColor() const { return x88_tickDecoColor; }
const CColor& GetHelmetLightColor() const { return x8c_helmetLightColor; }
const CColor& GetThreatIconSafeColor() const { return x90_threatIconSafeColor; }
const CColor& GetMissileIconColorInactive() const { return x94_missileIconColorInactive; }
const CColor& GetMissileIconColorChargedCanAlt() const { return x98_missileIconColorChargedCanAlt; }
const CColor& GetMissileIconColorChargedNoAlt() const { return x9c_missileIconColorChargedNoAlt; }
const CColor& GetMissileIconColorDepleteAlt() const { return xa0_missileIconColorDepleteAlt; }
const CColor& GetVisorBeamMenuLozColor() const { return xb0_visorBeamMenuLozColor; }
const CColor& GetEnergyWarningOutline() const { return xb4_energyWarningOutline; }
const CColor& GetThreatWarningOutline() const { return xb8_threatWarningOutline; }
const CColor& GetMissileWarningOutline() const { return xbc_missileWarningOutline; }
const CColor& GetDamageAmbientColor() const { return xc4_damageAmbientColor; }
const CColor& GetScanFrameInactiveColor() const { return xc8_scanFrameInactiveColor; }
const CColor& GetScanFrameActiveColor() const { return xcc_scanFrameActiveColor; }
const CColor& GetScanFrameImpulseColor() const { return xd0_scanFrameImpulseColor; }
const CColor& GetScanVisorHudLightMultiply() const { return xd4_scanVisorHudLightMultiply; }
const CColor& GetScanVisorScreenDimColor() const { return xd8_scanVisorScreenDimColor; }
const CColor& GetThermalVisorHudLightMultiply() const { return xdc_thermalVisorHudLightMultiply; }
const CColor& GetEnergyDrainFilterColor() const { return xe0_energyDrainFilterColor; }
const CColor& GetDamageAmbientPulseColor() const { return xe4_damageAmbientPulseColor; }
const CColor& GetEnergyBarFlashColor() const { return xe8_energyBarFlashColor; }
const CColor& GetXRayEnergyDecoColor() const { return x100_xrayEnergyDecoColor; }
const CColor& GetScanDataDotColor() const { return x138_scanDataDotColor; }
const CColor& GetPowerBombDigitAvailableFont() const { return x13c_powerBombDigitAvailableFont; }
const CColor& GetPowerBombDigitAvailableOutline() const { return x140_powerBombDigitAvailableOutline; }
const CColor& GetBallBombFilledColor() const { return x148_ballBombFilled; }
const CColor& GetBallBombEmptyColor() const { return x14c_ballBombEmpty; }
const CColor& GetPowerBombIconAvailableColor() const { return x150_powerBombIconAvailable; }
const CColor& GetBallBombEnergyColor() const { return x158_ballEnergyDeco; }
const CColor& GetBallBombDecoColor() const { return x15c_ballBombDeco; }
const CColor& GetPowerBombDigitDelpetedFont() const { return x160_powerBombDigitDepletedFont; }
const CColor& GetPowerBombDigitDelpetedOutline() const { return x164_powerBombDigitDepletedOutline; }
const CColor& GetPowerBombIconDepletedColor() const { return x168_powerBombIconUnavailable; }
const CColor& GetScanDisplayImagePaneColor() const { return x174_scanDisplayImagePaneColor; }
const CColor& GetThreatIconWarningColor() const { return x17c_threatIconWarningColor; }
const CColor& GetHudCounterFill() const { return x180_hudCounterFill; }
const CColor& GetHudCounterOutline() const { return x184_hudCounterOutline; }
const CColor& GetScanIconCriticalColor() const { return x188_scanIconCriticalColor; }
const CColor& GetScanIconCriticalDimColor() const { return x18c_scanIconCriticalDimColor; }
const CColor& GetScanIconNoncriticalColor() const { return x190_scanIconNoncriticalColor; }
const CColor& GetScanIconNoncriticalDimColor() const { return x194_scanIconNoncriticalDimColor; }
const CColor& GetScanReticuleColor() const { return x198_scanReticuleColor; }
const CColor& GetThreatDigitsFont() const { return x19c_threatDigitsFont; }
const CColor& GetThreatDigitsOutline() const { return x1a0_threatDigitsOutline; }
const CColor& GetMissileDigitsFont() const { return x1a4_missileDigitsFont; }
const CColor& GetMissileDigitsOutline() const { return x1a8_missileDigitsOutline; }
const CColor& GetThermalDecoColor() const { return x1ac_thermalDecoColor; }
const CColor& GetThermalOutlinesColor() const { return x1b0_thermalOutlinesColor; }
const CColor& GetThermalLockColor() const { return x1b8_thermalLockColor; }
const CColor& GetPauseItemAmberColor() const { return x1bc_pauseItemAmber; }
const CColor& GetPauseItemBlueColor() const { return x1c0_pauseItemBlue; }
private:
CColor x4_pauseBlurFilterColor;

4
include/MetroidPrime/Weapons/CPlasmaProjectile.hpp
View File

@ -42,8 +42,8 @@ public:
void Fire(const CTransform4f& xf, CStateManager& mgr, bool b) override;
void Touch(CActor& other, CStateManager& mgr) override;
bool CanRenderUnsorted(const CStateManager& mgr) const override;
void AddToRenderer(const CFrustumPlanes& frustum, CStateManager& mgr) override;
void Render(CStateManager& mgr) override;
void AddToRenderer(const CFrustumPlanes& frustum, const CStateManager& mgr) const override;
void Render(const CStateManager& mgr) const override;
CColor GetInnerColor() const { return x490_innerColor; }
CColor GetOuterColor() const { return x494_outerColor; }
bool IsFiring() const { return x548_26_firing; }

2
src/Kyoto/Particles/CRealElement.cpp
View File

@ -13,7 +13,7 @@ CREConstant::CREConstant(float val) : x4_val(val) {}
CREConstant::~CREConstant() {}
bool CREConstant::GetValue(int frame, float& valOut) const override {
bool CREConstant::GetValue(int frame, float& valOut) const {
valOut = x4_val;
return false;
}

2
src/MetroidPrime/BodyState/CABSFlinch.cpp
View File

@ -40,7 +40,7 @@ pas::EAnimationState CABSFlinch::UpdateBody(float dt, CBodyController& bc, CStat
return st;
}
void CABSFlinch::Shutdown(CBodyController& bc) override {}
void CABSFlinch::Shutdown(CBodyController& bc) {}
pas::EAnimationState CABSFlinch::GetBodyStateTransition(float dt, CBodyController& bc) const {
CBodyStateCmdMgr& commandMgr = bc.CommandMgr();

2
src/MetroidPrime/BodyState/CABSReaction.cpp
View File

@ -59,7 +59,7 @@ pas::EAnimationState CABSReaction::UpdateBody(float dt, CBodyController& bc, CSt
return st;
}
void CABSReaction::Shutdown(CBodyController& bc) override { StopAnimation(bc); }
void CABSReaction::Shutdown(CBodyController& bc) { StopAnimation(bc); }
bool CBodyController::HasIceBreakoutState() {
// Inline function that ends here?

10
src/MetroidPrime/BodyState/CBSDie.cpp
View File

@ -9,7 +9,7 @@
CBSDie::CBSDie() : x4_remTime(0.0f), x8_isDead(false) {}
void CBSDie::Start(CBodyController& bc, CStateManager& mgr) override {
void CBSDie::Start(CBodyController& bc, CStateManager& mgr) {
const CPASDatabase& db = bc.GetPASDatabase();
int fallState = bc.GetFallState();
@ -35,7 +35,7 @@ void CBSDie::Start(CBodyController& bc, CStateManager& mgr) override {
}
pas::EAnimationState CBSDie::UpdateBody(float dt, CBodyController& bc,
CStateManager& mgr) override {
CStateManager& mgr) {
x4_remTime -= dt;
if (x4_remTime <= 0.f) {
bc.EnableAnimation(false);
@ -44,10 +44,10 @@ pas::EAnimationState CBSDie::UpdateBody(float dt, CBodyController& bc,
return pas::kAS_Invalid;
}
void CBSDie::Shutdown(CBodyController&) override {}
void CBSDie::Shutdown(CBodyController&) {}
bool CBSDie::IsDying() const override { return true; }
bool CBSDie::IsDying() const { return true; }
bool CBSDie::IsDead() const override { return x8_isDead; }
bool CBSDie::IsDead() const { return x8_isDead; }
CBSDie::~CBSDie() {}

6
src/MetroidPrime/BodyState/CBSGenerate.cpp
View File

@ -10,7 +10,7 @@
CBSGenerate::CBSGenerate() {}
void CBSGenerate::Start(CBodyController& bc, CStateManager& mgr) override {
void CBSGenerate::Start(CBodyController& bc, CStateManager& mgr) {
const CBCGenerateCmd* cmd =
static_cast< const CBCGenerateCmd* >(bc.CommandMgr().GetCmd(kBSC_Generate));
@ -37,7 +37,7 @@ void CBSGenerate::Start(CBodyController& bc, CStateManager& mgr) override {
}
pas::EAnimationState CBSGenerate::UpdateBody(float dt, CBodyController& bc,
CStateManager& mgr) override {
CStateManager& mgr) {
const pas::EAnimationState st = GetBodyStateTransition(dt, bc);
if (st == pas::kAS_Invalid) {
CBodyStateCmdMgr& commandMgr = bc.CommandMgr();
@ -48,7 +48,7 @@ pas::EAnimationState CBSGenerate::UpdateBody(float dt, CBodyController& bc,
return st;
}
void CBSGenerate::Shutdown(CBodyController&) override {}
void CBSGenerate::Shutdown(CBodyController&) {}
pas::EAnimationState CBSGenerate::GetBodyStateTransition(float dt, CBodyController& bc) {
CBodyStateCmdMgr& cmdMgr = bc.CommandMgr();

6
src/MetroidPrime/BodyState/CBSKnockBack.cpp
View File

@ -50,7 +50,7 @@ void CBSKnockBack::Start(CBodyController& bc, CStateManager& mgr) {
}
pas::EAnimationState CBSKnockBack::UpdateBody(float dt, CBodyController& bc,
CStateManager& mgr) override {
CStateManager& mgr) {
const pas::EAnimationState st = GetBodyStateTransition(dt, bc);
if (st == pas::kAS_Invalid) {
x4_curTime += dt;
@ -62,7 +62,7 @@ pas::EAnimationState CBSKnockBack::UpdateBody(float dt, CBodyController& bc,
return st;
}
void CBSKnockBack::Shutdown(CBodyController&) override {}
void CBSKnockBack::Shutdown(CBodyController&) {}
pas::EAnimationState CBSKnockBack::GetBodyStateTransition(float dt, CBodyController& bc) {
CBodyStateCmdMgr& commandMgr = bc.CommandMgr();
@ -85,6 +85,6 @@ pas::EAnimationState CBSKnockBack::GetBodyStateTransition(float dt, CBodyControl
return pas::kAS_Invalid;
}
bool CBSKnockBack::IsMoving() const override { return true; }
bool CBSKnockBack::IsMoving() const { return true; }
CBSKnockBack::~CBSKnockBack() {}

8
src/MetroidPrime/BodyState/CBSProjectileAttack.cpp
View File

@ -11,7 +11,7 @@
CBSProjectileAttack::CBSProjectileAttack() {}
void CBSProjectileAttack::Start(CBodyController& bc, CStateManager& mgr) override {
void CBSProjectileAttack::Start(CBodyController& bc, CStateManager& mgr) {
const CBCProjectileAttackCmd* cmd =
static_cast< const CBCProjectileAttackCmd* >(bc.CommandMgr().GetCmd(kBSC_ProjectileAttack));
@ -53,7 +53,7 @@ void CBSProjectileAttack::Start(CBodyController& bc, CStateManager& mgr) overrid
}
pas::EAnimationState CBSProjectileAttack::UpdateBody(float dt, CBodyController& bc,
CStateManager& mgr) override {
CStateManager& mgr) {
const pas::EAnimationState st = GetBodyStateTransition(dt, bc);
if (st == pas::kAS_Invalid) {
CBodyStateCmdMgr& cmdMgr = bc.CommandMgr();
@ -64,7 +64,7 @@ pas::EAnimationState CBSProjectileAttack::UpdateBody(float dt, CBodyController&
return st;
}
void CBSProjectileAttack::Shutdown(CBodyController&) override {}
void CBSProjectileAttack::Shutdown(CBodyController&) {}
pas::EAnimationState CBSProjectileAttack::GetBodyStateTransition(float dt, CBodyController& bc) {
CBodyStateCmdMgr& cmdMgr = bc.CommandMgr();
@ -89,6 +89,6 @@ pas::EAnimationState CBSProjectileAttack::GetBodyStateTransition(float dt, CBody
return pas::kAS_Invalid;
}
bool CBSProjectileAttack::CanShoot() const override { return true; }
bool CBSProjectileAttack::CanShoot() const { return true; }
CBSProjectileAttack::~CBSProjectileAttack() {}

4
src/MetroidPrime/BodyState/CBSScripted.cpp
View File

@ -35,7 +35,7 @@ pas::EAnimationState CBSScripted::UpdateBody(float dt, CBodyController& bc, CSta
return st;
}
void CBSScripted::Shutdown(CBodyController&) override {}
void CBSScripted::Shutdown(CBodyController&) {}
pas::EAnimationState CBSScripted::GetBodyStateTransition(float dt, CBodyController& bc) {
CBodyStateCmdMgr& commandMgr = bc.CommandMgr();
@ -65,6 +65,6 @@ pas::EAnimationState CBSScripted::GetBodyStateTransition(float dt, CBodyControll
return pas::kAS_Invalid;
}
bool CBSScripted::ApplyHeadTracking() const override { return false; }
bool CBSScripted::ApplyHeadTracking() const { return false; }
CBSScripted::~CBSScripted() {}

6
src/MetroidPrime/BodyState/CBSSlide.cpp
View File

@ -48,7 +48,7 @@ pas::EAnimationState CBSSlide::UpdateBody(float dt, CBodyController& bc, CStateM
return st;
}
void CBSSlide::Shutdown(CBodyController&) override {}
void CBSSlide::Shutdown(CBodyController&) {}
pas::EAnimationState CBSSlide::GetBodyStateTransition(float dt, CBodyController& bc) {
CBodyStateCmdMgr& mgr = bc.CommandMgr();
@ -68,7 +68,7 @@ pas::EAnimationState CBSSlide::GetBodyStateTransition(float dt, CBodyController&
}
}
bool CBSSlide::ApplyHeadTracking() const override { return false; }
bool CBSSlide::IsMoving() const override { return true; }
bool CBSSlide::ApplyHeadTracking() const { return false; }
bool CBSSlide::IsMoving() const { return true; }
CBSSlide::~CBSSlide() {}

6
src/MetroidPrime/BodyState/CBSStep.cpp
View File

@ -25,7 +25,7 @@ pas::EAnimationState CBSStep::UpdateBody(float dt, CBodyController& bc, CStateMa
return st;
}
void CBSStep::Shutdown(CBodyController&) override {}
void CBSStep::Shutdown(CBodyController&) {}
pas::EAnimationState CBSStep::GetBodyStateTransition(float dt, CBodyController& bc) {
CBodyStateCmdMgr& commandMgr = bc.CommandMgr();
@ -71,9 +71,9 @@ pas::EAnimationState CBSStep::GetBodyStateTransition(float dt, CBodyController&
}
return pas::kAS_Invalid;
}
bool CBSStep::CanShoot() const override { return true; }
bool CBSStep::CanShoot() const { return true; }
bool CBSStep::IsMoving() const override { return true; }
bool CBSStep::IsMoving() const { return true; }
CBSStep::~CBSStep() {}

2
src/MetroidPrime/BodyState/CBSTaunt.cpp
View File

@ -24,7 +24,7 @@ pas::EAnimationState CBSTaunt::UpdateBody(float dt, CBodyController& bc, CStateM
return st;
}
void CBSTaunt::Shutdown(CBodyController&) override {}
void CBSTaunt::Shutdown(CBodyController&) {}
pas::EAnimationState CBSTaunt::GetBodyStateTransition(float dt, CBodyController& bc) {
CBodyStateCmdMgr& cmdMgr = bc.CommandMgr();

4
src/MetroidPrime/CGameLight.cpp
View File

@ -37,7 +37,7 @@ CLight CGameLight::GetLight() const {
return ret;
}
void CGameLight::Think(float dt, CStateManager& mgr) override {
void CGameLight::Think(float dt, CStateManager& mgr) {
if (x144_lifeTime > 0.f) {
x144_lifeTime -= dt;
@ -46,7 +46,7 @@ void CGameLight::Think(float dt, CStateManager& mgr) override {
}
}
void CGameLight::Accept(IVisitor& visitor) override { visitor.Visit(*this); }
void CGameLight::Accept(IVisitor& visitor) { visitor.Visit(*this); }
void CGameLight::SetLightPriorityAndId() {
xec_light.SetPriority(x140_priority);

2
src/MetroidPrime/Enemies/CMetaree.cpp
View File

@ -227,6 +227,6 @@ void CMetaree::Think(float dt, CStateManager& mgr) {
CPatterned::Think(dt, mgr);
}
bool CMetaree::Delay(CStateManager&, float) override {
bool CMetaree::Delay(CStateManager&, float) {
return GetStateMachineState().GetTime() > x568_delay;
}

6
src/MetroidPrime/Enemies/CMetroidPrimeProjectile.cpp
View File

@ -16,13 +16,13 @@ CMetroidPrimeProjectile::CMetroidPrimeProjectile(
attribs, false, scale, visorParticle, visorSfx, sendCollideMsg)
, x3d8_auxData(auxData) {}
void CMetroidPrimeProjectile::Accept(IVisitor& visitor) override { visitor.Visit(*this); }
void CMetroidPrimeProjectile::Accept(IVisitor& visitor) { visitor.Visit(*this); }
// CEnergyProjectile
bool CMetroidPrimeProjectile::Explode(const CVector3f& pos, const CVector3f& normal,
EWeaponCollisionResponseTypes type, CStateManager& mgr,
const CDamageVulnerability& dVuln,
TUniqueId hitActor) override {
TUniqueId hitActor) {
bool result = CEnergyProjectile::Explode(pos, normal, type, mgr, dVuln, hitActor);
if (!x2e4_24_active) {
@ -60,4 +60,4 @@ SPrimeProjectileInfo::SPrimeProjectileInfo(CInputStream& in)
x38_27_ = in.ReadBool();
}
CMetroidPrimeProjectile::~CMetroidPrimeProjectile() override {}
CMetroidPrimeProjectile::~CMetroidPrimeProjectile() {}

6
src/MetroidPrime/ScriptObjects/CScriptActor.cpp
View File

@ -54,7 +54,7 @@ CScriptActor::~CScriptActor() {}
CHealthInfo* CScriptActor::HealthInfo(CStateManager&) { return &x260_currentHealth; }
const CDamageVulnerability* CScriptActor::GetDamageVulnerability() const override {
const CDamageVulnerability* CScriptActor::GetDamageVulnerability() const {
return &x268_damageVulnerability;
}
@ -196,12 +196,12 @@ void CScriptActor::PreRender(CStateManager& mgr, const CFrustumPlanes& frustum)
}
}
void CScriptActor::Accept(IVisitor& visitor) override { visitor.Visit(*this); }
void CScriptActor::Accept(IVisitor& visitor) { visitor.Visit(*this); }
EWeaponCollisionResponseTypes CScriptActor::GetCollisionResponseType(const CVector3f& v1,
const CVector3f& v2,
const CWeaponMode& wMode,
EProjectileAttrib w) const {
int w) const {
const CDamageVulnerability* dVuln = GetDamageVulnerability();
if (dVuln->GetVulnerability(wMode, false) == kVN_Deflect) {

4
src/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.cpp
View File

@ -50,10 +50,10 @@ void CScriptAiJumpPoint::Think(float dt, CStateManager&) {
}
}
void CScriptAiJumpPoint::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override {
void CScriptAiJumpPoint::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const {
}
void CScriptAiJumpPoint::Render(const CStateManager&) const override {}
void CScriptAiJumpPoint::Render(const CStateManager&) const {}
rstl::optional_object< CAABox > CScriptAiJumpPoint::GetTouchBounds() const {
return xec_touchBounds;

4
src/MetroidPrime/ScriptObjects/CScriptAreaAttributes.cpp
View File

@ -16,7 +16,7 @@ CScriptAreaAttributes::CScriptAreaAttributes(TUniqueId uid, const CEntityInfo& i
, x50_phazon(phazonType) {}
void CScriptAreaAttributes::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
CStateManager& stateMgr) override {
CStateManager& stateMgr) {
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
if (GetCurrentAreaId() == kInvalidAreaId) {
@ -39,6 +39,6 @@ void CScriptAreaAttributes::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId
}
}
void CScriptAreaAttributes::Accept(IVisitor& visitor) override { visitor.Visit(*this); }
void CScriptAreaAttributes::Accept(IVisitor& visitor) { visitor.Visit(*this); }
CScriptAreaAttributes::~CScriptAreaAttributes() {}

4
src/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.cpp
View File

@ -48,8 +48,8 @@ TUniqueId CScriptCameraWaypoint::GetRandomNextWaypointId(const CStateManager& mg
}
void CScriptCameraWaypoint::AddToRenderer(const CFrustumPlanes&,
const CStateManager&) override const {}
const CStateManager&) const {}
void CScriptCameraWaypoint::Render(const CStateManager&) override const {}
void CScriptCameraWaypoint::Render(const CStateManager&) const {}
void CScriptCameraWaypoint::Accept(IVisitor& visitor) { visitor.Visit(*this); }

4
src/MetroidPrime/ScriptObjects/CScriptCounter.cpp
View File

@ -11,7 +11,7 @@ CScriptCounter::CScriptCounter(TUniqueId uid, const rstl::string& name, const CE
CScriptCounter::~CScriptCounter() {}
void CScriptCounter::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
CStateManager& stateMgr) override {
CStateManager& stateMgr) {
switch (msg) {
case kSM_SetToZero:
if (GetActive()) {
@ -62,4 +62,4 @@ void CScriptCounter::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
}
void CScriptCounter::Accept(IVisitor& visitor) override { visitor.Visit(*this); }
void CScriptCounter::Accept(IVisitor& visitor) { visitor.Visit(*this); }

7
src/MetroidPrime/ScriptObjects/CScriptCoverPoint.cpp
View File

@ -27,8 +27,7 @@ void CScriptCoverPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
switch (msg) {
case kSM_InitializedInArea:
rstl::vector< SConnection >::const_iterator conn = GetConnectionList().begin();
for (; conn != GetConnectionList().end(); ++conn) {
for (rstl::vector< SConnection >::const_iterator conn = GetConnectionList().begin(); conn != GetConnectionList().end(); ++conn) {
if (conn->x0_state == kSS_Retreat) {
xfc_retreating = mgr.GetIdForScript(conn->x8_objId);
break;
@ -119,9 +118,9 @@ void CScriptCoverPoint::Think(float delta, CStateManager&) {
x11c_timeLeft -= delta;
}
void CScriptCoverPoint::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const override {}
void CScriptCoverPoint::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const {}
void CScriptCoverPoint::Render(const CStateManager&) const override {}
void CScriptCoverPoint::Render(const CStateManager&) const {}
rstl::optional_object< CAABox > CScriptCoverPoint::GetTouchBounds() const {
return x100_touchBounds;

4
src/MetroidPrime/ScriptObjects/CScriptHUDMemo.cpp
View File

@ -18,7 +18,7 @@ CScriptHUDMemo::CScriptHUDMemo(TUniqueId uid, const rstl::string& name, const CE
CScriptHUDMemo::~CScriptHUDMemo() {}
void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
CStateManager& mgr) override {
CStateManager& mgr) {
switch (msg) {
case kSM_SetToZero:
if (GetActive()) {
@ -43,4 +43,4 @@ void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
CEntity::AcceptScriptMsg(msg, uid, mgr);
}
void CScriptHUDMemo::Accept(IVisitor& visitor) override { visitor.Visit(*this); }
void CScriptHUDMemo::Accept(IVisitor& visitor) { visitor.Visit(*this); }

6
src/MetroidPrime/ScriptObjects/CScriptPickup.cpp
View File

@ -193,16 +193,16 @@ void CScriptPickup::Touch(CActor& act, CStateManager& mgr) {
}
}
rstl::optional_object< CAABox > CScriptPickup::GetTouchBounds() const override {
rstl::optional_object< CAABox > CScriptPickup::GetTouchBounds() const {
return CPhysicsActor::GetBoundingBox();
}
void CScriptPickup::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
CStateManager& mgr) override {
CStateManager& mgr) {
CPhysicsActor::AcceptScriptMsg(msg, uid, mgr);
}
void CScriptPickup::Render(const CStateManager& mgr) const override { CPhysicsActor::Render(mgr); }
void CScriptPickup::Render(const CStateManager& mgr) const { CPhysicsActor::Render(mgr); }
void CScriptPickup::Accept(IVisitor& visitor) { visitor.Visit(*this); }

2
src/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.cpp
View File

@ -19,7 +19,7 @@ CScriptPlayerStateChange::CScriptPlayerStateChange(TUniqueId uid, const rstl::st
void CScriptPlayerStateChange::Accept(IVisitor& visitor) { visitor.Visit(*this); }
void CScriptPlayerStateChange::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
CStateManager& stateMgr) override {
CStateManager& stateMgr) {
if (GetActive() && msg == kSM_SetToZero) {
stateMgr.PlayerState()->InitializePowerUp(CPlayerState::EItemType(x34_itemType),
x3c_itemCapacity);

6
src/MetroidPrime/ScriptObjects/CScriptRelay.cpp
View File

@ -20,7 +20,7 @@ void CScriptRelay::UpdateObjectRef(CStateManager& stateMgr) {
}
void CScriptRelay::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
CStateManager& stateMgr) override {
CStateManager& stateMgr) {
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
switch (msg) {
@ -53,7 +53,7 @@ void CScriptRelay::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
}
}
void CScriptRelay::Think(float, CStateManager& stateMgr) override {
void CScriptRelay::Think(float, CStateManager& stateMgr) {
switch (x38_sendCount) {
default:
while (x38_sendCount != 0) {
@ -66,6 +66,6 @@ void CScriptRelay::Think(float, CStateManager& stateMgr) override {
}
}
void CScriptRelay::Accept(IVisitor& visitor) override { visitor.Visit(*this); }
void CScriptRelay::Accept(IVisitor& visitor) { visitor.Visit(*this); }
CScriptRelay::~CScriptRelay() {}

2
src/MetroidPrime/ScriptObjects/CScriptRipple.cpp
View File

@ -39,6 +39,6 @@ void CScriptRipple::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSt
}
}
void CScriptRipple::Think(float, CStateManager&) override {}
void CScriptRipple::Think(float, CStateManager&) {}
void CScriptRipple::Accept(IVisitor& visitor) { visitor.Visit(*this); }

4
src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
View File

@ -156,7 +156,7 @@ void CScriptSpecialFunction::Think(float dt, CStateManager& mgr) {
}
}
void CScriptSpecialFunction::AddToRenderer(const CFrustumPlanes&, CStateManager& mgr) {
void CScriptSpecialFunction::AddToRenderer(const CFrustumPlanes&, const CStateManager& mgr) const {
if (!GetActive()) {
return;
}
@ -960,7 +960,7 @@ void CScriptSpecialFunction::ThinkObjectFollowObject(float, CStateManager& mgr)
}
}
void CScriptSpecialFunction::Render(CStateManager& mgr) {
void CScriptSpecialFunction::Render(const CStateManager& mgr) const {
if (xe8_function == kSF_FogVolume) {
if (GetActive()) {
const float z = mgr.IntegrateVisorFog(

8
src/MetroidPrime/ScriptObjects/CScriptTrigger.cpp
View File

@ -136,7 +136,7 @@ CAABox CScriptTrigger::GetTriggerBoundsWR() const {
x130_bounds.GetMaxPoint() + GetTranslation());
}
rstl::optional_object< CAABox > CScriptTrigger::GetTouchBounds() const override {
rstl::optional_object< CAABox > CScriptTrigger::GetTouchBounds() const {
if (GetActive()) {
return GetTriggerBoundsWR();
}
@ -144,7 +144,7 @@ rstl::optional_object< CAABox > CScriptTrigger::GetTouchBounds() const override
}
void CScriptTrigger::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
CStateManager& mgr) override {
CStateManager& mgr) {
if (GetActive()) {
if (msg == kSM_Deactivate) {
xe8_inhabitants.clear();
@ -184,7 +184,7 @@ void CScriptTrigger::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
CActor::AcceptScriptMsg(msg, uid, mgr);
}
void CScriptTrigger::Think(float dt, CStateManager& mgr) override {
void CScriptTrigger::Think(float dt, CStateManager& mgr) {
if (GetActive()) {
UpdateInhabitants(dt, mgr);
}
@ -346,7 +346,7 @@ const CScriptTrigger::CObjectTracker* CScriptTrigger::FindObject(TUniqueId id) {
return nullptr;
}
void CScriptTrigger::Accept(IVisitor& visitor) override { visitor.Visit(*this); }
void CScriptTrigger::Accept(IVisitor& visitor) { visitor.Visit(*this); }
void CScriptTrigger::InhabitantAdded(CActor&, CStateManager&) {}

2
src/MetroidPrime/ScriptObjects/CScriptWaypoint.cpp
View File

@ -76,6 +76,6 @@ void CScriptWaypoint::AddToRenderer(const CFrustumPlanes&, const CStateManager&)
// Empty
}
void CScriptWaypoint::Render(const CStateManager&) const override {}
void CScriptWaypoint::Render(const CStateManager&) const {}
void CScriptWaypoint::Accept(IVisitor& visitor) { visitor.Visit(*this); }