Index: ps/trunk/binaries/data/mods/public/gui/session/DiplomacyColors.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/DiplomacyColors.js	(revision 23070)
+++ ps/trunk/binaries/data/mods/public/gui/session/DiplomacyColors.js	(revision 23071)

Property changes on: ps/trunk/binaries/data/mods/public/gui/session/DiplomacyColors.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/gui/session/diplomacy/playercontrols/DiplomacyPlayerText.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/diplomacy/playercontrols/DiplomacyPlayerText.js	(revision 23070)
+++ ps/trunk/binaries/data/mods/public/gui/session/diplomacy/playercontrols/DiplomacyPlayerText.js	(revision 23071)
@@ -1,80 +1,84 @@
 /**
  * This class is concerned with updating the labels and icons in the diplomacy dialog that don't provide player interaction.
  */
 DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText = class
 {
 	constructor(playerID)
 	{
 		this.playerID = playerID;
 
 		let id = "[" + (playerID - 1) + "]";
 
 		this.diplomacyPlayer = Engine.GetGUIObjectByName("diplomacyPlayer" + id);
 		this.diplomacyPlayerCiv = Engine.GetGUIObjectByName("diplomacyPlayerCiv" + id);
 		this.diplomacyPlayerName = Engine.GetGUIObjectByName("diplomacyPlayerName" + id);
 		this.diplomacyPlayerTeam = Engine.GetGUIObjectByName("diplomacyPlayerTeam" + id);
 		this.diplomacyPlayerTheirs = Engine.GetGUIObjectByName("diplomacyPlayerTheirs" + id);
 		this.diplomacyPlayerOutcome = Engine.GetGUIObjectByName("diplomacyPlayerOutcome" + id);
 
 		this.init();
 	}
 
 	init()
 	{
+		// TODO: Atlas should pass this
+		if (!g_GameAttributes.settings)
+			return;
+
 		this.diplomacyPlayerCiv.caption = g_CivData[g_Players[this.playerID].civ].Name;
 		this.diplomacyPlayerName.tooltip = translateAISettings(g_GameAttributes.settings.PlayerData[this.playerID]);
 
 		// Apply offset
 		let rowSize = DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.getRowHeight();
 		let size = this.diplomacyPlayer.size;
 		size.top = rowSize * (this.playerID - 1);
 		size.bottom = rowSize * this.playerID;
 		this.diplomacyPlayer.size = size;
 		this.diplomacyPlayer.hidden = false;
 	}
 
 	update()
 	{
 		setOutcomeIcon(g_Players[this.playerID].state, this.diplomacyPlayerOutcome);
 
 		this.diplomacyPlayer.sprite = "color:" + g_DiplomacyColors.getPlayerColor(this.playerID, 32);
 
 		this.diplomacyPlayerName.caption = colorizePlayernameByID(this.playerID);
 
 		this.diplomacyPlayerTeam.caption =
 			g_Players[this.playerID].team >= 0 ?
 				g_Players[this.playerID].team + 1 :
 				translateWithContext("team", this.NoTeam);
 
 		this.diplomacyPlayerTheirs.caption =
 			this.playerID == g_ViewedPlayer ? "" :
 				g_Players[this.playerID].isAlly[g_ViewedPlayer] ?
 					translate(this.Ally) :
 				g_Players[this.playerID].isNeutral[g_ViewedPlayer] ?
 					translate(this.Neutral) :
 					translate(this.Enemy);
 	}
 };
 
 DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.getRowHeight = function()
 {
 	let diplomacyPlayer = Engine.GetGUIObjectByName("diplomacyPlayer[0]").size;
 	return diplomacyPlayer.bottom - diplomacyPlayer.top;
 };
 
 DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.getHeightOffset = function()
 {
 	return (g_Players.length - 1) * DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.getRowHeight();
 };
 
 DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.prototype.NoTeam =
 	markForTranslationWithContext("team", "None");
 
 DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.prototype.Ally =
 	markForTranslation("Ally");
 
 DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.prototype.Neutral =
 	markForTranslation("Neutral");
 
 DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.prototype.Enemy =
 	markForTranslation("Enemy");