From 1dff710a2323e1c51dedb2af601662e5c568eb91 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 10 Sep 2022 22:39:40 +0200
Subject: [PATCH] - floatified ThrowGrenade

---
 source/games/exhumed/src/aistuff.h   | 2 +-
 source/games/exhumed/src/grenade.cpp | 4 ++--
 source/games/exhumed/src/gun.cpp     | 2 +-
 source/games/exhumed/src/player.cpp  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h
index 02b9c9ebb..ad30e65af 100644
--- a/source/games/exhumed/src/aistuff.h
+++ b/source/games/exhumed/src/aistuff.h
@@ -92,7 +92,7 @@ void FuncFishLimb(int a, int b, int c);
 enum { kMaxGrenades = 50 };
 
 void BuildGrenade(int nPlayer);
-void ThrowGrenade(int nPlayer, int edx, int ebx, int ecx, int push1);
+void ThrowGrenade(int nPlayer, double ecx, int push1);
 void FuncGrenade(int, int, int, int);
 
 // gun
diff --git a/source/games/exhumed/src/grenade.cpp b/source/games/exhumed/src/grenade.cpp
index aa2898016..a56966006 100644
--- a/source/games/exhumed/src/grenade.cpp
+++ b/source/games/exhumed/src/grenade.cpp
@@ -45,7 +45,7 @@ void BounceGrenade(DExhumedActor* pActor, DAngle nAngle)
     D3PlayFX(StaticSound[kSound3], pActor);
 }
 
-void ThrowGrenade(int nPlayer, int, int, int ecx, int push1)
+void ThrowGrenade(int nPlayer, double dz, int push1)
 {
     if (PlayerList[nPlayer].pPlayerGrenade == nullptr)
         return;
@@ -75,7 +75,7 @@ void ThrowGrenade(int nPlayer, int, int, int ecx, int push1)
 
 
         DVector2 vec = nAngle.ToVector() * pPlayerActor->fClipdist() *2; // == << 14 + 3 + 2 - 18
-        auto nMov = movesprite_(pActor, FloatToFixed<18>(vec.X), FloatToFixed<18>(vec.Y), ecx, 0, 0, CLIPMASK1);
+        auto nMov = movesprite(pActor, vec, dz, 0, CLIPMASK1);
         if (nMov.type == kHitWall)
         {
             nAngle = GetWallNormal(nMov.hitWall);
diff --git a/source/games/exhumed/src/gun.cpp b/source/games/exhumed/src/gun.cpp
index 6c447522b..54f76d25c 100644
--- a/source/games/exhumed/src/gun.cpp
+++ b/source/games/exhumed/src/gun.cpp
@@ -804,7 +804,7 @@ loc_flag:
 
                 case kWeaponGrenade:
                 {
-                    ThrowGrenade(nPlayer, ebp, ebx, nHeight * zworldtoint - 2560, FixedToInt(PlayerList[nLocalPlayer].horizon.horiz.asq16()));
+                    ThrowGrenade(nPlayer, nHeight - 10, FixedToInt(PlayerList[nLocalPlayer].horizon.horiz.asq16()));
                     break;
                 }
                 case kWeaponStaff:
diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index 8e3328a3e..63e39a297 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -423,7 +423,7 @@ void StartDeathSeq(int nPlayer, int nVal)
 
     if (PlayerList[nPlayer].pPlayerGrenade)
     {
-        ThrowGrenade(nPlayer, 0, 0, 0, -10000);
+        ThrowGrenade(nPlayer, 0, -10000);
     }
     else
     {