AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 17:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Remove rstl::optional_object, various cleanups, implement CExplosion and CScriptDoor

Browse Source
This commit is contained in:
Phillip Stephens
2018-04-29 20:12:41 -07:00
parent 6d60ccfd04
commit 711c3e0d2c
79 changed files with 486 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CScriptDoor.hpp
View File

@@ -17,10 +17,12 @@ public:
Ready,
};
float x258_;
float x25c_;
EDoorAnimType x260_doorState = EDoorAnimType::Open;
zeus::CAABox x264_;
TUniqueId x27c_partner = kInvalidUniqueId;
TUniqueId x27c_partner1 = kInvalidUniqueId;
TUniqueId x27e_partner2 = kInvalidUniqueId;
TUniqueId x280_ = kInvalidUniqueId;
TUniqueId x282_dockId = kInvalidUniqueId;
zeus::CAABox x284_modelBounds;
@@ -67,7 +69,7 @@ public:
void OpenDoor(TUniqueId, CStateManager&);
u32 GetDoorOpenCondition(CStateManager& mgr);
void SetDoorAnimation(EDoorAnimType);
rstl::optional_object<zeus::CAABox> GetProjectileBounds() const;
std::experimental::optional<zeus::CAABox> GetProjectileBounds() const;
};
}