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

CFireFlea: Make colors constexpr internal details 

Same behavior, but makes the color constants fully internal details.
This commit is contained in:
Lioncash 2020-04-05 05:25:44 -04:00
parent a49d26f800
commit 99c564cfe4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/World/CFireFlea.cpp
View File

@ -8,11 +8,13 @@
#include "TCastTo.hpp" // Generated file, do not modify include path #include "TCastTo.hpp" // Generated file, do not modify include path
namespace urde::MP1 { namespace urde::MP1 {
namespace {
constexpr zeus::CColor skEndFadeColor{1.f, 1.f, 0.5f, 1.f};
constexpr zeus::CColor skStartFadeColor{1.f, 0.f, 0.f, 0.f};
} // Anonymous namespace
// region Fire Flea Death Camera // region Fire Flea Death Camera
const zeus::CColor CFireFlea::CDeathCameraEffect::skEndFadeColor{1.f, 1.f, 0.5f, 1.f};
const zeus::CColor CFireFlea::CDeathCameraEffect::skStartFadeColor{1.f, 0.f, 0.f, 0.f};
zeus::CColor CFireFlea::CDeathCameraEffect::sCurrentFadeColor = zeus::skClear; zeus::CColor CFireFlea::CDeathCameraEffect::sCurrentFadeColor = zeus::skClear;
CFireFlea::CDeathCameraEffect::CDeathCameraEffect(TUniqueId uid, TAreaId areaId, std::string_view name) CFireFlea::CDeathCameraEffect::CDeathCameraEffect(TUniqueId uid, TAreaId areaId, std::string_view name)

2
Runtime/MP1/World/CFireFlea.hpp
View File

@ -18,8 +18,6 @@ class CFireFlea : public CPatterned {
u32 x44_ = 0; u32 x44_ = 0;
public: public:
static const zeus::CColor skStartFadeColor;
static const zeus::CColor skEndFadeColor;
static zeus::CColor sCurrentFadeColor; static zeus::CColor sCurrentFadeColor;
CDeathCameraEffect(TUniqueId, TAreaId, std::string_view); CDeathCameraEffect(TUniqueId, TAreaId, std::string_view);