From 18658f6a42f4960bb7727a1531272e2efdaf84b3 Mon Sep 17 00:00:00 2001
From: ephphatha <ephphatha@thelettereph.com>
Date: Thu, 23 Sep 2021 23:59:14 +1000
Subject: [PATCH] Remove duplicate argument to DeleteItem

---
 Source/inv.cpp      |  2 +-
 Source/items.cpp    | 11 ++++++-----
 Source/items.h      |  2 +-
 Source/loadsave.cpp |  2 +-
 Source/msg.cpp      |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Source/inv.cpp b/Source/inv.cpp
index bf2f89964..b21ec3621 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -1101,7 +1101,7 @@ void CleanupItems(int ii)
 	int i = 0;
 	while (i < ActiveItemCount) {
 		if (ActiveItems[i] == ii) {
-			DeleteItem(ActiveItems[i], i);
+			DeleteItem(i);
 			i = 0;
 			continue;
 		}
diff --git a/Source/items.cpp b/Source/items.cpp
index 775c22406..36704f5ab 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -3567,7 +3567,7 @@ void CornerstoneLoad(Point position)
 		int ii = dItem[position.x][position.y] - 1;
 		for (int i = 0; i < ActiveItemCount; i++) {
 			if (ActiveItems[i] == ii) {
-				DeleteItem(ActiveItems[i], i);
+				DeleteItem(i);
 				break;
 			}
 		}
@@ -3686,14 +3686,15 @@ void RespawnItem(Item *item, bool flipFlag)
 		item->_iSelFlag = 1;
 }
 
-void DeleteItem(int ii, int i)
+void DeleteItem(int i)
 {
-	AvailableItems[MAXITEMS - ActiveItemCount] = ii;
+	if (pcursitem == ActiveItems[i]) // Unselect item if player has it highlighted
+		pcursitem = -1;
+
+	AvailableItems[MAXITEMS - ActiveItemCount] = ActiveItems[i];
 	ActiveItemCount--;
 	if (ActiveItemCount > 0 && i != ActiveItemCount)
 		ActiveItems[i] = ActiveItems[ActiveItemCount];
-	if (pcursitem == ii) // Unselect item if player has it highlighted
-		pcursitem = -1;
 }
 
 void ProcessItems()
diff --git a/Source/items.h b/Source/items.h
index f695ecd2d..3bfcf42d5 100644
--- a/Source/items.h
+++ b/Source/items.h
@@ -464,7 +464,7 @@ void SpawnMapOfDoom(Point position);
 void SpawnRuneBomb(Point position);
 void SpawnTheodore(Point position);
 void RespawnItem(Item *item, bool FlipFlag);
-void DeleteItem(int ii, int i);
+void DeleteItem(int i);
 void ProcessItems();
 void FreeItemGFX();
 void GetItemFrm(Item &item);
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index b1cb568fe..984329bfd 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -931,7 +931,7 @@ void RemoveEmptyLevelItems()
 		auto &item = Items[ActiveItems[i]];
 		if (item.isEmpty()) {
 			dItem[item.position.x][item.position.y] = 0;
-			DeleteItem(ActiveItems[i], i);
+			DeleteItem(i);
 		}
 	}
 }
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 57831b651..98ed0760f 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -2235,7 +2235,7 @@ void DeltaLoadLevel()
 				const auto &position = Items[ActiveItems[activeItemIndex]].position;
 				if (dItem[position.x][position.y] == ActiveItems[activeItemIndex] + 1)
 					dItem[position.x][position.y] = 0;
-				DeleteItem(ActiveItems[activeItemIndex], activeItemIndex);
+				DeleteItem(activeItemIndex);
 			}
 		}
 		if (sgLevels[currlevel].item[i].bCmd == CMD_ACK_PLRINFO) {