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

Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

Browse Source
This commit is contained in:
Jack Andersen
2018-05-19 20:15:22 -10:00
parent f60af632b3 259a2d431c
commit 13747ff61f
8 changed files with 420 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CScriptDoor.cpp
View File

@@ -104,7 +104,7 @@ void CScriptDoor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStat
{
if (TCastToPtr<CScriptDoor> door = mgr.ObjectById(x27c_partner1))
{
if (x2a8_26_isOpen)
if (!x2a8_26_isOpen)
return;
x2a8_30_doClose = true;
mgr.SendScriptMsg(door, GetUniqueId(), EScriptObjectMessage::Close);
@@ -154,7 +154,10 @@ void CScriptDoor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStat
{
TUniqueId dock = mgr.GetIdForScript(conn.x8_objId);
if (TCastToConstPtr<CScriptDock> d = mgr.GetObjectById(dock))
{
x282_dockId = d->GetUniqueId();
break;
}
}
}
break;
@@ -345,6 +348,9 @@ u32 CScriptDoor::GetDoorOpenCondition(CStateManager& mgr)
if (destArea < 0 || destArea >= mgr.GetWorld()->GetNumAreas())
return 0;
if (!mgr.GetWorld()->GetAreaAlways(destArea)->IsPostConstructed())
return 1;
if (!mgr.GetWorld()->AreSkyNeedsMet())
return 1;