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

Fill in remaining door properties

This commit is contained in:
Jack Andersen 2018-05-21 21:53:42 -10:00
parent 1ada86cc03
commit 3ceaa82035
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DataSpec/DNAMP1/ScriptObjects/DoorArea.hpp
View File

@ -20,11 +20,11 @@ struct DoorArea : IScriptObject
Value<atVec3f> orbitPos; Value<atVec3f> orbitPos;
Value<atVec3f> collisionExtent; Value<atVec3f> collisionExtent;
Value<atVec3f> collisionOffset; Value<atVec3f> collisionOffset;
Value<bool> unknown4; Value<bool> active;
Value<bool> unknown5; Value<bool> open;
Value<bool> unknown6; Value<bool> projectilesCollide;
Value<float> unknown7; Value<float> animationLength;
Value<bool> unknown8; Value<bool> isMorphballDoor;
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter,
std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const std::unordered_map<UniqueID32, std::pair<UniqueID32, UniqueID32>>& addTo) const

4
Runtime/World/ScriptLoader.cpp
View File

@ -481,7 +481,7 @@ CEntity* ScriptLoader::LoadDoor(CStateManager& mgr, CInputStream& in, int propCo
bool active = in.readBool(); bool active = in.readBool();
bool open = in.readBool(); bool open = in.readBool();
bool b3 = in.readBool(); bool projectilesCollide = in.readBool();
float animationLength = in.readFloatBig(); float animationLength = in.readFloatBig();
zeus::CAABox aabb = GetCollisionBox(mgr, info.GetAreaId(), collisionExtent, offset); zeus::CAABox aabb = GetCollisionBox(mgr, info.GetAreaId(), collisionExtent, offset);
@ -504,7 +504,7 @@ CEntity* ScriptLoader::LoadDoor(CStateManager& mgr, CInputStream& in, int propCo
isMorphballDoor = in.readBool(); isMorphballDoor = in.readBool();
return new CScriptDoor(mgr.AllocateUniqueId(), head.x0_name, info, head.x10_transform, std::move(mData), actParms, return new CScriptDoor(mgr.AllocateUniqueId(), head.x0_name, info, head.x10_transform, std::move(mData), actParms,
orbitPos, aabb, active, open, b3, animationLength, isMorphballDoor); orbitPos, aabb, active, open, projectilesCollide, animationLength, isMorphballDoor);
} }
CEntity* ScriptLoader::LoadTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info) CEntity* ScriptLoader::LoadTrigger(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)