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

CPlayerState: match GetActiveVisor and GetIsVisorTransitioning

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

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

@ -1,6 +1,10 @@
#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/Cameras/CCameraManager.hpp"
#include "MetroidPrime/Cameras/CGameCamera.hpp"
#include "Kyoto/Math/CMath.hpp" #include "Kyoto/Math/CMath.hpp"
#include "Kyoto/Streams/CInputStream.hpp" #include "Kyoto/Streams/CInputStream.hpp"
@ -336,7 +340,7 @@ 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 || x1c_visorTransitionFactor < kMaxVisorTransitionFactor; return x14_currentVisor != x18_transitioningVisor || kMaxVisorTransitionFactor > x1c_visorTransitionFactor;
} }
float CPlayerState::GetBaseHealthCapacity() { return kBaseHealthCapacity; } float CPlayerState::GetBaseHealthCapacity() { return kBaseHealthCapacity; }
@ -381,9 +385,7 @@ void CPlayerState::UpdateStaticInterference(CStateManager& stateMgr, const float
} }
CPlayerState::EPlayerVisor CPlayerState::GetActiveVisor(const CStateManager& stateMgr) const { CPlayerState::EPlayerVisor CPlayerState::GetActiveVisor(const CStateManager& stateMgr) const {
void* cam = NULL; const CFirstPersonCamera* cam = TCastToConstPtr<CFirstPersonCamera>(*stateMgr.GetCameraManager()->GetCurrentCamera(stateMgr));
// const CFirstPersonCamera* cam =
// TCastToConstPtr<CFirstPersonCamera>(stateMgr.GetCameraManager()->GetCurrentCamera(stateMgr)).GetPtr();
return (cam ? x14_currentVisor : kPV_Combat); return (cam ? x14_currentVisor : kPV_Combat);
} }