From b4889d5346fc4ce515857c150fcd98f032a6de45 Mon Sep 17 00:00:00 2001
From: historic_bruno <ben@wildfiregames.com>
Date: Mon, 2 May 2011 20:34:48 +0000
Subject: [PATCH] Fixes broken team init (based on patch by Stork). Fixes #814.

This was SVN commit r9399.
---
 .../mods/public/simulation/helpers/Player.js  | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/binaries/data/mods/public/simulation/helpers/Player.js b/binaries/data/mods/public/simulation/helpers/Player.js
index d73d1d1b7b..f3027480c0 100644
--- a/binaries/data/mods/public/simulation/helpers/Player.js
+++ b/binaries/data/mods/public/simulation/helpers/Player.js
@@ -8,12 +8,16 @@ function LoadPlayerSettings(settings)
 {
 	// Default settings
 	if (!settings)
+	{
 		settings = {};
+	}
 
 	// Get default player data
 	var rawData = Engine.ReadJSONFile("player_defaults.json");
 	if (!(rawData && rawData.PlayerData))
-		error("Error reading player default data: player_defaults.json");
+	{
+		throw("Player.js: Error reading player default data (player_defaults.json)");
+	}
 
 	var playerDefaults = rawData.PlayerData;
 	
@@ -26,7 +30,7 @@ function LoadPlayerSettings(settings)
 	}
 	else
 	{
-		warn("Setup has no player data - using defaults");
+		warn("Player.js: Setup has no player data - using defaults");
 	}
 	
 	// Get player manager
@@ -48,9 +52,13 @@ function LoadPlayerSettings(settings)
 		if (team !== undefined && team != -1)
 		{
 			if (!teams[team])
+			{
 				teams[team] = [i];
+			}
 			else
+			{
 				teams[team].push(i);
+			}
 		}
 	}
 
@@ -62,7 +70,9 @@ function LoadPlayerSettings(settings)
 		// Retrieve entity
 		var player = Engine.QueryInterface(entID, IID_Player);
 		if (!player)
-			error("Error creating new player entity in Setup.js!");
+		{
+			throw("Player.js: Error creating player entity "+i);
+		}
 		
 		player.SetPlayerID(i);
 		
@@ -81,11 +91,14 @@ function LoadPlayerSettings(settings)
 			player.SetColour(colour.r, colour.g, colour.b);
 			
 			if (getSetting(pData, pDefs, "PopulationLimit") !== undefined)
+			{
 				player.SetPopulationLimit(getSetting(pData, pDefs, "PopulationLimit"));
+			}
 			
 			if (getSetting(pData, pDefs, "Resources") !== undefined)
+			{
 				player.SetResourceCounts(getSetting(pData, pDefs, "Resources"));
-			
+			}
 			
 			var team = getSetting(pData, pDefs, "Team");
 			
@@ -95,10 +108,19 @@ function LoadPlayerSettings(settings)
 				player.SetDiplomacy(getSetting(pData, pDefs, "Diplomacy"));
 			}
 			else if (team !== undefined && team != -1)
-			{	//Team exists
-				var teamDiplomacy = diplomacy;
-				for (var n in teams[team])
-					teamDiplomacy[n] = cmpPlayerMan.Diplomacy.ALLY; //Set ally
+			{
+				//Team exists, copy default diplomacy
+				var teamDiplomacy = [];
+				for (var p in diplomacy)
+				{
+					teamDiplomacy[p] = diplomacy[p];
+				}
+				// Set teammates to allies
+				var myTeam = teams[team];
+				for (var n in myTeam)
+				{
+					teamDiplomacy[myTeam[n]] = cmpPlayerMan.Diplomacy.ALLY; //Set ally
+				}
 				
 				player.SetDiplomacy(teamDiplomacy);
 			}