From bbed3ca69aed9159884602042657906e274e09bb Mon Sep 17 00:00:00 2001
From: Deiz <deiz@wildfiregames.com>
Date: Fri, 17 Aug 2012 21:22:07 +0000
Subject: [PATCH] Made player slot reassignment in the game setup screen swap
 slot contents instead of leaving the old slot empty.

This was SVN commit r12457.
---
 .../mods/public/gui/gamesetup/gamesetup.js    | 51 ++++++++++++++-----
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 6edacf23c7..fdb5de545c 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1143,12 +1143,8 @@ function updatePlayerList()
 							g_GameAttributes.settings.PlayerData[playerSlot].AI = guid.substr(3);
 						}
 						else
-						{
-							// Reassign the host to this player slot
-							Engine.AssignNetworkPlayer(playerID, guid);
-							// Remove AI from this player slot
-							g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
-						}
+							swapPlayers(guid, playerSlot);
+
 						Engine.SetNetworkGameAttributes(g_GameAttributes);
 					}
 				};
@@ -1171,12 +1167,7 @@ function updatePlayerList()
 							g_GameAttributes.settings.PlayerData[playerSlot].AI = guid.substr(3);
 						}
 						else
-						{
-							// Update the selected host's player ID
-							g_PlayerAssignments[guid].player = playerID;
-							// Remove AI from this player slot
-							g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
-						}
+							swapPlayers(guid, playerSlot);
 
 						updatePlayerList();
 					}
@@ -1188,6 +1179,42 @@ function updatePlayerList()
 	g_IsInGuiUpdate = false;
 }
 
+function swapPlayers(guid, newSlot)
+{
+	// Player slots are indexed from 0 as Gaia is omitted.
+	var newPlayerID = newSlot + 1;
+	var playerID = g_PlayerAssignments[guid].player;
+
+	// Attempt to swap the player or AI occupying the target slot,
+	// if any, into the slot this player is currently in.
+	if (playerID != 255)
+	{
+		for (var i in g_PlayerAssignments)
+		{
+			// Move the player in the destination slot into the current slot.
+			if (g_PlayerAssignments[i].player == newPlayerID)
+			{
+				if (g_IsNetworked)
+					Engine.AssignNetworkPlayer(playerID, i);
+				else
+					g_PlayerAssignments[i].player = playerID;
+				break;
+			}
+		}
+
+		// Transfer the AI from the target slot to the current slot.
+		g_GameAttributes.settings.PlayerData[playerID - 1].AI = g_GameAttributes.settings.PlayerData[newSlot].AI;
+	}
+
+	if (g_IsNetworked)
+		Engine.AssignNetworkPlayer(newPlayerID, guid);
+	else
+		g_PlayerAssignments[guid].player = newPlayerID;
+
+	// Remove AI from this player slot
+	g_GameAttributes.settings.PlayerData[newSlot].AI = "";
+}
+
 function submitChatInput()
 {
 	var input = getGUIObjectByName("chatInput");