From 08ebecdaaf31c8157ac9013d92a9886ff2794f1b Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 24 Feb 2020 01:34:56 -0500
Subject: [PATCH] CSamusDoll: Mark skInitialOffset as constexpr

Allows the vector to be initialized at compile-time.
---
 Runtime/MP1/CSamusDoll.cpp | 2 --
 Runtime/MP1/CSamusDoll.hpp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Runtime/MP1/CSamusDoll.cpp b/Runtime/MP1/CSamusDoll.cpp
index c5f715b43..14f581654 100644
--- a/Runtime/MP1/CSamusDoll.cpp
+++ b/Runtime/MP1/CSamusDoll.cpp
@@ -17,8 +17,6 @@
 
 namespace urde::MP1 {
 
-const zeus::CVector3f CSamusDoll::skInitialOffset = {0.f, 0.f, 0.8f};
-
 static const std::pair<const char*, u32> SpiderBallGlassModels[] = {
     {"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 1},
     {"SamusPhazonBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0}, {"SamusSpiderBallGlassCMDL", 0},
diff --git a/Runtime/MP1/CSamusDoll.hpp b/Runtime/MP1/CSamusDoll.hpp
index ad85d8481..ac0ddd645 100644
--- a/Runtime/MP1/CSamusDoll.hpp
+++ b/Runtime/MP1/CSamusDoll.hpp
@@ -85,7 +85,7 @@ class CSamusDoll {
     u32 _dummy = 0;
   };
 
-  static const zeus::CVector3f skInitialOffset;
+  static constexpr zeus::CVector3f skInitialOffset{0.0f, 0.0f, 0.8f};
   static CModelData BuildSuitModelData1(CPlayerState::EPlayerSuit suit);
   static CModelData BuildSuitModelDataBoots(CPlayerState::EPlayerSuit suit);
   void SetupLights();