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

Various implementatations

Browse Source
This commit is contained in:
Phillip Stephens
2016-04-29 03:08:46 -07:00
parent 10dcbaa6c9
commit 00a98bce85
37 changed files with 341 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CScriptCoverPoint.cpp
View File

@@ -26,12 +26,12 @@ void CScriptCoverPoint::Think(float delta, CStateManager&)
x11c_timeLeft -= delta;
}
const zeus::CAABox* CScriptCoverPoint::GetTouchBounds() const
rstl::optional_object<zeus::CAABox> CScriptCoverPoint::GetTouchBounds() const
{
if (x100_touchBounds)
return &x100_touchBounds.value();
return x100_touchBounds;
return nullptr;
return {};
}
void CScriptCoverPoint::SetInUse(bool inUse)
@@ -119,7 +119,7 @@ void CScriptCoverPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
{
CActor::AcceptScriptMsg(msg, uid, mgr);
if (msg == EScriptObjectMessage::UNKM4)
if (msg == EScriptObjectMessage::UNKM15)
{
for (const SConnection& con : x20_conns)
if (con.x0_state == EScriptObjectState::Retreat)