Merge pull request OpenSAGE#699 from charliefoxtwo/team-none-enemies

Fix incorrect teams
Ravo92 · Nov 21, 2022 · ad4d613 · ad4d613
2 parents 69cdf61 + 45ffc45
commit ad4d613
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/OpenSage.Game/Data/Map/SidesListUtility.cs b/src/OpenSage.Game/Data/Map/SidesListUtility.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenSage.Data.Scb;
@@ -132,12 +132,12 @@ private static void SetupSkirmishGameSides(
             }
 
             // Setup player relationships.
-            var playerAllies = new string[playerSettings.Length];
-            var playerEnemies = new string[playerSettings.Length];
+            var playerAllies = new List<string>[playerSettings.Length];
+            var playerEnemies = new List<string>[playerSettings.Length];
             for (var i = 0; i < playerSettings.Length; i++)
             {
-                playerAllies[i] = "";
-                playerEnemies[i] = "";
+                playerAllies[i] = new List<string>();
+                playerEnemies[i] = new List<string>();
             }
             for (var i = 0; i < playerSettings.Length; i++)
             {
@@ -146,22 +146,22 @@ private static void SetupSkirmishGameSides(
                 for (var j = i + 1; j < playerSettings.Length; j++)
                 {
                     var innerPlayer = playerSettings[j];
-                    if (outerPlayer.Team == innerPlayer.Team && outerPlayer.Team != 0)
+                    if (outerPlayer.Team == innerPlayer.Team && outerPlayer.Team != -1) // -1 is team None
                     {
-                        playerAllies[i] += mapPlayers[j + 2].Properties["playerName"].Value + " ";
-                        playerAllies[j] += mapPlayers[i + 2].Properties["playerName"].Value + " ";
+                        playerAllies[i].Add(mapPlayers[j + 2].Properties["playerName"].Value.ToString());
+                        playerAllies[j].Add(mapPlayers[i + 2].Properties["playerName"].Value.ToString());
                     }
                     else
                     {
-                        playerEnemies[i] += mapPlayers[j + 2].Properties["playerName"].Value + " ";
-                        playerEnemies[j] += mapPlayers[i + 2].Properties["playerName"].Value + " ";
+                        playerEnemies[i].Add(mapPlayers[j + 2].Properties["playerName"].Value.ToString());
+                        playerEnemies[j].Add(mapPlayers[i + 2].Properties["playerName"].Value.ToString());
                     }
                 }
             }
             for (var i = 0; i < playerSettings.Length; i++)
             {
-                mapPlayers[i + 2].Properties.AddAsciiString("playerAllies", playerAllies[i]);
-                mapPlayers[i + 2].Properties.AddAsciiString("playerEnemies", playerEnemies[i]);
+                mapPlayers[i + 2].Properties.AddAsciiString("playerAllies", string.Join(' ', playerAllies[i]));
+                mapPlayers[i + 2].Properties.AddAsciiString("playerEnemies", string.Join(' ', playerEnemies[i]));
             }
 
             var originalMapScriptLists = mapFile.GetPlayerScriptsList().ScriptLists;