From c3294977ff46317d80c806c88c8645b36d1a1ac4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Feb 2020 20:12:56 -0500 Subject: [PATCH] CJellyZap: Make kPlayerFilter constexpr This can be trivially made constexpr. We can also make this a fully internally linked identifier. --- Runtime/MP1/World/CJellyZap.cpp | 2 +- Runtime/MP1/World/CJellyZap.hpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Runtime/MP1/World/CJellyZap.cpp b/Runtime/MP1/World/CJellyZap.cpp index d1c07d951..0509cfc15 100644 --- a/Runtime/MP1/World/CJellyZap.cpp +++ b/Runtime/MP1/World/CJellyZap.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path namespace urde::MP1 { -const CMaterialFilter CJellyZap::kPlayerFilter = CMaterialFilter::MakeInclude({EMaterialTypes::Player}); +constexpr CMaterialFilter kPlayerFilter = CMaterialFilter::MakeInclude({EMaterialTypes::Player}); CJellyZap::CJellyZap(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CDamageInfo& dInfo, bool b1, float f1, float f2, float f3, float f4, diff --git a/Runtime/MP1/World/CJellyZap.hpp b/Runtime/MP1/World/CJellyZap.hpp index 664d0bdaa..f560d4a0a 100644 --- a/Runtime/MP1/World/CJellyZap.hpp +++ b/Runtime/MP1/World/CJellyZap.hpp @@ -4,7 +4,6 @@ namespace urde::MP1 { class CJellyZap : public CPatterned { - static const CMaterialFilter kPlayerFilter; u32 x568_ = 0; CDamageInfo x56c_attackDamage; float x588_attackRadius;