Ticket #3804: gamesetup.js.2.patch

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -1590 +1590 @@
 
         // Transfer the AI from the target slot to the current slot.
         g_GameAttributes.settings.PlayerData[playerID - 1].AI = g_GameAttributes.settings.PlayerData[newSlot].AI;
+
+        // Swap civilizations only if they aren't fixed
+        if (g_GameAttributes.mapType != "scenario")
+        {
+            [g_GameAttributes.settings.PlayerData[playerID - 1].Civ, g_GameAttributes.settings.PlayerData[newSlot].Civ] = 
+                [g_GameAttributes.settings.PlayerData[newSlot].Civ, g_GameAttributes.settings.PlayerData[playerID - 1].Civ];
+
+            if (!g_IsInGuiUpdate)
+                updateGameAttributes();
+        }
     }
 
     if (g_IsNetworked)