AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 07:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Various AutoMapper render fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-11-15 22:05:10 -10:00
parent 21505e46ce
commit a914e121ea
12 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/MP1/CInGameGuiManager.cpp
View File

@@ -319,7 +319,7 @@ void CInGameGuiManager::OnNewPauseScreenState(CArchitectureQueue& archQueue)
{
if (x1c0_nextState != EInGameGuiState::PauseGame && x1c0_nextState != EInGameGuiState::PauseLogBook)
{
if (x48_pauseScreen->IsTransitioning())
if (x48_pauseScreen && x48_pauseScreen->IsTransitioning())
return;
x48_pauseScreen.reset();
}
@@ -481,7 +481,7 @@ void CInGameGuiManager::Update(CStateManager& stateMgr, float dt, CArchitectureQ
{
if (x1c0_nextState == EInGameGuiState::Zero || x1c0_nextState == EInGameGuiState::InGame)
TryReloadAreaTextures();
if ((x1bc_prevState == x1c0_nextState || !x1e8_enableAutoMapper) &&
if ((!x38_autoMapper->IsInMapperStateTransition() || !x1e8_enableAutoMapper) &&
x3c_pauseScreenBlur->IsNotTransitioning())
OnNewPauseScreenState(archQueue);
}