AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 04:57:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #212 from lioncash/power-color

Browse Source 
CPowerBomb: Make kFadeColor internally linked
This commit is contained in:
Phillip Stephens
2020-03-12 15:10:40 -07:00
committed by GitHub
parent 8badbd3f35 ee952b9c99
commit 7601888e34
2 changed files with 3 additions and 4 deletions
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
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,
const zeus::CTransform& xf, const CDamageInfo& dInfo)

2
Runtime/Weapon/CPowerBomb.hpp
View File

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