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

Finish CScriptPlatform

Browse Source
This commit is contained in:
Jack Andersen
2018-06-29 10:21:36 -10:00
parent 3a9e7b2f9b
commit d0af2cb4f7
75 changed files with 590 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Runtime/World/ScriptLoader.cpp
View File

@@ -633,19 +633,19 @@ CEntity* ScriptLoader::LoadPlatform(CStateManager& mgr, CInputStream& in, int pr
CActorParameters actParms = LoadActorParameters(in);
float f1 = in.readFloatBig();
bool b1 = in.readBool();
float speed = in.readFloatBig();
bool active = in.readBool();
CAssetId dclnId = in.readUint32Big();
CHealthInfo hInfo(in);
CDamageVulnerability dInfo(in);
bool b2 = in.readBool();
float f2 = in.readFloatBig();
bool b3 = in.readBool();
u32 w2 = in.readUint32Big();
u32 w3 = in.readUint32Big();
bool detectCollision = in.readBool();
float xrayAlpha = in.readFloatBig();
bool rainSplashes = in.readBool();
u32 maxRainSplashes = in.readUint32Big();
u32 rainGenRate = in.readUint32Big();
FourCC animType = g_ResFactory->GetResourceTypeById(aParms.GetACSFile());
if (!g_ResFactory->GetResourceTypeById(staticId) && !animType)
@@ -671,7 +671,8 @@ CEntity* ScriptLoader::LoadPlatform(CStateManager& mgr, CInputStream& in, int pr
aabb = data.GetBounds(head.x10_transform.getRotation());
return new CScriptPlatform(mgr.AllocateUniqueId(), head.x0_name, info, head.x10_transform, std::move(data),
actParms, aabb, f1, b2, f2, b1, hInfo, dInfo, dclnToken, b3, w2, w3);
actParms, aabb, speed, detectCollision, xrayAlpha, active, hInfo, dInfo,
dclnToken, rainSplashes, maxRainSplashes, rainGenRate);
}
CEntity* ScriptLoader::LoadSound(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)