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

rstl::optional is no more

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:14:39 -10:00
parent 0e8e3e906c
commit 8266f52cc2
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/MP1/World/CFlaahgra.hpp
View File

@@ -46,7 +46,7 @@ public:
void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const;
void Accept(IVisitor&);
rstl::optional<zeus::CAABox> GetTouchBounds() const { return {}; }
std::optional<zeus::CAABox> GetTouchBounds() const { return {}; }
};
class CFlaahgra : public CPatterned {
@@ -101,7 +101,7 @@ class CFlaahgra : public CPatterned {
zeus::CVector3f x894_;
zeus::CVector3f x8a0_;
CAnimRes x8ac_;
rstl::optional<TToken<CDependencyGroup>> x8c8_depGroup;
std::optional<TToken<CDependencyGroup>> x8c8_depGroup;
bool x8d0_ = false;
std::vector<CToken> x8d4_tokens;
union {