From ee952b9c995de11ec2a5743bbd3b93affaa57275 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 12 Mar 2020 10:12:28 -0400 Subject: [PATCH] CPowerBomb: Make kFadeColor internally linked Hides the name from external view entirely and allows the color instance to be constexpr. --- Runtime/Weapon/CPowerBomb.cpp | 5 +++-- Runtime/Weapon/CPowerBomb.hpp | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Runtime/Weapon/CPowerBomb.cpp b/Runtime/Weapon/CPowerBomb.cpp index 40a0b27bb..abbf37a46 100644 --- a/Runtime/Weapon/CPowerBomb.cpp +++ b/Runtime/Weapon/CPowerBomb.cpp @@ -12,9 +12,10 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +#include -const zeus::CColor CPowerBomb::kFadeColor(COLOR(0xffffff7)); +namespace urde { +constexpr zeus::CColor kFadeColor(COLOR(0xffffff7)); CPowerBomb::CPowerBomb(const TToken& particle, TUniqueId uid, TAreaId aid, TUniqueId playerId, const zeus::CTransform& xf, const CDamageInfo& dInfo) diff --git a/Runtime/Weapon/CPowerBomb.hpp b/Runtime/Weapon/CPowerBomb.hpp index 1b5a2ac5d..3a636448d 100644 --- a/Runtime/Weapon/CPowerBomb.hpp +++ b/Runtime/Weapon/CPowerBomb.hpp @@ -7,13 +7,11 @@ #include "Runtime/Weapon/CWeapon.hpp" #include -#include 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;