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

Remove rstl::optional_object, various cleanups, implement CExplosion and CScriptDoor

Browse Source
This commit is contained in:
Phillip Stephens
2018-04-29 20:12:41 -07:00
parent 6d60ccfd04
commit 711c3e0d2c
79 changed files with 486 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CScriptSpiderBallAttractionSurface.cpp
View File

@@ -29,7 +29,7 @@ void CScriptSpiderBallAttractionSurface::AcceptScriptMsg(EScriptObjectMessage ms
CActor::AcceptScriptMsg(msg, sender, mgr);
}
rstl::optional_object<zeus::CAABox> CScriptSpiderBallAttractionSurface::GetTouchBounds() const
std::experimental::optional<zeus::CAABox> CScriptSpiderBallAttractionSurface::GetTouchBounds() const
{
if (GetActive())
return {zeus::CAABox(xf4_aabb.min + GetTranslation(), xf4_aabb.max + GetTranslation())};