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

Minor CActorParameters cleanup, initial CFlameThrower

Browse Source
This commit is contained in:
Phillip Stephens
2017-05-10 03:03:29 -07:00
parent c70a0d81cb
commit 3c566c2d8c
5 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/ScriptLoader.cpp
View File

@@ -216,9 +216,9 @@ CActorParameters ScriptLoader::LoadActorParameters(CInputStream& in)
if (propCount > 6)
vParms = LoadVisorParameters(in);
bool b2 = false;
bool thermalHeat = false;
if (propCount > 10)
b2 = in.readBool();
thermalHeat = in.readBool();
bool b3 = false;
if (propCount > 11)
@@ -240,7 +240,7 @@ CActorParameters ScriptLoader::LoadActorParameters(CInputStream& in)
if (g_ResFactory->GetResourceTypeById(infraModel))
infra = {infraModel, infraSkin};
return CActorParameters(lParms, sParams, xray, infra, vParms, b1, b2, b3, b4);
return CActorParameters(lParms, sParams, xray, infra, vParms, b1, thermalHeat, b3, b4);
}
return CActorParameters::None();
}