AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:47:43 +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.hpp
View File

@@ -76,7 +76,7 @@ public:
CObjectTracker* FindObject(TUniqueId);
void UpdateInhabitants(float, CStateManager&);
std::list<CObjectTracker>& GetInhabitants();
std::experimental::optional<zeus::CAABox> GetTouchBounds() const;
rstl::optional<zeus::CAABox> GetTouchBounds() const;
void Touch(CActor&, CStateManager&);
const zeus::CAABox& GetTriggerBoundsOR() const { return x130_bounds; }
zeus::CAABox GetTriggerBoundsWR() const;