From a203379ff79ebb03ff48634546b0aa040d430630 Mon Sep 17 00:00:00 2001
From: Tedster59 <tedster59@gmail.com>
Date: Thu, 22 Jun 2023 18:44:00 -0500
Subject: [PATCH 1/2] Update UIPawnMgr to address issue #1192

remove sounds and Cosmetic Pawns from units by updating ReleasePawnInternal
---
 .../Src/XComGame/Classes/UIPawnMgr.uc         | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIPawnMgr.uc b/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIPawnMgr.uc
index 3c3ee89bc..2e55aec2b 100644
--- a/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIPawnMgr.uc
+++ b/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIPawnMgr.uc
@@ -594,6 +594,10 @@ simulated function DestroyPawns(int StoreIdx, out array<PawnInfo> PawnStore)
 	// Added variable for Issue #885
 	local int i;
 
+	// Start Issue #1192 - Add call to StopSounds to remove sound effects for destroyed pawns.
+	PawnStore[StoreIdx].Pawn.StopSounds();
+	// End Issue #1192
+
 	PawnStore[StoreIdx].Pawn.Destroy();
 	PawnStore[StoreIdx].Pawn = none;
 	for ( idx = 0; idx < PawnStore[StoreIdx].Cosmetics.Length; ++idx )
@@ -637,6 +641,10 @@ simulated function ReleasePawnInternal(Actor referrer, int UnitRef, out array<Pa
 {
 	local int PawnInfoIndex;
 
+	// Added variables for Issue #1192
+	local XComUnitPawn CosmeticPawn;
+	local int CosmeticPawnIndex;
+
 	PawnInfoIndex = PawnStore.Find('PawnRef', UnitRef);
 	if (PawnInfoIndex == -1)
 	{
@@ -644,15 +652,49 @@ simulated function ReleasePawnInternal(Actor referrer, int UnitRef, out array<Pa
 	}
 	else if(bForce) // don't remove the entry from the array to preserve the Referrers
 	{
+
+		// Start Issue #1192 - gremlin/bit section
+		CosmeticPawn = GetCosmeticPawn(eInvSlot_SecondaryWeapon, UnitRef);
+
+		//use similar code to rest of function, but for the Cosmetic pawn to remove it when it is supposed to be removed.
+		if (CosmeticPawn!= none)
+		{
+			CosmeticPawnIndex = PawnStore.Find('PawnRef', CosmeticPawn.ObjectId);
+
+			if (CosmeticPawnIndex!= -1)
+			{
+				DestroyPawns(CosmeticPawnIndex, PawnStore);
+				PawnStore[CosmeticPawnIndex].bPawnRemoved = true;
+			}
+		}
+		// End issue #1192
+
 		PawnStore[PawnInfoIndex].Referrers.RemoveItem(referrer);
 		DestroyPawns(PawnInfoIndex, PawnStore);
 		PawnStore[PawnInfoIndex].bPawnRemoved = true;
 	}
 	else
-	{		
+	{
 		PawnStore[PawnInfoIndex].Referrers.RemoveItem(referrer);
 		if(PawnStore[PawnInfoIndex].Referrers.Length == 0)
 		{
+
+			// Start Issue #1192 - gremlin/bit section - repeat of above code but in other part of if/else block
+			CosmeticPawn = GetCosmeticPawn(eInvSlot_SecondaryWeapon, UnitRef);
+
+			//use similar code to rest of function, but for the Cosmetic pawn
+			if (CosmeticPawn!= none)
+			{
+				CosmeticPawnIndex = PawnStore.Find('PawnRef', CosmeticPawn.ObjectId);
+
+				if (CosmeticPawnIndex!= -1)
+				{
+				DestroyPawns(CosmeticPawnIndex, PawnStore);
+					PawnStore[CosmeticPawnIndex].bPawnRemoved = true;
+				}
+			}
+			// End issue #1192
+
 			DestroyPawns(PawnInfoIndex, PawnStore);
 			PawnStore.Remove(PawnInfoIndex, 1);
 		}

From e62690257e0f82d39374a7db6db993edd4bb84e6 Mon Sep 17 00:00:00 2001
From: Tedster59 <tedster59@gmail.com>
Date: Thu, 22 Jun 2023 18:44:00 -0500
Subject: [PATCH 2/2] Update UIPawnMgr to address issue #1192

remove sounds and Cosmetic Pawns from units by updating ReleasePawnInternal

Revise cosmetic pawn removal to not assume inventory slot

Now loops over all cosmetic pawns on the associated UnitState instead of attempting to remove a pawn from the secondary slot.

remove sounds and Cosmetic Pawns from units by updating ReleasePawnInternal

Remove code for cosmetic pawn issue

remove sounds and Cosmetic Pawns from units by updating ReleasePawnInternal

Revise cosmetic pawn removal to not assume inventory slot

Now loops over all cosmetic pawns on the associated UnitState instead of attempting to remove a pawn from the secondary slot.

remove sounds and Cosmetic Pawns from units by updating ReleasePawnInternal

Update UIPawnMgr.uc
---
 .../Src/XComGame/Classes/UIPawnMgr.uc         | 45 +++----------------
 1 file changed, 5 insertions(+), 40 deletions(-)

diff --git a/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIPawnMgr.uc b/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIPawnMgr.uc
index 2e55aec2b..8e95fa396 100644
--- a/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIPawnMgr.uc
+++ b/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIPawnMgr.uc
@@ -594,7 +594,10 @@ simulated function DestroyPawns(int StoreIdx, out array<PawnInfo> PawnStore)
 	// Added variable for Issue #885
 	local int i;
 
-	// Start Issue #1192 - Add call to StopSounds to remove sound effects for destroyed pawns.
+
+	// Start Issue #1192
+	/// HL-Docs: ref:Bugfixes; issue:1192
+	/// Add call to StopSounds to remove sound effects for destroyed pawns.
 	PawnStore[StoreIdx].Pawn.StopSounds();
 	// End Issue #1192
 
@@ -641,10 +644,6 @@ simulated function ReleasePawnInternal(Actor referrer, int UnitRef, out array<Pa
 {
 	local int PawnInfoIndex;
 
-	// Added variables for Issue #1192
-	local XComUnitPawn CosmeticPawn;
-	local int CosmeticPawnIndex;
-
 	PawnInfoIndex = PawnStore.Find('PawnRef', UnitRef);
 	if (PawnInfoIndex == -1)
 	{
@@ -652,49 +651,15 @@ simulated function ReleasePawnInternal(Actor referrer, int UnitRef, out array<Pa
 	}
 	else if(bForce) // don't remove the entry from the array to preserve the Referrers
 	{
-
-		// Start Issue #1192 - gremlin/bit section
-		CosmeticPawn = GetCosmeticPawn(eInvSlot_SecondaryWeapon, UnitRef);
-
-		//use similar code to rest of function, but for the Cosmetic pawn to remove it when it is supposed to be removed.
-		if (CosmeticPawn!= none)
-		{
-			CosmeticPawnIndex = PawnStore.Find('PawnRef', CosmeticPawn.ObjectId);
-
-			if (CosmeticPawnIndex!= -1)
-			{
-				DestroyPawns(CosmeticPawnIndex, PawnStore);
-				PawnStore[CosmeticPawnIndex].bPawnRemoved = true;
-			}
-		}
-		// End issue #1192
-
 		PawnStore[PawnInfoIndex].Referrers.RemoveItem(referrer);
 		DestroyPawns(PawnInfoIndex, PawnStore);
 		PawnStore[PawnInfoIndex].bPawnRemoved = true;
 	}
 	else
-	{
+	{		
 		PawnStore[PawnInfoIndex].Referrers.RemoveItem(referrer);
 		if(PawnStore[PawnInfoIndex].Referrers.Length == 0)
 		{
-
-			// Start Issue #1192 - gremlin/bit section - repeat of above code but in other part of if/else block
-			CosmeticPawn = GetCosmeticPawn(eInvSlot_SecondaryWeapon, UnitRef);
-
-			//use similar code to rest of function, but for the Cosmetic pawn
-			if (CosmeticPawn!= none)
-			{
-				CosmeticPawnIndex = PawnStore.Find('PawnRef', CosmeticPawn.ObjectId);
-
-				if (CosmeticPawnIndex!= -1)
-				{
-				DestroyPawns(CosmeticPawnIndex, PawnStore);
-					PawnStore[CosmeticPawnIndex].bPawnRemoved = true;
-				}
-			}
-			// End issue #1192
-
 			DestroyPawns(PawnInfoIndex, PawnStore);
 			PawnStore.Remove(PawnInfoIndex, 1);
 		}