From e628cbf1be21b566d9e693f37d0a80418ace2678 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 12 Mar 2020 09:57:40 -0400
Subject: [PATCH 1/2] CPlayerEnergyDrain: Initialize x10_energyDrainTime on
 construction

GM8E v0 initializes this to zero when constructing the class. This also
makes the entire class have a consistent initial state.
---
 Runtime/World/CPlayerEnergyDrain.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Runtime/World/CPlayerEnergyDrain.hpp b/Runtime/World/CPlayerEnergyDrain.hpp
index 8b4651786..3b2bf9ba7 100644
--- a/Runtime/World/CPlayerEnergyDrain.hpp
+++ b/Runtime/World/CPlayerEnergyDrain.hpp
@@ -9,7 +9,7 @@ namespace urde {
 class CStateManager;
 class CPlayerEnergyDrain {
   std::vector<CEnergyDrainSource> x0_sources;
-  float x10_energyDrainTime;
+  float x10_energyDrainTime = 0.0f;
 
 public:
   CPlayerEnergyDrain(u32);

From d51518dc579d8159ee7c7382e570b00da400936b Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 12 Mar 2020 10:01:28 -0400
Subject: [PATCH 2/2] CPlayerEnergyDrain: Make constructor explicit

Prevents error-prone implicit constructions from occurring.
---
 Runtime/World/CPlayer.hpp            | 2 +-
 Runtime/World/CPlayerEnergyDrain.cpp | 2 +-
 Runtime/World/CPlayerEnergyDrain.hpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Runtime/World/CPlayer.hpp b/Runtime/World/CPlayer.hpp
index 033f7951f..ea6b8b169 100644
--- a/Runtime/World/CPlayer.hpp
+++ b/Runtime/World/CPlayer.hpp
@@ -138,7 +138,7 @@ private:
   std::vector<CToken> x25c_ballTransitionsRes;
   TUniqueId x26c_attachedActor = kInvalidUniqueId;
   float x270_attachedActorTime = 0.f;
-  CPlayerEnergyDrain x274_energyDrain = CPlayerEnergyDrain(4);
+  CPlayerEnergyDrain x274_energyDrain{4};
   float x288_startingJumpTimeout = 0.f;
   float x28c_sjTimer = 0.f;
   float x290_minJumpTimeout = 0.f;
diff --git a/Runtime/World/CPlayerEnergyDrain.cpp b/Runtime/World/CPlayerEnergyDrain.cpp
index 8cd9919a9..c4b51ebfd 100644
--- a/Runtime/World/CPlayerEnergyDrain.cpp
+++ b/Runtime/World/CPlayerEnergyDrain.cpp
@@ -4,7 +4,7 @@
 
 namespace urde {
 
-CPlayerEnergyDrain::CPlayerEnergyDrain(u32 capacity) { x0_sources.reserve(capacity); }
+CPlayerEnergyDrain::CPlayerEnergyDrain(u32 numSources) { x0_sources.reserve(numSources); }
 
 void CPlayerEnergyDrain::AddEnergyDrainSource(TUniqueId id, float intensity) { x0_sources.emplace_back(id, intensity); }
 
diff --git a/Runtime/World/CPlayerEnergyDrain.hpp b/Runtime/World/CPlayerEnergyDrain.hpp
index 3b2bf9ba7..403b71e2c 100644
--- a/Runtime/World/CPlayerEnergyDrain.hpp
+++ b/Runtime/World/CPlayerEnergyDrain.hpp
@@ -12,7 +12,7 @@ class CPlayerEnergyDrain {
   float x10_energyDrainTime = 0.0f;
 
 public:
-  CPlayerEnergyDrain(u32);
+  explicit CPlayerEnergyDrain(u32 numSources);
   const std::vector<CEnergyDrainSource>& GetEnergyDrainSources() const { return x0_sources; }
   void AddEnergyDrainSource(TUniqueId, float);
   void RemoveEnergyDrainSource(TUniqueId id);