From 99e23a8d24d4df6874366c517ae99069d6b1b232 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Mon, 27 Mar 2023 18:06:35 +1100
Subject: [PATCH] - Exhumed: Move `Player::nCurrentItem` usage into the right
 spot.

* Originally, `updatePlayerInventory()` was in the main loop and not the player ticker. Now that it's been relocated, this makes sense.
---
 source/games/exhumed/src/player.cpp | 9 +--------
 source/games/exhumed/src/player.h   | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index b33d15c8c..15a0216b7 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -303,7 +303,6 @@ void RestartPlayer(int nPlayer)
     pPlayer->nBreathTimer = 90;
     pPlayer->nTauntTimer = RandomSize(3) + 3;
     pPlayer->ototalvel = pPlayer->totalvel = 0;
-    pPlayer->nCurrentItem = -1;
     pPlayer->nDeathType = 0;
     pPlayer->nQuake = 0;
     pPlayer->nTemperature = 0;
@@ -1185,7 +1184,7 @@ static void updatePlayerInventory(Player* const pPlayer)
 
             if (pPlayer->items[i] > 0 && nItemMagic[i] <= pPlayer->nMagic)
             {
-                pPlayer->nCurrentItem = i;
+                UseItem(pPlayer->nPlayer, i);
                 break;
             }
         }
@@ -1251,12 +1250,6 @@ static void doPlayerCounters(Player* const pPlayer)
     const auto pPlayerActor = pPlayer->pActor;
     const bool bConsolePlayer = pPlayer->nPlayer == nLocalPlayer;
 
-    if (pPlayer->nCurrentItem > -1)
-    {
-        UseItem(pPlayer->nPlayer, pPlayer->nCurrentItem);
-        pPlayer->nCurrentItem = -1;
-    }
-
     if (pPlayer->nTorch > 0)
     {
         pPlayer->nTorch--;
diff --git a/source/games/exhumed/src/player.h b/source/games/exhumed/src/player.h
index 1f6904e95..76c1a8fdf 100644
--- a/source/games/exhumed/src/player.h
+++ b/source/games/exhumed/src/player.h
@@ -65,7 +65,6 @@ struct Player
     uint16_t keys;
     int16_t nMagic;
     int16_t nItem;
-    int8_t nCurrentItem;
     int8_t items[8];
     int16_t nAmmo[7]; // TODO - kMaxWeapons?