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

Windows fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-01-28 22:28:35 -10:00
parent 4dd40f519e
commit ad2681f857
178 changed files with 303 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CScriptTrigger.cpp
View File

@@ -200,7 +200,7 @@ void CScriptTrigger::UpdateInhabitants(float dt, CStateManager& mgr) {
std::list<CScriptTrigger::CObjectTracker>& CScriptTrigger::GetInhabitants() { return xe8_inhabitants; }
std::experimental::optional<zeus::CAABox> CScriptTrigger::GetTouchBounds() const {
rstl::optional<zeus::CAABox> CScriptTrigger::GetTouchBounds() const {
if (x30_24_active)
return {GetTriggerBoundsWR()};
return {};