From 306b8ad2890ece08559c02535d1173d04a9097e8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 9 May 2020 22:41:30 -0400 Subject: [PATCH] CRidley: Mark skDirectNormal and skIceWeakness as constexpr Allows elimination of runtime initializers. --- Runtime/MP1/World/CRidley.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Runtime/MP1/World/CRidley.cpp b/Runtime/MP1/World/CRidley.cpp index e882b9f10..52159f16f 100644 --- a/Runtime/MP1/World/CRidley.cpp +++ b/Runtime/MP1/World/CRidley.cpp @@ -193,22 +193,22 @@ constexpr std::array skFloats{{{0.0, 20.0, 40.0, 0.0, 0.0 {0.0, 0.0, 50.0, 0.0, 0.0, 50.0}, {0.0, 40.0, 60.0, 0.0, 0.0, 0.0}}}; -const CDamageVulnerability skDirectNormal{EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EDeflectType::None}; -const CDamageVulnerability skIceWeakness{EVulnerability::DirectNormal, EVulnerability::DirectWeak, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EVulnerability::DirectNormal, - EVulnerability::DirectNormal, EDeflectType::None}; +constexpr CDamageVulnerability skDirectNormal{EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EDeflectType::None}; +constexpr CDamageVulnerability skIceWeakness{EVulnerability::DirectNormal, EVulnerability::DirectWeak, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EVulnerability::DirectNormal, + EVulnerability::DirectNormal, EDeflectType::None}; } // namespace CRidleyData::CRidleyData(CInputStream& in, u32 propCount) : x0_(in)