AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update nod

This commit is contained in:
Phillip Stephens 2017-07-09 02:11:59 -07:00
parent 774d0ac5c6
commit 595dae17f3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CScriptActor.cpp
View File

@ -25,7 +25,7 @@ CScriptActor::CScriptActor(TUniqueId uid, const std::string& name, const CEntity
, x2e2_24_(b2) , x2e2_24_(b2)
, x2e2_25_dead(false) , x2e2_25_dead(false)
, x2e2_26_animating(true) , x2e2_26_animating(true)
, x2e2_27_(std::fabs(f3 - 1.f) > 0.00001) , x2e2_27_(std::fabs(1.f - f3) > 0.00001)
, x2e2_28_(false) , x2e2_28_(false)
, x2e2_29_((x2e2_24_ && x2e2_25_dead && x2d8_ != 0)) , x2e2_29_((x2e2_24_ && x2e2_25_dead && x2d8_ != 0))
, x2e2_30_transposeRotate(b4) , x2e2_30_transposeRotate(b4)

18
Runtime/World/ScriptLoader.cpp
View File

@ -386,28 +386,28 @@ CEntity* ScriptLoader::LoadActor(CStateManager& mgr, CInputStream& in, int propC
zeus::CVector3f centroid; zeus::CVector3f centroid;
centroid.readBig(in); centroid.readBig(in);
float f1 = in.readFloatBig(); float mass = in.readFloatBig();
float f2 = in.readFloatBig(); float zMomentum = in.readFloatBig();
CHealthInfo hInfo(in); CHealthInfo hInfo(in);
CDamageVulnerability dInfo(in); CDamageVulnerability dVuln(in);
ResId staticId = in.readUint32Big(); ResId staticId = in.readUint32Big();
CAnimationParameters aParms = LoadAnimationParameters(in); CAnimationParameters aParms = LoadAnimationParameters(in);
CActorParameters actParms = LoadActorParameters(in); CActorParameters actParms = LoadActorParameters(in);
bool b1 = in.readBool(); bool looping = in.readBool();
bool snow = in.readBool(); bool snow = in.readBool();
bool solid = in.readBool(); bool solid = in.readBool();
bool cameraPassthrough = in.readBool(); bool cameraPassthrough = in.readBool();
bool b5 = in.readBool(); bool active = in.readBool();
u32 w2 = in.readUint32Big(); u32 w2 = in.readUint32Big();
float f3 = in.readFloatBig(); float f3 = in.readFloatBig();
bool b6 = in.readBool(); bool b6 = in.readBool();
bool b7 = in.readBool(); bool castsShadow = in.readBool();
bool b8 = in.readBool(); bool xposeRotate = in.readBool();
bool b9 = in.readBool(); bool b9 = in.readBool();
FourCC animType = g_ResFactory->GetResourceTypeById(aParms.GetACSFile()); FourCC animType = g_ResFactory->GetResourceTypeById(aParms.GetACSFile());
@ -435,8 +435,8 @@ CEntity* ScriptLoader::LoadActor(CStateManager& mgr, CInputStream& in, int propC
if ((collisionExtent.x < 0.f || collisionExtent.y < 0.f || collisionExtent.z < 0.f) || collisionExtent.isZero()) if ((collisionExtent.x < 0.f || collisionExtent.y < 0.f || collisionExtent.z < 0.f) || collisionExtent.isZero())
aabb = data.GetBounds(head.x10_transform.getRotation()); aabb = data.GetBounds(head.x10_transform.getRotation());
return new CScriptActor(mgr.AllocateUniqueId(), head.x0_name, info, head.x10_transform, std::move(data), aabb, f1, return new CScriptActor(mgr.AllocateUniqueId(), head.x0_name, info, head.x10_transform, std::move(data), aabb, mass,
f2, list, hInfo, dInfo, actParms, b1, b5, w2, f3, b6, b7, b8, b9); zMomentum, list, hInfo, dVuln, actParms, looping, active, w2, f3, b6, castsShadow, xposeRotate, b9);
} }
CEntity* ScriptLoader::LoadWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info) CEntity* ScriptLoader::LoadWaypoint(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)

2
nod

@ -1 +1 @@
Subproject commit 72169e8e774a6d6859abb42954b6f2a0ef184789 Subproject commit e99290e3c331cf5128b754a63612cd21afcd3c50