2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:47:43 +00:00

Windows fixes

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

View File

@@ -25,7 +25,7 @@ class CScriptCoverPoint : public CActor {
};
TUniqueId xfa_occupant = kInvalidUniqueId;
TUniqueId xfc_retreating = kInvalidUniqueId;
std::experimental::optional<zeus::CAABox> x100_touchBounds;
rstl::optional<zeus::CAABox> x100_touchBounds;
float x11c_timeLeft = 0.f;
public:
@@ -37,7 +37,7 @@ public:
void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const {}
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Render(const CStateManager&) const {}
std::experimental::optional<zeus::CAABox> GetTouchBounds() const;
rstl::optional<zeus::CAABox> GetTouchBounds() const;
void SetInUse(bool inUse);
bool GetInUse(TUniqueId uid) const;
bool ShouldLandHere() const { return xe8_26_landHere; }