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

CActorContraption fixes, better CMake dependency handling

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CScriptDamageableTrigger.cpp
View File

@@ -190,7 +190,7 @@ void CScriptDamageableTrigger::Think(float dt, CStateManager& mgr) {
SetLinkedObjectAlpha(objAlpha, mgr);
}
rstl::optional<zeus::CAABox> CScriptDamageableTrigger::GetTouchBounds() const {
std::optional<zeus::CAABox> CScriptDamageableTrigger::GetTouchBounds() const {
if (x30_24_active && x300_24_notOccluded)
return {zeus::CAABox(x14c_bounds.min + GetTranslation(), x14c_bounds.max + GetTranslation())};
return {};