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

2
Runtime/World/CScriptPickup.hpp
View File

@@ -29,7 +29,7 @@ public:
void Accept(IVisitor& visitor);
void Think(float, CStateManager&);
void Touch(CActor&, CStateManager&);
rstl::optional<zeus::CAABox> GetTouchBounds() const { return CPhysicsActor::GetBoundingBox(); }
std::optional<zeus::CAABox> GetTouchBounds() const { return CPhysicsActor::GetBoundingBox(); }
float GetPossibility() const { return x264_possibility; }
CPlayerState::EItemType GetItem() const { return x258_itemType; }
void SetGenerated() { x28c_24_generated = true; }