2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 05:07:43 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
2020-05-22 03:37:08 -04:00
16 changed files with 116 additions and 99 deletions

View File

@@ -31,7 +31,7 @@ using CPatternedTryFunc = void (CPatterned::*)(CStateManager&, int);
class CPatterned : public CAi {
public:
static const zeus::CColor skDamageColor;
static constexpr zeus::CColor skDamageColor{0.5f, 0.f, 0.f};
enum class ECharacter {
AtomicAlpha = 0,
AtomicBeta = 1,