AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CPatterned: Make skDamageColor fully constexpr

This commit is contained in:
Lioncash 2020-05-15 16:51:17 -04:00
parent 7d3b43712d
commit 871d3dc6ec
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/World/CPatterned.cpp
View File

@ -25,7 +25,6 @@
namespace urde { namespace urde {
constexpr zeus::CColor CPatterned::skDamageColor(0.5f, 0.f, 0.f);
constexpr CMaterialList skPatternedGroundMaterialList(EMaterialTypes::Character, EMaterialTypes::Solid, constexpr CMaterialList skPatternedGroundMaterialList(EMaterialTypes::Character, EMaterialTypes::Solid,
EMaterialTypes::Orbit, EMaterialTypes::GroundCollider, EMaterialTypes::Orbit, EMaterialTypes::GroundCollider,
EMaterialTypes::Target); EMaterialTypes::Target);

2
Runtime/World/CPatterned.hpp
View File

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