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

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-05-26 18:22:38 -10:00
parent 92ed463051
commit cc6d79e280
25 changed files with 182 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/World/CWorld.cpp
View File

@@ -557,25 +557,25 @@ void CWorld::TravelToArea(TAreaId aid, CStateManager& mgr, bool skipLoadOther)
++toStreamCount;
}
if (!toStreamCount && otherLoadArea && !x70_25_paused)
if (!toStreamCount && otherLoadArea && !x70_25_loadPaused)
otherLoadArea->StartStreamIn(mgr);
x28_mapWorld->SetWhichMapAreasLoaded(*this, aid, 3);
}
void CWorld::SetPauseState(bool paused)
void CWorld::SetLoadPauseState(bool paused)
{
for (auto it = GetChainHead(EChain::Loading) ; it != AliveAreasEnd() ; ++it)
it->SetPauseState(paused);
x70_25_paused = paused;
it->SetLoadPauseState(paused);
x70_25_loadPaused = paused;
}
void CWorld::CyclePauseState()
void CWorld::CycleLoadPauseState()
{
if (!x70_25_paused)
if (!x70_25_loadPaused)
{
SetPauseState(true);
SetPauseState(false);
SetLoadPauseState(true);
SetLoadPauseState(false);
}
}