AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 13:47:43 +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

10
Runtime/World/CGameArea.cpp
View File

@@ -419,7 +419,7 @@ CGameArea::CGameArea(CInputStream& in, int idx, int mlvlVersion)
xf0_24_postConstructed = false;
xf0_25_active = true;
xf0_26_tokensReady = false;
xf0_27_paused = false;
xf0_27_loadPaused = false;
xf0_28_validated = false;
x8_nameSTRG = in.readUint32Big();
xc_transform.read34RowMajor(in);
@@ -470,7 +470,7 @@ CGameArea::CGameArea(CAssetId mreaId)
xf0_24_postConstructed = false;
xf0_25_active = false;
xf0_26_tokensReady = false;
xf0_27_paused = false;
xf0_27_loadPaused = false;
xf0_28_validated = false;
while (StartStreamingMainArea())
@@ -552,11 +552,11 @@ const zeus::CTransform& CGameArea::IGetTM() const
return xc_transform;
}
void CGameArea::SetPauseState(bool paused)
void CGameArea::SetLoadPauseState(bool paused)
{
if (xf0_26_tokensReady)
return;
xf0_27_paused = paused;
xf0_27_loadPaused = paused;
if (!paused)
return;
@@ -982,7 +982,7 @@ void CGameArea::CullDeadAreaRequests()
void CGameArea::StartStreamIn(CStateManager& mgr)
{
if (xf0_24_postConstructed || xf0_27_paused)
if (xf0_24_postConstructed || xf0_27_loadPaused)
return;
VerifyTokenList(mgr);