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

Nearly finish CScriptWater

Browse Source
This commit is contained in:
Jack Andersen
2017-08-12 21:56:35 -10:00
parent e0efcc0e5c
commit e25d2a423d
29 changed files with 1059 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/World/CScriptTrigger.hpp
View File

@@ -58,7 +58,7 @@ protected:
struct
{
bool x148_24_playerInside : 1;
bool x148_25_ : 1;
bool x148_25_camSubmerged : 1;
bool x148_26_deactivateOnEntered : 1;
bool x148_27_deactivateOnExited : 1;
bool x148_28_ : 1;
@@ -84,6 +84,7 @@ public:
std::list<CObjectTracker>& GetInhabitants();
rstl::optional_object<zeus::CAABox> GetTouchBounds() const;
void Touch(CActor &, CStateManager &);
const zeus::CAABox& GetTriggerBoundsOR() const { return x130_bounds; }
zeus::CAABox GetTriggerBoundsWR() const;
const CDamageInfo& GetDamageInfo() const { return x100_damageInfo; }
ETriggerFlags GetTriggerFlags() const { return x12c_flags; }