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

Format file

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-04 17:15:16 +03:00
parent e03f153312
commit 70cea3cc33
No known key found for this signature in database
GPG Key ID: E224F951761145F8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/MetroidPrime/Player/CPlayerState.cpp
View File

@ -1,10 +1,11 @@
#include "MetroidPrime/Player/CPlayerState.hpp" #include "MetroidPrime/Player/CPlayerState.hpp"
#include "MetroidPrime/TCastTo.hpp"
#include "MetroidPrime/CMemoryCard.hpp" #include "MetroidPrime/CMemoryCard.hpp"
#include "MetroidPrime/CStateManager.hpp" #include "MetroidPrime/CStateManager.hpp"
#include "MetroidPrime/Cameras/CCameraManager.hpp" #include "MetroidPrime/Cameras/CCameraManager.hpp"
#include "MetroidPrime/Cameras/CGameCamera.hpp" #include "MetroidPrime/Cameras/CGameCamera.hpp"
#include "MetroidPrime/TCastTo.hpp"
#include "Kyoto/Math/CMath.hpp" #include "Kyoto/Math/CMath.hpp"
#include "Kyoto/Streams/CInputStream.hpp" #include "Kyoto/Streams/CInputStream.hpp"
@ -337,10 +338,13 @@ void CPlayerState::UpdateVisorTransition(float dt) {
} }
} }
float CPlayerState::GetVisorTransitionFactor() const { return x1c_visorTransitionFactor / kMaxVisorTransitionFactor; } float CPlayerState::GetVisorTransitionFactor() const {
return x1c_visorTransitionFactor / kMaxVisorTransitionFactor;
}
bool CPlayerState::GetIsVisorTransitioning() const { bool CPlayerState::GetIsVisorTransitioning() const {
return x14_currentVisor != x18_transitioningVisor || kMaxVisorTransitionFactor > x1c_visorTransitionFactor; return x14_currentVisor != x18_transitioningVisor ||
kMaxVisorTransitionFactor > x1c_visorTransitionFactor;
} }
float CPlayerState::GetBaseHealthCapacity() { return kBaseHealthCapacity; } float CPlayerState::GetBaseHealthCapacity() { return kBaseHealthCapacity; }
@ -385,7 +389,8 @@ void CPlayerState::UpdateStaticInterference(CStateManager& stateMgr, const float
} }
CPlayerState::EPlayerVisor CPlayerState::GetActiveVisor(const CStateManager& stateMgr) const { CPlayerState::EPlayerVisor CPlayerState::GetActiveVisor(const CStateManager& stateMgr) const {
const CFirstPersonCamera* cam = TCastToConstPtr<CFirstPersonCamera>(*stateMgr.GetCameraManager()->GetCurrentCamera(stateMgr)); const CFirstPersonCamera* cam = TCastToConstPtr< CFirstPersonCamera >(
*stateMgr.GetCameraManager()->GetCurrentCamera(stateMgr));
return (cam ? x14_currentVisor : kPV_Combat); return (cam ? x14_currentVisor : kPV_Combat);
} }