From deba91bfc0fd74151cf24565935bd2170f5ba319 Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Tue, 31 Mar 2020 21:29:14 -0400
Subject: [PATCH] CGrenadeLauncher: Fix rendering

---
 Runtime/MP1/World/CGrenadeLauncher.cpp | 12 +++++++-----
 Runtime/MP1/World/CGrenadeLauncher.hpp |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Runtime/MP1/World/CGrenadeLauncher.cpp b/Runtime/MP1/World/CGrenadeLauncher.cpp
index 7273c84a9..abcb3764d 100644
--- a/Runtime/MP1/World/CGrenadeLauncher.cpp
+++ b/Runtime/MP1/World/CGrenadeLauncher.cpp
@@ -127,10 +127,12 @@ std::optional<zeus::CAABox> CGrenadeLauncher::GetTouchBounds() const {
 
 void CGrenadeLauncher::PreRender(CStateManager& mgr, const zeus::CFrustum& frustum) {
   if (x3f4_color3.a() == 1.f) {
+    xb4_drawFlags = CModelFlags{2, 0, 3, zeus::skWhite};
     // Original code redundantly sets a() = 1.f
-    xb4_drawFlags = CModelFlags{2, 0, 3, x3f4_color3};
+    xb4_drawFlags.addColor = x3f4_color3;
   } else {
-    xb4_drawFlags = CModelFlags{5, 0, 3, x3f4_color3};
+    xb4_drawFlags = CModelFlags{5, 0, 3, zeus::skWhite};
+    xb4_drawFlags.addColor = x3f4_color3;
   }
   CActor::PreRender(mgr, frustum);
 }
@@ -151,7 +153,7 @@ void CGrenadeLauncher::Think(float dt, CStateManager& mgr) {
     UpdateCollision();
     UpdateColor(dt);
     sub_8022f9e0(mgr, dt);
-    sub_8022f69c(dt);
+    UpdateDamageTime(dt);
 
     const SAdvancementDeltas& deltas = CActor::UpdateAnimation(dt, mgr, true);
     MoveToOR(deltas.x0_posDelta, dt);
@@ -190,7 +192,7 @@ void CGrenadeLauncher::UpdateColor(float arg) {
   }
 }
 
-void CGrenadeLauncher::sub_8022f69c(float arg) {
+void CGrenadeLauncher::UpdateDamageTime(float arg) {
   if (x3ec_damageTimer <= 0.f) {
     xd0_damageMag = x3e8_thermalMag;
   } else {
@@ -297,7 +299,7 @@ void CGrenadeLauncher::LaunchGrenade(CStateManager& mgr) {
     return;
   }
 
-  const auto& anim = animData->GetCharacterInfo().GetPASDatabase().FindBestAnimation({24}, -1);
+  const auto& anim = animData->GetCharacterInfo().GetPASDatabase().FindBestAnimation({23}, -1);
   if (anim.first > 0.f) {
     animData->AddAdditiveAnimation(anim.second, 1.f, false, true);
     const zeus::CVector3f& origin =
diff --git a/Runtime/MP1/World/CGrenadeLauncher.hpp b/Runtime/MP1/World/CGrenadeLauncher.hpp
index cb07cf1e5..ad865e7f2 100644
--- a/Runtime/MP1/World/CGrenadeLauncher.hpp
+++ b/Runtime/MP1/World/CGrenadeLauncher.hpp
@@ -115,7 +115,7 @@ public:
 private:
   void UpdateCollision();
   void UpdateColor(float arg);
-  void sub_8022f69c(float arg);
+  void UpdateDamageTime(float arg);
   void CreateExplosion(CStateManager& mgr);
   void sub_8022f9e0(CStateManager& mgr, float dt);
   void sub_80230438();