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

Initial CJointCollisionDescription imps, minor CScriptTrigger cleanup

Browse Source
This commit is contained in:
Phillip Stephens
2017-04-22 04:04:07 -07:00
parent 337ffd1c16
commit 1845a1465b
5 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/World/ScriptLoader.cpp
View File

@@ -511,16 +511,13 @@ CEntity* ScriptLoader::LoadTrigger(CStateManager& mgr, CInputStream& in, int pro
std::string name = mgr.HashInstanceName(in);
zeus::CVector3f position;
position.readBig(in);
zeus::CVector3f position = zeus::CVector3f::ReadBig(in);
zeus::CVector3f extent;
extent.readBig(in);
zeus::CVector3f extent = zeus::CVector3f::ReadBig(in);
CDamageInfo dInfo(in);
zeus::CVector3f forceVec;
forceVec.readBig(in);
zeus::CVector3f forceVec = zeus::CVector3f::ReadBig(in);
ETriggerFlags flags = ETriggerFlags(in.readUint32Big());
bool active = in.readBool();