marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do object post-load actions after global prop list denumeration. (#1240) 

Post-load would access the action proplist which might have a non-denumerated prototype.
issue1247
Sven Eberhardt 2015-01-21 23:17:36 +01:00
parent 4311ea9aac
commit 3d59e77f48
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/C4Game.cpp
View File

@ -1695,7 +1695,7 @@ bool C4Game::CompileRuntimeData(C4Group &hGroup, bool fLoadSection, bool exact,
GameText.GetDataBuf(), C4CFN_Game))
return false;
// Objects
int32_t iObjects=Objects.PostLoad(fLoadSection, numbers);
int32_t iObjects = Objects.ObjectCount();
if (iObjects) { LogF(LoadResStr("IDS_PRC_OBJECTSLOADED"),iObjects); }
}
// Music System: Set play list
@ -2195,6 +2195,9 @@ bool C4Game::InitGame(C4Group &hGroup, bool fLoadSection, bool fLoadSky, C4Value
if (!fLoadSection) ScriptEngine.Denumerate(numbers);
if (!fLoadSection && pGlobalEffects) pGlobalEffects->Denumerate(numbers);
numbers->Denumerate();
// Object.PostLoad must happen after number->Denumerate(), becuase UpdateFace() will access Action proplist,
// which might have a non-denumerated prototype otherwise
Objects.PostLoad(fLoadSection, numbers);
// Check object enumeration
if (!CheckObjectEnumeration()) return false;