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

CPowerBomb: Make kFadeColor internally linked 

Hides the name from external view entirely and allows the color instance
to be constexpr.
This commit is contained in:
Lioncash 2020-03-12 10:12:28 -04:00
parent d93df18a37
commit ee952b9c99
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Weapon/CPowerBomb.cpp
View File

@ -12,9 +12,10 @@
#include "TCastTo.hpp" // Generated file, do not modify include path #include "TCastTo.hpp" // Generated file, do not modify include path
namespace urde { #include <zeus/CColor.hpp>
const zeus::CColor CPowerBomb::kFadeColor(COLOR(0xffffff7)); namespace urde {
constexpr zeus::CColor kFadeColor(COLOR(0xffffff7));
CPowerBomb::CPowerBomb(const TToken<CGenDescription>& particle, TUniqueId uid, TAreaId aid, TUniqueId playerId, CPowerBomb::CPowerBomb(const TToken<CGenDescription>& particle, TUniqueId uid, TAreaId aid, TUniqueId playerId,
const zeus::CTransform& xf, const CDamageInfo& dInfo) const zeus::CTransform& xf, const CDamageInfo& dInfo)

2
Runtime/Weapon/CPowerBomb.hpp
View File

@ -7,13 +7,11 @@
#include "Runtime/Weapon/CWeapon.hpp" #include "Runtime/Weapon/CWeapon.hpp"
#include <zeus/CAABox.hpp> #include <zeus/CAABox.hpp>
#include <zeus/CColor.hpp>
namespace urde { namespace urde {
class CElementGen; class CElementGen;
class CPowerBomb : public CWeapon { class CPowerBomb : public CWeapon {
static const zeus::CColor kFadeColor;
bool x158_24_canStartFilter : 1; bool x158_24_canStartFilter : 1;
bool x158_25_filterEnabled : 1; bool x158_25_filterEnabled : 1;
float x15c_curTime = 0.f; float x15c_curTime = 0.f;