2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 07:07:42 +00:00

Code cleanup and corrections

This commit is contained in:
2017-01-06 17:58:05 -08:00
parent 28ca7c388c
commit 353dbadfe9
25 changed files with 478 additions and 202 deletions

View File

@@ -827,14 +827,14 @@ CEntity* ScriptLoader::LoadSpawnPoint(CStateManager& mgr, CInputStream& in, int
for (int i = 0; i < propCount - 6; ++i)
itemCounts.push_back(in.readUint32Big());
bool b1 = in.readBool();
bool b2 = in.readBool();
bool b3 = false;
bool defaultSpawn = in.readBool();
bool active = in.readBool();
bool morphed = false;
if (propCount > 34)
b3 = in.readBool();
morphed = in.readBool();
return new CScriptSpawnPoint(mgr.AllocateUniqueId(), *name, info,
ConvertEditorEulerToTransform4f(rotation, position), itemCounts, b1, b2, b3);
ConvertEditorEulerToTransform4f(rotation, position), itemCounts, defaultSpawn, active, morphed);
}
CEntity* ScriptLoader::LoadCameraHint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)