2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 23:47:42 +00:00

CActorContraption fixes, better CMake dependency handling

This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions

View File

@@ -349,7 +349,7 @@ void CScriptDebris::Touch(CActor& other, CStateManager& mgr) {
}
}
rstl::optional<zeus::CAABox> CScriptDebris::GetTouchBounds() const {
std::optional<zeus::CAABox> CScriptDebris::GetTouchBounds() const {
if (x281_31_dieOnProjectile)
return {GetBoundingBox()};
return {};