From 4aeb19df8482af830b458f9511ebd247f8f1615c Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Tue, 3 Oct 2023 19:27:33 +1100
Subject: [PATCH] - Duke: Move `PlayerUseItem()` wrapper into `DDukePlayer`.

* Regex used: `PlayerUseItem\(\w+\,\s?(\w+)\)` -> `p->itemUsed($1)`.
---
 source/games/duke/src/inlines.h |  5 -----
 source/games/duke/src/input.cpp | 12 ++++++------
 source/games/duke/src/types.h   |  5 +++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/games/duke/src/inlines.h b/source/games/duke/src/inlines.h
index bc86a5334..3f103985c 100644
--- a/source/games/duke/src/inlines.h
+++ b/source/games/duke/src/inlines.h
@@ -111,11 +111,6 @@ inline void PlayerSetItemUsed(int pl, int num)
 	getPlayer(pl)->cmd.ucmd.setItemUsed(num - 1);
 }
 
-inline bool PlayerUseItem(int pl, int num)
-{
-	return getPlayer(pl)->cmd.ucmd.isItemUsed(num - 1);
-}
-
 inline void clearfriction()
 {
 	for (int i = 0; i != -1; i = connectpoint2[i])
diff --git a/source/games/duke/src/input.cpp b/source/games/duke/src/input.cpp
index f13a29a6b..083b6dc9a 100644
--- a/source/games/duke/src/input.cpp
+++ b/source/games/duke/src/input.cpp
@@ -129,7 +129,7 @@ void hud_input(int plnum)
 			}
 		}
 
-		if (!isRR() && PlayerUseItem(plnum, ICON_HEATS))
+		if (!isRR() && p->itemUsed(ICON_HEATS))
 		{
 			SetGameVarID(g_iReturnVarID, 0, nullptr, plnum);
 			OnEvent(EVENT_USENIGHTVISION, plnum, nullptr, -1);
@@ -142,7 +142,7 @@ void hud_input(int plnum)
 			}
 		}
 
-		if (PlayerUseItem(plnum, ICON_STEROIDS))
+		if (p->itemUsed(ICON_STEROIDS))
 		{
 			SetGameVarID(g_iReturnVarID, 0, nullptr, plnum);
 			OnEvent(EVENT_USESTEROIDS, plnum, nullptr, -1);
@@ -269,7 +269,7 @@ void hud_input(int plnum)
 			}
 		}
 
-		if (PlayerUseItem(plnum, ICON_HOLODUKE) && (isRR() || p->newOwner == nullptr))
+		if (p->itemUsed(ICON_HOLODUKE) && (isRR() || p->newOwner == nullptr))
 		{
 			SetGameVarID(g_iReturnVarID, 0, nullptr, plnum);
 			OnEvent(EVENT_HOLODUKEON, plnum, nullptr, -1);
@@ -323,7 +323,7 @@ void hud_input(int plnum)
 			}
 		}
 
-		if (isRR() && PlayerUseItem(plnum, ICON_HEATS) && p->newOwner == nullptr)
+		if (isRR() && p->itemUsed(ICON_HEATS) && p->newOwner == nullptr)
 		{
 			SetGameVarID(g_iReturnVarID, 0, nullptr, plnum);
 			OnEvent(EVENT_USENIGHTVISION, plnum, nullptr, -1);
@@ -355,7 +355,7 @@ void hud_input(int plnum)
 			}
 		}
 
-		if (PlayerUseItem(plnum, ICON_FIRSTAID))
+		if (p->itemUsed(ICON_FIRSTAID))
 		{
 			SetGameVarID(g_iReturnVarID, 0, nullptr, plnum);
 			OnEvent(EVENT_USEMEDKIT, plnum, nullptr, -1);
@@ -408,7 +408,7 @@ void hud_input(int plnum)
 			}
 		}
 
-		if (PlayerUseItem(plnum, ICON_JETPACK) && (isRR() || p->newOwner == nullptr))
+		if (p->itemUsed(ICON_JETPACK) && (isRR() || p->newOwner == nullptr))
 		{
 			SetGameVarID(g_iReturnVarID, 0, nullptr, plnum);
 			OnEvent(EVENT_USEJETPACK, plnum, nullptr, -1);
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index 167791468..7962e7a49 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -399,6 +399,11 @@ public:
 	{
 		Angles.doViewPitch(aim_mode == 0 && on_ground && cursector->lotag != ST_2_UNDERWATER);
 	}
+
+	inline bool itemUsed(int num)
+	{
+		return cmd.ucmd.isItemUsed(num - 1);
+	}
 };
 
 struct Cycler