AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 08:27:42 +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

4
Runtime/World/CFire.hpp
View File

@@ -10,7 +10,7 @@ class CFire : public CActor {
TUniqueId xec_ownerId;
CDamageInfo xf0_damageInfo;
CDamageInfo x10c_damageInfo;
rstl::optional<zeus::CAABox> x128_;
std::optional<zeus::CAABox> x128_;
float x144_;
bool x148_24_ : 1;
bool x148_25_ : 1;
@@ -31,7 +31,7 @@ public:
void Accept(IVisitor&);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
void Think(float, CStateManager&);
rstl::optional<zeus::CAABox> GetTouchBounds() const {
std::optional<zeus::CAABox> GetTouchBounds() const {
if (GetActive())
return x128_;