AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Always keep scan visor graphics loaded

This commit is contained in:
Jack Andersen 2018-01-07 09:55:09 -10:00
parent 4e5c991424
commit 9bdb1cd1a5
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/CPlayerVisor.cpp
View File

@ -324,6 +324,7 @@ CPlayerVisor::GetDesiredScanWindowState(const CStateManager& mgr) const
void CPlayerVisor::LockUnlockAssets() void CPlayerVisor::LockUnlockAssets()
{ {
#if 0
if (x1c_curVisor == CPlayerState::EPlayerVisor::Scan) if (x1c_curVisor == CPlayerState::EPlayerVisor::Scan)
x120_assetLockCountdown = 2; x120_assetLockCountdown = 2;
else if (x120_assetLockCountdown > 0) else if (x120_assetLockCountdown > 0)
@ -353,6 +354,7 @@ void CPlayerVisor::LockUnlockAssets()
x124_scanIconNoncritical.Unlock(); x124_scanIconNoncritical.Unlock();
x130_scanIconCritical.Unlock(); x130_scanIconCritical.Unlock();
} }
#endif
} }
void CPlayerVisor::DrawScanEffect(const CStateManager& mgr, const CTargetingManager* tgtMgr) const void CPlayerVisor::DrawScanEffect(const CStateManager& mgr, const CTargetingManager* tgtMgr) const

16
Runtime/MP1/CPlayerVisor.hpp
View File

@ -57,17 +57,17 @@ class CPlayerVisor
CCameraBlurPass x90_xrayBlur; CCameraBlurPass x90_xrayBlur;
float xc4_vpScaleX = 1.f; float xc4_vpScaleX = 1.f;
float xc8_vpScaleY = 1.f; float xc8_vpScaleY = 1.f;
TCachedToken<CModel> xcc_scanFrameCorner; TLockedToken<CModel> xcc_scanFrameCorner;
TCachedToken<CModel> xd8_scanFrameCenterSide; TLockedToken<CModel> xd8_scanFrameCenterSide;
TCachedToken<CModel> xe4_scanFrameCenterTop; TLockedToken<CModel> xe4_scanFrameCenterTop;
TCachedToken<CModel> xf0_scanFrameStretchSide; TLockedToken<CModel> xf0_scanFrameStretchSide;
TCachedToken<CModel> xfc_scanFrameStretchTop; TLockedToken<CModel> xfc_scanFrameStretchTop;
//TCachedToken<CModel> x108_newScanPane; //TCachedToken<CModel> x108_newScanPane;
CTexturedQuadFilter x108_newScanPane; CTexturedQuadFilter x108_newScanPane;
TCachedToken<CModel> x114_scanShield; TLockedToken<CModel> x114_scanShield;
int x120_assetLockCountdown = 0; int x120_assetLockCountdown = 0;
TCachedToken<CModel> x124_scanIconNoncritical; TLockedToken<CModel> x124_scanIconNoncritical;
TCachedToken<CModel> x130_scanIconCritical; TLockedToken<CModel> x130_scanIconCritical;
rstl::reserved_vector<SScanTarget, 64> x13c_scanTargets; rstl::reserved_vector<SScanTarget, 64> x13c_scanTargets;
TLockedToken<CTexture> x540_xrayPalette; TLockedToken<CTexture> x540_xrayPalette;
float x54c_frameColorInterp = 0.f; float x54c_frameColorInterp = 0.f;