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

Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

Browse Source
This commit is contained in:
Jack Andersen
2018-05-07 19:10:39 -10:00
parent 1c977e8021 3bc1fc1160
commit b58ebc1af5
12 changed files with 384 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/World/CGameArea.cpp
View File

@@ -416,7 +416,11 @@ const zeus::CTransform& CDummyGameArea::IGetTM() const
CGameArea::CGameArea(CInputStream& in, int idx, int mlvlVersion)
: x4_selfIdx(idx)
{
xf0_24_postConstructed = false;
xf0_25_active = true;
xf0_26_tokensReady = false;
xf0_27_paused = false;
xf0_28_validated = false;
x8_nameSTRG = in.readUint32Big();
xc_transform.read34RowMajor(in);
x3c_invTransform = xc_transform.inverse();
@@ -463,6 +467,12 @@ CGameArea::CGameArea(CInputStream& in, int idx, int mlvlVersion)
CGameArea::CGameArea(CAssetId mreaId)
: x84_mrea(mreaId)
{
xf0_24_postConstructed = false;
xf0_25_active = false;
xf0_26_tokensReady = false;
xf0_27_paused = false;
xf0_28_validated = false;
while (StartStreamingMainArea())
for (auto& req : xf8_loadTransactions)
req->WaitUntilComplete();
@@ -908,7 +918,7 @@ void CGameArea::AllocNewAreaData(int offset, int size)
bool CGameArea::Invalidate(CStateManager* mgr)
{
if (xf0_24_postConstructed)
if (!xf0_24_postConstructed)
{
ClearTokenList();