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

Additional HUD work

Browse Source
This commit is contained in:
Jack Andersen
2017-04-08 20:14:22 -10:00
parent e070844e8a
commit 9cd421888d
17 changed files with 313 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CScriptTrigger.hpp
View File

@@ -30,7 +30,7 @@ enum class ETriggerFlags : u32
DetectUnmorphedPlayer = (1 << 16),
BlockEnvironmentalEffects = (1 << 17)
};
ENABLE_BITWISE_ENUM(ETriggerFlags);
ENABLE_BITWISE_ENUM(ETriggerFlags)
class CScriptTrigger : public CActor
{
@@ -85,6 +85,8 @@ public:
rstl::optional_object<zeus::CAABox> GetTouchBounds() const;
void Touch(CActor &, CStateManager &);
zeus::CAABox GetTriggerBoundsWR() const;
const CDamageInfo& GetDamageInfo() const { return x100_damageInfo; }
ETriggerFlags GetTriggerFlags() const { return x12c_flags; }
};
}