Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js	(revision 14112)
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js	(revision 14113)
@@ -1,1557 +1,1561 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // Constants
 const DEFAULT_NETWORKED_MAP = "Acropolis 01";
 const DEFAULT_OFFLINE_MAP = "Acropolis 01";
 
 // TODO: Move these somewhere like simulation\data\game_types.json, Atlas needs them too
 const VICTORY_TEXT = ["Conquest", "None"];
 const VICTORY_DATA = ["conquest", "endless"];
 const VICTORY_DEFAULTIDX = 0;
 const POPULATION_CAP = ["50", "100", "150", "200", "250", "300", "Unlimited"];
 const POPULATION_CAP_DATA = [50, 100, 150, 200, 250, 300, 10000];
 const POPULATION_CAP_DEFAULTIDX = 5;
 const STARTING_RESOURCES = ["Very Low", "Low", "Medium", "High", "Very High", "Deathmatch"];
 const STARTING_RESOURCES_DATA = [100, 300, 500, 1000, 3000, 50000];
 const STARTING_RESOURCES_DEFAULTIDX = 1;
 // Max number of players for any map
 const MAX_PLAYERS = 8;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Is this is a networked game, or offline
 var g_IsNetworked;
 
 // Is this user in control of game settings (i.e. is a network server, or offline player)
 var g_IsController;
 
 //Server name, if user is a server, connected to the multiplayer lobby
 var g_ServerName;
 
 // Are we currently updating the GUI in response to network messages instead of user input
 // (and therefore shouldn't send further messages to the network)
 var g_IsInGuiUpdate;
 
 var g_PlayerAssignments = {};
 
 // Default game setup attributes
 var g_DefaultPlayerData = [];
 var g_GameAttributes = {
 	settings: {}
 };
 
 var g_GameSpeeds = {};
 var g_MapSizes = {};
 
 var g_AIs = [];
 
 var g_ChatMessages = [];
 
 // Data caches
 var g_MapData = {};
 var g_CivData = {};
 
 var g_MapFilters = [];
 
 // Warn about the AI's nonexistent naval map support.
 var g_NavalWarning = "\n\n[font=\"serif-bold-12\"][color=\"orange\"]Warning:[/color][/font] \
 The AI does not support naval maps and may cause severe performance issues. \
 Naval maps are recommended to be played with human opponents only.";
 
 // To prevent the display locking up while we load the map metadata,
 // we'll start with a 'loading' message and switch to the main screen in the
 // tick handler
 var g_LoadingState = 0; // 0 = not started, 1 = loading, 2 = loaded
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 function init(attribs)
 {
 	switch (attribs.type)
 	{
 	case "offline":
 		g_IsNetworked = false;
 		g_IsController = true;
 		break;
 	case "server":
 		g_IsNetworked = true;
 		g_IsController = true;
 		break;
 	case "client":
 		g_IsNetworked = true;
 		g_IsController = false;
 		break;
 	default:
 		error("Unexpected 'type' in gamesetup init: "+attribs.type);
 	}
 
         if (attribs.serverName)
 		g_ServerName = attribs.serverName;
 
 	// Init the Cancel Button caption and tooltip
 	var cancelButton = getGUIObjectByName("cancelGame");
 	if(!Engine.HasXmppClient())
 	{
 		cancelButton.caption = "Main menu";
 		cancelButton.tooltip = "Return to the main menu."
 	}
 	else
 	{
 		cancelButton.caption = "Quit";
 		cancelButton.tooltip = "Return to the lobby."
 	}
 
 }
 
 // Called after the map data is loaded and cached
 function initMain()
 {
 	// Load AI list and hide deprecated AIs
 	g_AIs = Engine.GetAIs();
 
 	// Sort AIs by displayed name
 	g_AIs.sort(function (a, b) {
 		return a.data.name < b.data.name ? -1 : b.data.name < a.data.name ? +1 : 0;
 	});
 
 	// Get default player data - remove gaia
 	g_DefaultPlayerData = initPlayerDefaults();
 	g_DefaultPlayerData.shift();
 	for (var i = 0; i < g_DefaultPlayerData.length; i++)
 		g_DefaultPlayerData[i].Civ = "random";
 
 	g_GameSpeeds = initGameSpeeds();
 	g_MapSizes = initMapSizes();
 
 	// Init civs
 	initCivNameList();
 
 	// Init map types
 	var mapTypes = getGUIObjectByName("mapTypeSelection");
 	mapTypes.list = ["Skirmish","Random","Scenario"];
 	mapTypes.list_data = ["skirmish","random","scenario"];
 
 	// Setup map filters - will appear in order they are added
 	addFilter("Default", function(settings) { return settings && !keywordTestOR(settings.Keywords, ["naval", "demo", "hidden"]); });
 	addFilter("Naval Maps", function(settings) { return settings && keywordTestAND(settings.Keywords, ["naval"]); });
 	addFilter("Demo Maps", function(settings) { return settings && keywordTestAND(settings.Keywords, ["demo"]); });
 	addFilter("All Maps", function(settings) { return true; });
 
 	// Populate map filters dropdown
 	var mapFilters = getGUIObjectByName("mapFilterSelection");
 	mapFilters.list = getFilters();
 	g_GameAttributes.mapFilter = "Default";
 
 	// Setup controls for host only
 	if (g_IsController)
 	{
 		mapTypes.selected = 0;
 		mapFilters.selected = 0;
 
 		// Create a unique ID for this match, to be used for identifying the same game reports
 		// for the lobby.
 		g_GameAttributes.matchID = Engine.GetMatchID();
 
 		initMapNameList();
 
 		var numPlayersSelection = getGUIObjectByName("numPlayersSelection");
 		var players = [];
 		for (var i = 1; i <= MAX_PLAYERS; ++i)
 			players.push(i);
 		numPlayersSelection.list = players;
 		numPlayersSelection.list_data = players;
 		numPlayersSelection.selected = MAX_PLAYERS - 1;
 
 		var gameSpeed = getGUIObjectByName("gameSpeed");
 		gameSpeed.hidden = false;
 		getGUIObjectByName("gameSpeedText").hidden = true;
 		gameSpeed.list = g_GameSpeeds.names;
 		gameSpeed.list_data = g_GameSpeeds.speeds;
 		gameSpeed.onSelectionChange = function()
 		{
 			// Update attributes so other players can see change
 			if (this.selected != -1)
 				g_GameAttributes.gameSpeed = g_GameSpeeds.speeds[this.selected];
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		}
 		gameSpeed.selected = g_GameSpeeds["default"];
 
 		var populationCaps = getGUIObjectByName("populationCap");
 		populationCaps.list = POPULATION_CAP;
 		populationCaps.list_data = POPULATION_CAP_DATA;
 		populationCaps.selected = POPULATION_CAP_DEFAULTIDX;
 		populationCaps.onSelectionChange = function()
 		{
 			if (this.selected != -1)
 				g_GameAttributes.settings.PopulationCap = POPULATION_CAP_DATA[this.selected];
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		}
 
 		var startingResourcesL = getGUIObjectByName("startingResources");
 		startingResourcesL.list = STARTING_RESOURCES;
 		startingResourcesL.list_data = STARTING_RESOURCES_DATA;
 		startingResourcesL.selected = STARTING_RESOURCES_DEFAULTIDX;
 		startingResourcesL.onSelectionChange = function()
 		{
 			if (this.selected != -1)
 				g_GameAttributes.settings.StartingResources = STARTING_RESOURCES_DATA[this.selected];
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		}
 
 		var victoryConditions = getGUIObjectByName("victoryCondition");
 		victoryConditions.list = VICTORY_TEXT;
 		victoryConditions.list_data = VICTORY_DATA;
 		victoryConditions.onSelectionChange = function()
 		{	// Update attributes so other players can see change
 			if (this.selected != -1)
 				g_GameAttributes.settings.GameType = VICTORY_DATA[this.selected];
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		};
 		victoryConditions.selected = VICTORY_DEFAULTIDX;
 
 		var mapSize = getGUIObjectByName("mapSize");
 		mapSize.list = g_MapSizes.names;
 		mapSize.list_data = g_MapSizes.tiles;
 		mapSize.onSelectionChange = function()
 		{	// Update attributes so other players can see change
 			if (this.selected != -1)
 				g_GameAttributes.settings.Size = g_MapSizes.tiles[this.selected];
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		};
 		mapSize.selected = 0;
 
 		getGUIObjectByName("revealMap").onPress = function()
 		{	// Update attributes so other players can see change
 			g_GameAttributes.settings.RevealMap = this.checked;
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		};
 
 		getGUIObjectByName("lockTeams").onPress = function()
 		{	// Update attributes so other players can see change
 			g_GameAttributes.settings.LockTeams = this.checked;
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		};
 
 		getGUIObjectByName("enableCheats").onPress = function()
 		{	// Update attributes so other players can see change
 			g_GameAttributes.settings.CheatsEnabled = this.checked;
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		};
 	}
 	else
 	{
 		// If we're a network client, disable all the map controls
 		// TODO: make them look visually disabled so it's obvious why they don't work
 		getGUIObjectByName("mapTypeSelection").hidden = true;
 		getGUIObjectByName("mapTypeText").hidden = false;
 		getGUIObjectByName("mapFilterSelection").hidden = true;
 		getGUIObjectByName("mapFilterText").hidden = false;
 		getGUIObjectByName("mapSelectionText").hidden = false;
 		getGUIObjectByName("mapSelection").hidden = true;
 		getGUIObjectByName("victoryConditionText").hidden = false;
 		getGUIObjectByName("victoryCondition").hidden = true;
 		getGUIObjectByName("gameSpeedText").hidden = false;
 		getGUIObjectByName("gameSpeed").hidden = true;
 
 		// Disable player and game options controls
 		// TODO: Shouldn't players be able to choose their own assignment?
 		for (var i = 0; i < MAX_PLAYERS; ++i)
 		{
 			getGUIObjectByName("playerAssignment["+i+"]").enabled = false;
 			getGUIObjectByName("playerCiv["+i+"]").hidden = true;
 			getGUIObjectByName("playerTeam["+i+"]").hidden = true;
 		}
 
 		getGUIObjectByName("numPlayersSelection").hidden = true;
 	}
 
 	// Set up multiplayer/singleplayer bits:
 	if (!g_IsNetworked)
 	{
 		getGUIObjectByName("chatPanel").hidden = true;
 		getGUIObjectByName("enableCheats").checked = true;
 		g_GameAttributes.settings.CheatsEnabled = true;
 	}
 	else
 	{
 		getGUIObjectByName("enableCheatsDesc").hidden = false;
 		getGUIObjectByName("enableCheats").checked = false;
 		g_GameAttributes.settings.CheatsEnabled = false;
 		if (g_IsController)
 			getGUIObjectByName("enableCheats").hidden = false;
 		else
 			getGUIObjectByName("enableCheatsText").hidden = false;
 	}
 
 	// Settings for all possible player slots
 	var boxSpacing = 32;
 	for (var i = 0; i < MAX_PLAYERS; ++i)
 	{
 		// Space player boxes
 		var box = getGUIObjectByName("playerBox["+i+"]");
 		var boxSize = box.size;
 		var h = boxSize.bottom - boxSize.top;
 		boxSize.top = i * boxSpacing;
 		boxSize.bottom = i * boxSpacing + h;
 		box.size = boxSize;
 
 		// Populate team dropdowns
 		var team = getGUIObjectByName("playerTeam["+i+"]");
 		team.list = ["None", "1", "2", "3", "4"];
 		team.list_data = [-1, 0, 1, 2, 3];
 		team.selected = 0;
 
 		let playerSlot = i;	// declare for inner function use
 		team.onSelectionChange = function()
 		{	// Update team
 			if (this.selected != -1)
 				g_GameAttributes.settings.PlayerData[playerSlot].Team = this.selected - 1;
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		};
 
 		// Set events
 		var civ = getGUIObjectByName("playerCiv["+i+"]");
 		civ.onSelectionChange = function()
 		{	// Update civ
 			if ((this.selected != -1)&&(g_GameAttributes.mapType !== "scenario"))
 				g_GameAttributes.settings.PlayerData[playerSlot].Civ = this.list_data[this.selected];
 
 			if (!g_IsInGuiUpdate)
 				updateGameAttributes();
 		};
 	}
 
 	if (g_IsNetworked)
 	{
 		// For multiplayer, focus the chat input box by default
 		getGUIObjectByName("chatInput").focus();
 	}
 	else
 	{
 		// For single-player, focus the map list by default,
 		// to allow easy keyboard selection of maps
 		getGUIObjectByName("mapSelection").focus();
 	}
 }
 
 function handleNetMessage(message)
 {
 	log("Net message: "+uneval(message));
 
 	switch (message.type)
 	{
 	case "netstatus":
 		switch (message.status)
 		{
 		case "disconnected":
 			cancelSetup();
 			Engine.SwitchGuiPage("page_pregame.xml");
 			reportDisconnect(message.reason);
 			break;
 
 		default:
 			error("Unrecognised netstatus type "+message.status);
 			break;
 		}
 		break;
 
 	case "gamesetup":
 		if (message.data) // (the host gets undefined data on first connect, so skip that)
 			g_GameAttributes = message.data;
 
 		onGameAttributesChange();
 		break;
 
 	case "players":
 		// Find and report all joinings/leavings
 		for (var host in message.hosts)
 			if (! g_PlayerAssignments[host])
 				addChatMessage({ "type": "connect", "username": message.hosts[host].name });
 
 		for (var host in g_PlayerAssignments)
 			if (! message.hosts[host])
 				addChatMessage({ "type": "disconnect", "guid": host });
 
 		// Update the player list
 		g_PlayerAssignments = message.hosts;
 		updatePlayerList();
 
 		if (g_IsController)
 			sendRegisterGameStanza();
 		break;
 
 	case "start":
-		if (g_IsController)
+		if (g_IsController && Engine.HasXmppClient())
 		{
 			var players = [ assignment.name for each (assignment in g_PlayerAssignments) ]
 			Engine.SendChangeStateGame(Object.keys(g_PlayerAssignments).length, players.join(", "));
 		}
 		Engine.SwitchGuiPage("page_loading.xml", {
 			"attribs": g_GameAttributes,
 			"isNetworked" : g_IsNetworked,
 			"playerAssignments": g_PlayerAssignments,
 			"isController": g_IsController
 		});
 		break;
 
 	case "chat":
 		addChatMessage({ "type": "message", "guid": message.guid, "text": message.text });
 		break;
 
 	default:
 		error("Unrecognised net message type "+message.type);
 	}
 }
 
 // Get display name from map data
 function getMapDisplayName(map)
 {
 	var mapData = loadMapData(map);
 
 	if (!mapData || !mapData.settings || !mapData.settings.Name)
 	{	// Give some msg that map format is unsupported
 		log("Map data missing in scenario '"+map+"' - likely unsupported format");
 		return map;
 	}
 
 	return mapData.settings.Name;
 }
 
 // Get display name from map data
 function getMapPreview(map)
 {
 	var mapData = loadMapData(map);
 
 	if (!mapData || !mapData.settings || !mapData.settings.Preview)
 	{	// Give some msg that map format is unsupported
 		return "nopreview.png";
 	}
 
 	return mapData.settings.Preview;
 }
 
 // Get a setting if it exists or return default
 function getSetting(settings, defaults, property)
 {
 	if (settings && (property in settings))
 		return settings[property];
 
 	// Use defaults
 	if (defaults && (property in defaults))
 		return defaults[property];
 
 	return undefined;
 }
 
 // Initialize the dropdowns containing all the available civs
 function initCivNameList()
 {
 	// Cache civ data
 	g_CivData = loadCivData();
 
 	// Extract name/code, and skip civs that are explicitly disabled
 	// (intended for unusable incomplete civs)
 	var civList = [
 		{ "name": civ.Name, "code": civ.Code }
 		for each (civ in g_CivData)
 			if (civ.SelectableInGameSetup !== false)
 	];
 
 	// Alphabetically sort the list, ignoring case
 	civList.sort(sortNameIgnoreCase);
 
 	var civListNames = [ civ.name for each (civ in civList) ];
 	var civListCodes = [ civ.code for each (civ in civList) ];
 
 	//  Add random civ to beginning of list
 	civListNames.unshift("[color=\"orange\"]Random");
 	civListCodes.unshift("random");
 
 	// Update the dropdowns
 	for (var i = 0; i < MAX_PLAYERS; ++i)
 	{
 		var civ = getGUIObjectByName("playerCiv["+i+"]");
 		civ.list = civListNames;
 		civ.list_data = civListCodes;
 		civ.selected = 0;
 	}
 }
 
 // Initialise the list control containing all the available maps
 function initMapNameList()
 {
 	// Get a list of map filenames
 	// TODO: Should verify these are valid maps before adding to list
 	var mapSelectionBox = getGUIObjectByName("mapSelection")
 	var mapFiles;
 
 	switch (g_GameAttributes.mapType)
 	{
 	case "scenario":
 	case "skirmish":
 		mapFiles = getXMLFileList(g_GameAttributes.mapPath);
 		break;
 
 	case "random":
 		mapFiles = getJSONFileList(g_GameAttributes.mapPath);
 		break;
 
 	default:
 		error("initMapNameList: Unexpected map type '"+g_GameAttributes.mapType+"'");
 		return;
 	}
 
 	// Apply map filter, if any defined
 	var mapList = [];
 	for (var i = 0; i < mapFiles.length; ++i)
 	{
 		var file = g_GameAttributes.mapPath + mapFiles[i];
 		var mapData = loadMapData(file);
 
 		if (g_GameAttributes.mapFilter && mapData && testFilter(g_GameAttributes.mapFilter, mapData.settings))
 			mapList.push({ "name": getMapDisplayName(file), "file": file });
 	}
 
 	// Alphabetically sort the list, ignoring case
 	mapList.sort(sortNameIgnoreCase);
 	if (g_GameAttributes.mapType == "random")
 		mapList.unshift({ "name": "[color=\"orange\"]Random[/color]", "file": "random" });
 
 	var mapListNames = [ map.name for each (map in mapList) ];
 	var mapListFiles = [ map.file for each (map in mapList) ];
 
 	// Select the default map
 	var selected = mapListFiles.indexOf(g_GameAttributes.map);
 	// Default to the first element if list is not empty and we can't find the one we searched for
 	if (selected == -1 && mapList.length)
 	{
 		selected = 0;
 	}
 
 	// Update the list control
 	mapSelectionBox.list = mapListNames;
 	mapSelectionBox.list_data = mapListFiles;
 	mapSelectionBox.selected = selected;
 }
 
 function loadMapData(name)
 {
 	if (!name)
 		return undefined;
 
 	if (!g_MapData[name])
 	{
 		switch (g_GameAttributes.mapType)
 		{
 		case "scenario":
 		case "skirmish":
 			g_MapData[name] = Engine.LoadMapSettings(name);
 			break;
 
 		case "random":
 			if (name == "random")
 				g_MapData[name] = {settings : {"Name" : "Random", "Description" : "Randomly selects a map from the list"}};
 			else
 				g_MapData[name] = parseJSONData(name+".json");
 			break;
 
 		default:
 			error("loadMapData: Unexpected map type '"+g_GameAttributes.mapType+"'");
 			return undefined;
 		}
 	}
 
 	return g_MapData[name];
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // GUI event handlers
 
 function cancelSetup()
 {
 	Engine.DisconnectNetworkGame();
 
-	// Set player presence
-	Engine.LobbySetPlayerPresence("available");
-
-	if(g_IsController)
+	if (Engine.HasXmppClient())
 	{
+		// Set player presence
+		Engine.LobbySetPlayerPresence("available");
+
 		// Unregister the game
-		Engine.SendUnregisterGame();
+		if (g_IsController)
+			Engine.SendUnregisterGame();
 	}
 }
 
 function onTick()
 {
 	// First tick happens before first render, so don't load yet
 	if (g_LoadingState == 0)
 	{
 		g_LoadingState++;
 	}
 	else if (g_LoadingState == 1)
 	{
 		getGUIObjectByName("loadingWindow").hidden = true;
 		getGUIObjectByName("setupWindow").hidden = false;
 		initMain();
 		g_LoadingState++;
 	}
 	else if (g_LoadingState == 2)
 	{
 		while (true)
 		{
 			var message = Engine.PollNetworkClient();
 			if (!message)
 				break;
 
 			handleNetMessage(message);
 		}
 	}
 }
 
 // Called when user selects number of players
 function selectNumPlayers(num)
 {
 	// Avoid recursion
 	if (g_IsInGuiUpdate)
 		return;
 
 	// Network clients can't change number of players
 	if (g_IsNetworked && !g_IsController)
 		return;
 
 	// Only meaningful for random maps
 	if (g_GameAttributes.mapType != "random")
 		return;
 
 	// Update player data
 	var pData = g_GameAttributes.settings.PlayerData;
 	if (pData && num < pData.length)
 	{
 		// Remove extra player data
 		g_GameAttributes.settings.PlayerData = pData.slice(0, num);
 	}
 	else
 	{
 		// Add player data from defaults
 		for (var i = pData.length; i < num; ++i)
 			g_GameAttributes.settings.PlayerData.push(g_DefaultPlayerData[i]);
 	}
 
 	// Some players may have lost their assigned slot
 	for (var guid in g_PlayerAssignments)
 	{
 		var player = g_PlayerAssignments[guid].player;
 		if (player > num)
 		{
 			if (g_IsNetworked)
 				Engine.AssignNetworkPlayer(player, "");
 			else
 				g_PlayerAssignments = { "local": { "name": "You", "player": 1, "civ": "", "team": -1} };
 		}
 	}
 
 	updateGameAttributes();
 }
 
 // Called when the user selects a map type from the list
 function selectMapType(type)
 {
 	// Avoid recursion
 	if (g_IsInGuiUpdate)
 		return;
 
 	// Network clients can't change map type
 	if (g_IsNetworked && !g_IsController)
 		return;
 
 	// Reset game attributes
 	g_GameAttributes.map = "";
 	g_GameAttributes.mapType = type;
 
 	// Clear old map data
 	g_MapData = {};
 
 	// Select correct path
 	switch (g_GameAttributes.mapType)
 	{
 	case "scenario":
 		// Set a default map
 		// TODO: This should be remembered from the last session
 		g_GameAttributes.mapPath = "maps/scenarios/";
 		g_GameAttributes.map = g_GameAttributes.mapPath + (g_IsNetworked ? DEFAULT_NETWORKED_MAP : DEFAULT_OFFLINE_MAP);
 		break;
 
 	case "skirmish":
 		g_GameAttributes.mapPath = "maps/skirmishes/";
 		g_GameAttributes.settings = {
 			PlayerData: g_DefaultPlayerData.slice(0, 4),
 			Seed: Math.floor(Math.random() * 65536),
 			CheatsEnabled: g_GameAttributes.settings.CheatsEnabled
 		};
 		break;
 
 	case "random":
 		g_GameAttributes.mapPath = "maps/random/";
 		g_GameAttributes.settings = {
 			PlayerData: g_DefaultPlayerData.slice(0, 4),
 			Seed: Math.floor(Math.random() * 65536),
 			CheatsEnabled: g_GameAttributes.settings.CheatsEnabled
 		};
 		break;
 
 	default:
 		error("selectMapType: Unexpected map type '"+g_GameAttributes.mapType+"'");
 		return;
 	}
 
 	initMapNameList();
 
 	updateGameAttributes();
 }
 
 function selectMapFilter(filterName)
 {
 	// Avoid recursion
 	if (g_IsInGuiUpdate)
 		return;
 
 	// Network clients can't change map filter
 	if (g_IsNetworked && !g_IsController)
 		return;
 
 	g_GameAttributes.mapFilter = filterName;
 
 	initMapNameList();
 
 	updateGameAttributes();
 }
 
 // Called when the user selects a map from the list
 function selectMap(name)
 {
 	// Avoid recursion
 	if (g_IsInGuiUpdate)
 		return;
 
 	// Network clients can't change map
 	if (g_IsNetworked && !g_IsController)
 		return;
 
 	// Return if we have no map
 	if (!name)
 		return;
 
 	var mapData = loadMapData(name);
 	var mapSettings = (mapData && mapData.settings ? deepcopy(mapData.settings) : {});
 
 	// Copy any new settings
 	g_GameAttributes.map = name;
 	g_GameAttributes.script = mapSettings.Script;
 	if (mapData !== "Random")
 		for (var prop in mapSettings)
 			g_GameAttributes.settings[prop] = mapSettings[prop];
 
 	// Use default AI if the map doesn't specify any explicitly
 	for (var i = 0; i < g_GameAttributes.settings.PlayerData.length; ++i)
 	{
 		if (!('AI' in g_GameAttributes.settings.PlayerData[i]))
 			g_GameAttributes.settings.PlayerData[i].AI = g_DefaultPlayerData[i].AI;
 		if (!('AIDiff' in g_GameAttributes.settings.PlayerData[i]))
 			g_GameAttributes.settings.PlayerData[i].AIDiff = g_DefaultPlayerData[i].AIDiff;
 	}
 
 	// Reset player assignments on map change
 	if (!g_IsNetworked)
 	{	// Slot 1
 		g_PlayerAssignments = { "local": { "name": "You", "player": 1, "civ": "", "team": -1} };
 	}
 	else
 	{
 		var numPlayers = (mapSettings.PlayerData ? mapSettings.PlayerData.length : g_GameAttributes.settings.PlayerData.length);
 
 		for (var guid in g_PlayerAssignments)
 		{	// Unassign extra players
 			var player = g_PlayerAssignments[guid].player;
 
 			if (player <= MAX_PLAYERS && player > numPlayers)
 				Engine.AssignNetworkPlayer(player, "");
 		}
 	}
 
 	updateGameAttributes();
 }
 
 function launchGame()
 {
 	if (g_IsNetworked && !g_IsController)
 	{
 		error("Only host can start game");
 		return;
 	}
 
 	// Check that we have a map
 	if (!g_GameAttributes.map)
 		return;
 
 	if (g_GameAttributes.map == "random")
 		selectMap(getGUIObjectByName("mapSelection").list_data[Math.floor(Math.random() *
 			(getGUIObjectByName("mapSelection").list.length - 1)) + 1]);
 
 	g_GameAttributes.settings.mapType = g_GameAttributes.mapType;
 	var numPlayers = g_GameAttributes.settings.PlayerData.length;
 	// Assign random civilizations to players with that choice
 	//  (this is synchronized because we're the host)
 	var cultures = [];
 	for each (var civ in g_CivData)
 		if (civ.Culture !== undefined && cultures.indexOf(civ.Culture) < 0 && (civ.SelectableInGameSetup === undefined || civ.SelectableInGameSetup))
 			cultures.push(civ.Culture);
 	var allcivs = new Array(cultures.length);
 	for (var i = 0; i < allcivs.length; ++i)
 		allcivs[i] = [];
 	for each (var civ in g_CivData)
 		if (civ.Culture !== undefined && (civ.SelectableInGameSetup === undefined || civ.SelectableInGameSetup))
 			allcivs[cultures.indexOf(civ.Culture)].push(civ.Code);
 
 	const romanNumbers = [undefined, "I", "II", "III", "IV", "V", "VI", "VII", "VIII"];
 	for (var i = 0; i < numPlayers; ++i)
 	{
 		civs = allcivs[Math.floor(Math.random()*allcivs.length)];
 
 		if (!g_GameAttributes.settings.PlayerData[i].Civ || g_GameAttributes.settings.PlayerData[i].Civ == "random")
 			g_GameAttributes.settings.PlayerData[i].Civ = civs[Math.floor(Math.random()*civs.length)];
 		// Setting names for AI players. Check if the player is AI and the match is not a scenario
 		if (g_GameAttributes.mapType !== "scenario" && g_GameAttributes.settings.PlayerData[i].AI)
 		{
 			// Get the civ specific names
 			if (g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].AINames !== undefined)
 				var civAINames = shuffleArray(g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].AINames);
 			else
 				var civAINames = [g_CivData[g_GameAttributes.settings.PlayerData[i].Civ].Name];
 			// Choose the name
 			var usedName = 0;
 			if (i < civAINames.length)
 				var chosenName = civAINames[i];
 			else
 				var chosenName = civAINames[Math.floor(Math.random() * civAINames.length)];
 			for (var j = 0; j < numPlayers; ++j)
 				if (g_GameAttributes.settings.PlayerData[j].Name && g_GameAttributes.settings.PlayerData[j].Name.indexOf(chosenName) !== -1)
 					usedName++;
 
 			// Assign civ specific names to AI players
 			if (usedName)
 				g_GameAttributes.settings.PlayerData[i].Name = chosenName + " " + romanNumbers[usedName+1];
 			else
 				g_GameAttributes.settings.PlayerData[i].Name = chosenName;
 		}
 	}
 
 	if (g_IsNetworked)
 	{
 		Engine.SetNetworkGameAttributes(g_GameAttributes);
 		Engine.StartNetworkGame();
 	}
 	else
 	{
 		// Find the player ID which the user has been assigned to
 		var numPlayers = g_GameAttributes.settings.PlayerData.length;
 		var playerID = -1;
 		for (var i = 0; i < numPlayers; ++i)
 		{
 			var assignBox = getGUIObjectByName("playerAssignment["+i+"]");
 			if (assignBox.list_data[assignBox.selected] == "local")
 				playerID = i+1;
 		}
 		// Remove extra player data
 		g_GameAttributes.settings.PlayerData = g_GameAttributes.settings.PlayerData.slice(0, numPlayers);
 
 		Engine.StartGame(g_GameAttributes, playerID);
 		Engine.SwitchGuiPage("page_loading.xml", {
 			"attribs": g_GameAttributes,
 			"isNetworked" : g_IsNetworked,
 			"playerAssignments": g_PlayerAssignments
 		});
 	}
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 function onGameAttributesChange()
 {
 	g_IsInGuiUpdate = true;
 
 	// Don't set any attributes here, just show the changes in GUI
 
 	var mapName = g_GameAttributes.map || "";
 	var mapSettings = g_GameAttributes.settings;
 	var numPlayers = (mapSettings.PlayerData ? mapSettings.PlayerData.length : MAX_PLAYERS);
 
 	// Update some controls for clients
 	if (!g_IsController)
 	{
 		getGUIObjectByName("mapFilterText").caption = g_GameAttributes.mapFilter;
 		var mapTypeSelection = getGUIObjectByName("mapTypeSelection");
 		var idx = mapTypeSelection.list_data.indexOf(g_GameAttributes.mapType);
 		getGUIObjectByName("mapTypeText").caption = mapTypeSelection.list[idx];
 		var mapSelectionBox = getGUIObjectByName("mapSelection");
 		mapSelectionBox.selected = mapSelectionBox.list_data.indexOf(mapName);
 		getGUIObjectByName("mapSelectionText").caption = getMapDisplayName(mapName);
 		var populationCapBox = getGUIObjectByName("populationCap");
 		populationCapBox.selected = populationCapBox.list_data.indexOf(mapSettings.PopulationCap);
 		var startingResourcesBox = getGUIObjectByName("startingResources");
 		startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
 		initMapNameList();
 	}
 
 	// Controls common to all map types
 	var numPlayersSelection = getGUIObjectByName("numPlayersSelection");
 	var revealMap = getGUIObjectByName("revealMap");
 	var victoryCondition = getGUIObjectByName("victoryCondition");
 	var lockTeams = getGUIObjectByName("lockTeams");
 	var mapSize = getGUIObjectByName("mapSize");
 	var enableCheats = getGUIObjectByName("enableCheats");
 	var populationCap = getGUIObjectByName("populationCap");
 	var startingResources = getGUIObjectByName("startingResources");
 
 	var numPlayersText= getGUIObjectByName("numPlayersText");
 	var mapSizeText = getGUIObjectByName("mapSizeText");
 	var revealMapText = getGUIObjectByName("revealMapText");
 	var victoryConditionText = getGUIObjectByName("victoryConditionText");
 	var lockTeamsText = getGUIObjectByName("lockTeamsText");
 	var enableCheatsText = getGUIObjectByName("enableCheatsText");
 	var populationCapText = getGUIObjectByName("populationCapText");
 	var startingResourcesText = getGUIObjectByName("startingResourcesText");
 	var gameSpeedText = getGUIObjectByName("gameSpeedText");
 
 	var sizeIdx = (g_MapSizes.tiles.indexOf(mapSettings.Size) != -1 ? g_MapSizes.tiles.indexOf(mapSettings.Size) : g_MapSizes["default"]);
 	var speedIdx = (g_GameAttributes.gameSpeed !== undefined && g_GameSpeeds.speeds.indexOf(g_GameAttributes.gameSpeed) != -1) ? g_GameSpeeds.speeds.indexOf(g_GameAttributes.gameSpeed) : g_GameSpeeds["default"];
 	var victoryIdx = (VICTORY_DATA.indexOf(mapSettings.GameType) != -1 ? VICTORY_DATA.indexOf(mapSettings.GameType) : VICTORY_DEFAULTIDX);
 	enableCheats.checked = (g_GameAttributes.settings.CheatsEnabled === undefined || !g_GameAttributes.settings.CheatsEnabled ? false : true)
 	enableCheatsText.caption = (enableCheats.checked ? "Yes" : "No");
 	gameSpeedText.caption = g_GameSpeeds.names[speedIdx];
 	populationCap.selected = (POPULATION_CAP_DATA.indexOf(mapSettings.PopulationCap) != -1 ? POPULATION_CAP_DATA.indexOf(mapSettings.PopulationCap) : POPULATION_CAP_DEFAULTIDX);
 	populationCapText.caption = POPULATION_CAP[populationCap.selected];
 	startingResources.selected = (STARTING_RESOURCES_DATA.indexOf(mapSettings.StartingResources) != -1 ? STARTING_RESOURCES_DATA.indexOf(mapSettings.StartingResources) : STARTING_RESOURCES_DEFAULTIDX);
 	startingResourcesText.caption = STARTING_RESOURCES[startingResources.selected];
 
 	// Update map preview
 	getGUIObjectByName("mapPreview").sprite = "cropped:(0.78125,0.5859375)session/icons/mappreview/" + getMapPreview(mapName);
 
 	// Handle map type specific logic
 	switch (g_GameAttributes.mapType)
 	{
 	case "random":
 		if (g_IsController)
 		{
 			//Host
 			numPlayersSelection.selected = numPlayers - 1;
 			numPlayersSelection.hidden = false;
 			mapSize.hidden = false;
 			revealMap.hidden = false;
 			victoryCondition.hidden = false;
 			lockTeams.hidden = false;
 			populationCap.hidden = false;
 			startingResources.hidden = false;
 
 			numPlayersText.hidden = true;
 			mapSizeText.hidden = true;
 			revealMapText.hidden = true;
 			victoryConditionText.hidden = true;
 			lockTeamsText.hidden = true;
 			populationCapText.hidden = true;
 			startingResourcesText.hidden = true;
 
 			mapSizeText.caption = "Map size:";
 			mapSize.selected = sizeIdx;
 			revealMapText.caption = "Reveal map:";
 			revealMap.checked = (mapSettings.RevealMap ? true : false);
 
 			victoryConditionText.caption = "Victory condition:";
 			victoryCondition.selected = victoryIdx;
 			lockTeamsText.caption = "Teams locked:";
 			lockTeams.checked = (mapSettings.LockTeams ? true : false);
 		}
 		else
 		{
 			// Client
 			numPlayersText.hidden = false;
 			mapSizeText.hidden = false;
 			revealMapText.hidden = false;
 			victoryConditionText.hidden = false;
 			lockTeamsText.hidden = false;
 			populationCap.hidden = true;
 			populationCapText.hidden = false;
 			startingResources.hidden = true;
 			startingResourcesText.hidden = false;
 
 			numPlayersText.caption = numPlayers;
 			mapSizeText.caption = g_MapSizes.names[sizeIdx];
 			revealMapText.caption = (mapSettings.RevealMap ? "Yes" : "No");
 			victoryConditionText.caption = VICTORY_TEXT[victoryIdx];
 			lockTeamsText.caption = (mapSettings.LockTeams ? "Yes" : "No");
 		}
 
 		break;
 
 	case "skirmish":
 		mapSizeText.caption = "Default";
 		numPlayersText.caption = numPlayers;
 		numPlayersSelection.hidden = true;
 		mapSize.hidden = true;
 		if (g_IsController)
 		{
 			//Host
 			revealMap.hidden = false;
 			victoryCondition.hidden = false;
 			lockTeams.hidden = false;
 			populationCap.hidden = false;
 			startingResources.hidden = false;
 			
 			numPlayersText.hidden = false;
 			mapSizeText.hidden = false;
 			revealMapText.hidden = true;
 			victoryConditionText.hidden = true;
 			lockTeamsText.hidden = true;
 			populationCapText.hidden = true;
 			startingResourcesText.hidden = true;
 
 			revealMapText.caption = "Reveal map:";
 			revealMap.checked = (mapSettings.RevealMap ? true : false);
 
 			victoryConditionText.caption = "Victory condition:";
 			victoryCondition.selected = victoryIdx;
 			lockTeamsText.caption = "Teams locked:";
 			lockTeams.checked = (mapSettings.LockTeams ? true : false);
 		}
 		else
 		{
 			// Client
 			numPlayersText.hidden = false;
 			mapSizeText.hidden = false;
 			revealMapText.hidden = false;
 			victoryConditionText.hidden = false;
 			lockTeamsText.hidden = false;
 			populationCap.hidden = true;
 			populationCapText.hidden = false;
 			startingResources.hidden = true;
 			startingResourcesText.hidden = false;
 
 			revealMapText.caption = (mapSettings.RevealMap ? "Yes" : "No");
 			victoryConditionText.caption = VICTORY_TEXT[victoryIdx];
 			lockTeamsText.caption = (mapSettings.LockTeams ? "Yes" : "No");
 		}
 
 		break;
 
 
 	case "scenario":
 		// For scenario just reflect settings for the current map
 		numPlayersSelection.hidden = true;
 		mapSize.hidden = true;
 		revealMap.hidden = true;
 		victoryCondition.hidden = true;
 		lockTeams.hidden = true;
 		numPlayersText.hidden = false;
 		mapSizeText.hidden = false;
 		revealMapText.hidden = false;
 		victoryConditionText.hidden = false;
 		lockTeamsText.hidden = false;
 		populationCap.hidden = true;
 		populationCapText.hidden = false;
 		startingResources.hidden = true;
 		startingResourcesText.hidden = false;
 
 		numPlayersText.caption = numPlayers;
 		mapSizeText.caption = "Default";
 		revealMapText.caption = (mapSettings.RevealMap ? "Yes" : "No");
 		victoryConditionText.caption = VICTORY_TEXT[victoryIdx];
 		lockTeamsText.caption = (mapSettings.LockTeams ? "Yes" : "No");
 		getGUIObjectByName("populationCap").selected = POPULATION_CAP_DEFAULTIDX;
 
 		break;
 
 	default:
 		error("onGameAttributesChange: Unexpected map type '"+g_GameAttributes.mapType+"'");
 		return;
 	}
 
 	// Display map name
 	getGUIObjectByName("mapInfoName").caption = getMapDisplayName(mapName);
 
 	// Load the description from the map file, if there is one
 	var description = mapSettings.Description || "Sorry, no description available.";
 
 	if (g_GameAttributes.mapFilter == "Naval Maps")
 		description += g_NavalWarning;
 
 	// Describe the number of players
 	var playerString = numPlayers + " " + (numPlayers == 1 ? "player" : "players") + ". ";
 
 	for (var i = 0; i < MAX_PLAYERS; ++i)
 	{
 		// Show only needed player slots
 		getGUIObjectByName("playerBox["+i+"]").hidden = (i >= numPlayers);
 
 		// Show player data or defaults as necessary
 		if (i >= numPlayers)
 			continue;
 
 		var pName = getGUIObjectByName("playerName["+i+"]");
 		var pCiv = getGUIObjectByName("playerCiv["+i+"]");
 		var pCivText = getGUIObjectByName("playerCivText["+i+"]");
 		var pTeam = getGUIObjectByName("playerTeam["+i+"]");
 		var pTeamText = getGUIObjectByName("playerTeamText["+i+"]");
 		var pColor = getGUIObjectByName("playerColour["+i+"]");
 
 		// Player data / defaults
 		var pData = mapSettings.PlayerData ? mapSettings.PlayerData[i] : {};
 		var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[i] : {};
 
 		// Common to all game types
 		var color = iColorToString(getSetting(pData, pDefs, "Colour"));
 		pColor.sprite = "colour:"+color+" 100";
 		pName.caption = getSetting(pData, pDefs, "Name");
 
 		var team = getSetting(pData, pDefs, "Team");
 		var civ = getSetting(pData, pDefs, "Civ");
 
 		// For clients or scenarios, hide some player dropdowns
 		if (!g_IsController || g_GameAttributes.mapType == "scenario")
 		{
 			pCivText.hidden = false;
 			pCiv.hidden = true;
 			pTeamText.hidden = false;
 			pTeam.hidden = true;
 			// Set text values
 			if (civ == "random")
 				pCivText.caption = "[color=\"orange\"]Random";
 			else
 				pCivText.caption = g_CivData[civ].Name;
 			pTeamText.caption = (team !== undefined && team >= 0) ? team+1 : "-";
 		}
 		else if (g_GameAttributes.mapType != "scenario")
 		{
 			pCivText.hidden = true;
 			pCiv.hidden = false;
 			pTeamText.hidden = true;
 			pTeam.hidden = false;
 			// Set dropdown values
 			pCiv.selected = (civ ? pCiv.list_data.indexOf(civ) : 0);
 			pTeam.selected = (team !== undefined && team >= 0) ? team+1 : 0;
 		}
 	}
 
 	getGUIObjectByName("mapInfoDescription").caption = playerString + description;
 
 	g_IsInGuiUpdate = false;
 
 	// Game attributes include AI settings, so update the player list
 	updatePlayerList();
 }
 
 function updateGameAttributes()
 {
 	if (g_IsNetworked)
     {
 		Engine.SetNetworkGameAttributes(g_GameAttributes);
 		if (g_IsController && g_LoadingState >= 2)
 			sendRegisterGameStanza();
 	}
 	else
     {
 		onGameAttributesChange();
     }
 }
 
 function updatePlayerList()
 {
 	g_IsInGuiUpdate = true;
 
 	var hostNameList = [];
 	var hostGuidList = [];
 	var assignments = [];
 	var aiAssignments = {};
 	var noAssignment;
 	var assignedCount = 0;
 
 	for (var guid in g_PlayerAssignments)
 	{
 		var name = g_PlayerAssignments[guid].name;
 		var hostID = hostNameList.length;
 		var player = g_PlayerAssignments[guid].player;
 
 		hostNameList.push(name);
 		hostGuidList.push(guid);
 		assignments[player] = hostID;
 
 		if (player != 255)
 			assignedCount++;
 	}
 
 	// Only enable start button if we have enough assigned players
 	if (g_IsController)
 		getGUIObjectByName("startGame").enabled = (assignedCount > 0);
 
 	for each (var ai in g_AIs)
 	{
 		if (ai.data.hidden)
 		{
 			// If the map uses a hidden AI then don't hide it
 			var usedByMap = false;
 			for (var i = 0; i < MAX_PLAYERS; ++i)
 				if (i < g_GameAttributes.settings.PlayerData.length &&
 				    g_GameAttributes.settings.PlayerData[i].AI == ai.id)
 				{
 					usedByMap = true;
 					break;
 				}
 
 			if (!usedByMap)
 				continue;
 		}
 		// Give AI a different color so it stands out
 		aiAssignments[ai.id] = hostNameList.length;
 		hostNameList.push("[color=\"70 150 70 255\"]AI: " + ai.data.name);
 		hostGuidList.push("ai:" + ai.id);
 	}
 
 	noAssignment = hostNameList.length;
 	hostNameList.push("[color=\"140 140 140 255\"]Unassigned");
 	hostGuidList.push("");
 
 	for (var i = 0; i < MAX_PLAYERS; ++i)
 	{
 		let playerSlot = i;
 		let playerID = i+1; // we don't show Gaia, so first slot is ID 1
 
 		var selection = assignments[playerID];
 
 		var configButton = getGUIObjectByName("playerConfig["+i+"]");
 		configButton.hidden = true;
 
 		// Look for valid player slots
 		if (playerSlot >= g_GameAttributes.settings.PlayerData.length)
 			continue;
 
 		// If no human is assigned, look for an AI instead
 		if (selection === undefined)
 		{
 			var aiId = g_GameAttributes.settings.PlayerData[playerSlot].AI;
 			if (aiId)
 			{
 				// Check for a valid AI
 				if (aiId in aiAssignments)
 					selection = aiAssignments[aiId];
 				else
 					warn("AI \""+aiId+"\" not present. Defaulting to unassigned.");
 			}
 
 			if (!selection)
 				selection = noAssignment;
 
 			// Since no human is assigned, show the AI config button
 			if (g_IsController)
 			{
 				configButton.hidden = false;
 				configButton.onpress = function()
 				{
 					Engine.PushGuiPage("page_aiconfig.xml", {
 						ais: g_AIs,
 						id: g_GameAttributes.settings.PlayerData[playerSlot].AI,
 						difficulty: g_GameAttributes.settings.PlayerData[playerSlot].AIDiff,
 						callback: function(ai) {
 							g_GameAttributes.settings.PlayerData[playerSlot].AI = ai.id;
 							g_GameAttributes.settings.PlayerData[playerSlot].AIDiff = ai.difficulty;
 
 							if (g_IsNetworked)
 								Engine.SetNetworkGameAttributes(g_GameAttributes);
 							else
 								updatePlayerList();
 						}
 					});
 				};
 			}
 		}
 		// There was a human, so make sure we don't have any AI left
 		// over in their slot, if we're in charge of the attributes
 		else if (g_IsController && g_GameAttributes.settings.PlayerData[playerSlot].AI && g_GameAttributes.settings.PlayerData[playerSlot].AI != "")
 		{
 			g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
 			if (g_IsNetworked)
 				Engine.SetNetworkGameAttributes(g_GameAttributes);
 		}
 
 		var assignBox = getGUIObjectByName("playerAssignment["+i+"]");
 		assignBox.list = hostNameList;
 		assignBox.list_data = hostGuidList;
 		if (assignBox.selected != selection)
 			assignBox.selected = selection;
 
 		if (g_IsNetworked && g_IsController)
 		{
 			assignBox.onselectionchange = function ()
 			{
 				if (!g_IsInGuiUpdate)
 				{
 					var guid = hostGuidList[this.selected];
 					if (guid == "")
 					{
 						// Unassign any host from this player slot
 						Engine.AssignNetworkPlayer(playerID, "");
 						// Remove AI from this player slot
 						g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
 					}
 					else if (guid.substr(0, 3) == "ai:")
 					{
 						// Unassign any host from this player slot
 						Engine.AssignNetworkPlayer(playerID, "");
 						// Set the AI for this player slot
 						g_GameAttributes.settings.PlayerData[playerSlot].AI = guid.substr(3);
 					}
 					else
 						swapPlayers(guid, playerSlot);
 
 					Engine.SetNetworkGameAttributes(g_GameAttributes);
 				}
 			};
 		}
 		else if (!g_IsNetworked)
 		{
 			assignBox.onselectionchange = function ()
 			{
 				if (!g_IsInGuiUpdate)
 				{
 					var guid = hostGuidList[this.selected];
 					if (guid == "")
 					{
 						// Remove AI from this player slot
 						g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
 					}
 					else if (guid.substr(0, 3) == "ai:")
 					{
 						// Set the AI for this player slot
 						g_GameAttributes.settings.PlayerData[playerSlot].AI = guid.substr(3);
 					}
 					else
 						swapPlayers(guid, playerSlot);
 
 					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");
 	var text = input.caption;
 	if (text.length)
 	{
 		Engine.SendNetworkChat(text);
 		input.caption = "";
 	}
 }
 
 function addChatMessage(msg)
 {
 	var username = escapeText(msg.username || g_PlayerAssignments[msg.guid].name);
 	var message = escapeText(msg.text);
 
 	// TODO: Maybe host should have distinct font/color?
 	var color = "white";
 
 	if (g_PlayerAssignments[msg.guid] && g_PlayerAssignments[msg.guid].player != 255)
 	{	// Valid player who has been assigned - get player colour
 		var player = g_PlayerAssignments[msg.guid].player - 1;
 		var mapName = g_GameAttributes.map;
 		var mapData = loadMapData(mapName);
 		var mapSettings = (mapData && mapData.settings ? mapData.settings : {});
 		var pData = mapSettings.PlayerData ? mapSettings.PlayerData[player] : {};
 		var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[player] : {};
 
 		color = iColorToString(getSetting(pData, pDefs, "Colour"));
 	}
 
 	var formatted;
 	switch (msg.type)
 	{
 	case "connect":
 		formatted = '[font="serif-bold-13"][color="'+ color +'"]' + username + '[/color][/font] [color="gold"]has joined[/color]';
 		break;
 
 	case "disconnect":
 		formatted = '[font="serif-bold-13"][color="'+ color +'"]' + username + '[/color][/font] [color="gold"]has left[/color]';
 		break;
 
 	case "message":
 		formatted = '[font="serif-bold-13"]<[color="'+ color +'"]' + username + '[/color]>[/font] ' + message;
 		break;
 
 	default:
 		error("Invalid chat message '" + uneval(msg) + "'");
 		return;
 	}
 
 	g_ChatMessages.push(formatted);
 
 	getGUIObjectByName("chatText").caption = g_ChatMessages.join("\n");
 }
 
 function toggleMoreOptions()
 {
 	getGUIObjectByName("moreOptions").hidden = !getGUIObjectByName("moreOptions").hidden;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // Basic map filters API
 
 // Add a new map list filter
 function addFilter(name, filterFunc)
 {
 	if (filterFunc instanceof Object)
 	{	// Basic validity test
 		var newFilter = {};
 		newFilter.name = name;
 		newFilter.filter = filterFunc;
 
 		g_MapFilters.push(newFilter);
 	}
 	else
 	{
 		error("Invalid map filter: "+name);
 	}
 }
 
 // Get array of map filter names
 function getFilters()
 {
 	var filters = [];
 	for (var i = 0; i < g_MapFilters.length; ++i)
 		filters.push(g_MapFilters[i].name);
 
 	return filters;
 }
 
 // Test map filter on given map settings object
 function testFilter(name, mapSettings)
 {
 	for (var i = 0; i < g_MapFilters.length; ++i)
 		if (g_MapFilters[i].name == name)
 			return g_MapFilters[i].filter(mapSettings);
 
 	error("Invalid map filter: "+name);
 	return false;
 }
 
 // Test an array of keywords against a match array using AND logic
 function keywordTestAND(keywords, matches)
 {
 	if (!keywords || !matches)
 		return false;
 
 	for (var m = 0; m < matches.length; ++m)
 		if (keywords.indexOf(matches[m]) == -1)
 			return false;
 
 	return true;
 }
 
 // Test an array of keywords against a match array using OR logic
 function keywordTestOR(keywords, matches)
 {
 	if (!keywords || !matches)
 		return false;
 
 	for (var m = 0; m < matches.length; ++m)
 		if (keywords.indexOf(matches[m]) != -1)
 			return true;
 
 	return false;
 }
 
 function sendRegisterGameStanza()
 {
+	if (!Engine.HasXmppClient())
+		return;
+
 	var selectedMapSize = getGUIObjectByName("mapSize").selected;
 	var selectedVictoryCondition = getGUIObjectByName("victoryCondition").selected;
 
 	// Map sizes only apply to random maps.
 	if (g_GameAttributes.mapType == "random")
 		var mapSize = getGUIObjectByName("mapSize").list[selectedMapSize];
 	else
 		var mapSize = "Default";
 
 	var victoryCondition = getGUIObjectByName("victoryCondition").list[selectedVictoryCondition];
 	var numberOfPlayers = Object.keys(g_PlayerAssignments).length;
 	var players = [ assignment.name for each (assignment in g_PlayerAssignments) ].join(", ");
 
 	var nbp = numberOfPlayers ? numberOfPlayers : 1;
 	var tnbp = g_GameAttributes.settings.PlayerData.length;
 
 	gameData = {
 		"name":g_ServerName,
 		"mapName":g_GameAttributes.map,
 		"niceMapName":getMapDisplayName(g_GameAttributes.map),
 		"mapSize":mapSize,
 		"mapType":g_GameAttributes.mapType,
 		"victoryCondition":victoryCondition,
 		"nbp":nbp,
 		"tnbp":tnbp,
 		"players":players
 	};
 	Engine.SendRegisterGame(gameData);
 }
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js	(revision 14112)
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js	(revision 14113)
@@ -1,226 +1,229 @@
 var g_IsConnecting = false;
 var g_GameType; // "server" or "client"
 var g_ServerName = "";
 
 var g_IsRejoining = false;
 var g_GameAttributes; // used when rejoining
 var g_PlayerAssignments; // used when rejoining
 
 function init(attribs)
 {
 	switch (attribs.multiplayerGameType)
 	{
 	case "join":
 		if(Engine.HasXmppClient())
 		{
 			if (startJoin(attribs.name, attribs.ip))
 				switchSetupPage("pageJoin", "pageConnecting");
 		}
 		else
 		{
 			getGUIObjectByName("pageJoin").hidden = false;
 			getGUIObjectByName("pageHost").hidden = true;
 		}
 		break;
 	case "host":
 		getGUIObjectByName("pageJoin").hidden = true;
 		getGUIObjectByName("pageHost").hidden = false;
 		if(Engine.HasXmppClient())
 		{
 			getGUIObjectByName("hostServerNameWrapper").hidden = false;
 			getGUIObjectByName("hostPlayerName").caption = attribs.name;
 			getGUIObjectByName("hostServerName").caption = attribs.name + "'s game";
 		}
 		else
 			getGUIObjectByName("hostPlayerNameWrapper").hidden = false;
 		break;
 	default:
 		error("Unrecognised multiplayer game type : " + attribs.multiplayerGameType);
 		break;
 	}
 }
 
 function cancelSetup()
 {
 	if (g_IsConnecting)
 		Engine.DisconnectNetworkGame();
 	// Set player lobby presence
-	Engine.LobbySetPlayerPresence("available");
+	if (Engine.HasXmppClient())
+		Engine.LobbySetPlayerPresence("available");
 	Engine.PopGuiPage();
 }
 
 function startConnectionStatus(type)
 {
 	g_GameType = type;
 	g_IsConnecting = true;
 	g_IsRejoining = false;
 	getGUIObjectByName("connectionStatus").caption = "Connecting to server...";
 }
 
 function onTick()
 {
 	if (!g_IsConnecting)
 		return;
 
 	pollAndHandleNetworkClient();
 }
 
 function pollAndHandleNetworkClient()
 {
 	while (true)
 	{
 		var message = Engine.PollNetworkClient();
 		if (!message)
 			break;
 
 		log("Net message: "+uneval(message));
 
 		// If we're rejoining an active game, we don't want to actually display
 		// the game setup screen, so perform similar processing to gamesetup.js
 		// in this screen
 		if (g_IsRejoining)
 		{
 			switch (message.type)
 			{
 			case "netstatus":
 				switch (message.status)
 				{
 				case "disconnected":
 					cancelSetup();
 					reportDisconnect(message.reason);
 					return;
 
 				default:
 					error("Unrecognised netstatus type "+message.status);
 					break;
 				}
 				break;
 
 			case "gamesetup":
 				g_GameAttributes = message.data;
 				break;
 
 			case "players":
 				g_PlayerAssignments = message.hosts;
 				break;
 
 			case "start":
 				Engine.SwitchGuiPage("page_loading.xml", {
 					"attribs": g_GameAttributes,
 					"isNetworked" : true,
 					"playerAssignments": g_PlayerAssignments
 				});
 				break;
 
 			case "chat":
 				// Ignore, since we have nowhere to display chat messages
 				break;
 
 			default:
 				error("Unrecognised net message type "+message.type);
 			}
 		}
 		else
 		{
 			// Not rejoining - just trying to connect to server
 
 			switch (message.type)
 			{
 			case "netstatus":
 				switch (message.status)
 				{
 				case "connected":
 					getGUIObjectByName("connectionStatus").caption = "Registering with server...";
 					break;
 
 				case "authenticated":
 					if (message.rejoining)
 					{
 						getGUIObjectByName("connectionStatus").caption = "Game has already started - rejoining...";
 						g_IsRejoining = true;
 						return; // we'll process the game setup messages in the next tick
 					}
 					else
 					{
 						Engine.SwitchGuiPage("page_gamesetup.xml", { "type": g_GameType, "serverName": g_ServerName });
 						return; // don't process any more messages - leave them for the game GUI loop
 					}
 
 				case "disconnected":
 					cancelSetup();
 					reportDisconnect(message.reason);
 					return;
 
 				default:
 					error("Unrecognised netstatus type "+message.status);
 					break;
 				}
 				break;
 			default:
 				error("Unrecognised net message type "+message.type);
 				break;
 			}
 		}
 	}
 }
 
 function switchSetupPage(oldpage, newpage)
 {
 	getGUIObjectByName(oldpage).hidden = true;
 	getGUIObjectByName(newpage).hidden = false;
 }
 
 function startHost(playername, servername)
 {
 	// Disallow identically named games in the multiplayer lobby
 	if (Engine.HasXmppClient())
 	{
 		for each (g in Engine.GetGameList())
 		{
 			if (g.name === servername)
 			{
 				getGUIObjectByName("hostFeedback").caption = "Game name already in use.";
 				return false;
 			}
 		}
 	}
 	try
 	{
 		Engine.StartNetworkHost(playername);
 	}
 	catch (e)
 	{
 		cancelSetup();
 		messageBox(400, 200,
 			"Cannot host game: " + e.message + ".",
 			"Error", 2);
 		return false;
 	}
 
 	startConnectionStatus("server");
 	g_ServerName = servername;
 	// Set player lobby presence
-	Engine.LobbySetPlayerPresence("playing");
+	if (Engine.HasXmppClient())
+		Engine.LobbySetPlayerPresence("playing");
 	return true;
 }
 
 function startJoin(playername, ip)
 {
 	try
 	{
 		Engine.StartNetworkJoin(playername, ip);
 	}
 	catch (e)
 	{
 		cancelSetup();
 		messageBox(400, 200,
 			"Cannot join game: " + e.message + ".",
 			"Error", 2);
 		return false;
 	}
 
 	startConnectionStatus("client");
 	// Set player lobby presence
-	Engine.LobbySetPlayerPresence("playing");
+	if (Engine.HasXmppClient())
+		Engine.LobbySetPlayerPresence("playing");
 	return true;
 }
Index: ps/trunk/binaries/data/mods/public/gui/session/menu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/menu.js	(revision 14112)
+++ ps/trunk/binaries/data/mods/public/gui/session/menu.js	(revision 14113)
@@ -1,444 +1,447 @@
 const PAUSE = "Pause";
 const RESUME = "Resume";
 
 /*
  * MENU POSITION CONSTANTS
 */
 
 // Menu / panel border size
 const MARGIN = 4;
 
 // Includes the main menu button
 const NUM_BUTTONS = 8;
 
 // Regular menu buttons
 const BUTTON_HEIGHT = 32;
 
 // The position where the bottom of the menu will end up (currently 228)
 const END_MENU_POSITION = (BUTTON_HEIGHT * NUM_BUTTONS) + MARGIN;
 
 // Menu starting position: bottom
 const MENU_BOTTOM = 0;
 
 // Menu starting position: top
 const MENU_TOP = MENU_BOTTOM - END_MENU_POSITION;
 
 // Menu starting position: overall
 const INITIAL_MENU_POSITION = "100%-164 " + MENU_TOP + " 100% " + MENU_BOTTOM;
 
 // Number of pixels per millisecond to move
 const MENU_SPEED = 1.2;
 
 var isMenuOpen = false;
 var menu;
 
 var isDiplomacyOpen = false;
 
 // Redefined every time someone makes a tribute (so we can save some data in a closure). Called in input.js handleInputBeforeGui.
 var flushTributing = function() {};
 
 // Ignore size defined in XML and set the actual menu size here
 function initMenuPosition()
 {
 	menu = getGUIObjectByName("menu");
 	menu.size = INITIAL_MENU_POSITION;
 }
 
 
 // =============================================================================
 // Overall Menu
 // =============================================================================
 //
 // Slide menu
 function updateMenuPosition(dt)
 {
 	if (isMenuOpen)
 	{
 		var maxOffset = END_MENU_POSITION - menu.size.bottom;
 		if (maxOffset > 0)
 		{
 			var offset = Math.min(MENU_SPEED * dt, maxOffset);
 			var size = menu.size;
 			size.top += offset;
 			size.bottom += offset;
 			menu.size = size;
 		}
 	}
 	else
 	{
 		var maxOffset = menu.size.top - MENU_TOP;
 		if (maxOffset > 0)
 		{
 			var offset = Math.min(MENU_SPEED * dt, maxOffset);
 			var size = menu.size;
 			size.top -= offset;
 			size.bottom -= offset;
 			menu.size = size;
 		}
 	}
 }
 
 // Opens the menu by revealing the screen which contains the menu
 function openMenu()
 {
 //	playButtonSound();
 	isMenuOpen = true;
 }
 
 // Closes the menu and resets position
 function closeMenu()
 {
 //	playButtonSound();
 	isMenuOpen = false;
 }
 
 function toggleMenu()
 {
 	if (isMenuOpen == true)
 		closeMenu();
 	else
 		openMenu();
 }
 
 // Menu buttons
 // =============================================================================
 function settingsMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openSettings(true);
 }
 
 function chatMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openChat();
 }
 
 function diplomacyMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	openDiplomacy();
 }
 
 function pauseMenuButton()
 {
 	togglePause();
 }
 
 function resignMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	var btCaptions = ["Yes", "No"];
 	var btCode = [resignGame, resumeGame];
 	messageBox(400, 200, "Are you sure you want to resign?", "Confirmation", 0, btCaptions, btCode);
 }
 
 function exitMenuButton()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	var btCaptions = ["Yes", "No"];
 	var btCode = [leaveGame, resumeGame];
 	messageBox(400, 200, "Are you sure you want to quit?", "Confirmation", 0, btCaptions, btCode);
 }
 
 function openDeleteDialog(selection)
 {
 	closeMenu();
 	closeOpenDialogs();
 
 	var deleteSelectedEntities = function ()
 	{
 		Engine.PostNetworkCommand({"type": "delete-entities", "entities": selection});
 	};
 
 	var btCaptions = ["Yes", "No"];
 	var btCode = [deleteSelectedEntities, resumeGame];
 
 	messageBox(400, 200, "Destroy everything currently selected?", "Delete", 0, btCaptions, btCode);
 }
 
 // Menu functions
 // =============================================================================
 
 function openSave()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	Engine.PushGuiPage("page_savegame.xml", {"gameDataCallback": getSavedGameData, "closeCallback": resumeGame});
 }
 
 function openSettings(pause)
 {
 	getGUIObjectByName("settingsDialogPanel").hidden = false;
 	if (pause)
 		pauseGame();
 }
 
 function closeSettings(resume)
 {
 	getGUIObjectByName("settingsDialogPanel").hidden = true;
 	if (resume)
 		resumeGame();
 }
 
 function openChat()
 {
 	getGUIObjectByName("chatInput").focus(); // Grant focus to the input area
 	getGUIObjectByName("chatDialogPanel").hidden = false;
 
 }
 
 function closeChat()
 {
 	getGUIObjectByName("chatInput").caption = ""; // Clear chat input
 	getGUIObjectByName("chatInput").blur(); // Remove focus
 	getGUIObjectByName("chatDialogPanel").hidden = true;
 }
 
 function toggleChatWindow(teamChat)
 {
 	closeSettings();
 
 	var chatWindow = getGUIObjectByName("chatDialogPanel");
 	var chatInput = getGUIObjectByName("chatInput");
 
 	if (chatWindow.hidden)
 		chatInput.focus(); // Grant focus to the input area
 	else
 	{
 		if (chatInput.caption.length)
 		{
 			submitChatInput();
 			return;
 		}
 		chatInput.caption = ""; // Clear chat input
 	}
 
 	getGUIObjectByName("toggleTeamChat").checked = teamChat;
 	chatWindow.hidden = !chatWindow.hidden;
 }
 
 function setDiplomacy(data)
 {
 	Engine.PostNetworkCommand({"type": "diplomacy", "to": data.to, "player": data.player});
 }
 
 function tributeResource(data)
 {
 	Engine.PostNetworkCommand({"type": "tribute", "player": data.player, "amounts":  data.amounts});
 }
 
 function openDiplomacy()
 {
 	isDiplomacyOpen = true;
 
 	var we = Engine.GetPlayerID();
 	var players = getPlayerData(g_PlayerAssignments);
 
 	// Get offset for one line
 	var onesize = getGUIObjectByName("diplomacyPlayer[0]").size;
 	var rowsize = onesize.bottom - onesize.top;
 
 	// We don't include gaia
 	for (var i = 1; i < players.length; i++)
 	{
 		// Apply offset
 		var row = getGUIObjectByName("diplomacyPlayer["+(i-1)+"]");
 		var size = row.size;
 		size.top = rowsize*(i-1);
 		size.bottom = rowsize*i;
 		row.size = size;
 
 		// Set background colour
 		var playerColor = players[i].color.r+" "+players[i].color.g+" "+players[i].color.b;
 		row.sprite = "colour: "+playerColor + " 32";
 
 		getGUIObjectByName("diplomacyPlayerName["+(i-1)+"]").caption = "[color=\"" + playerColor + "\"]" + players[i].name + "[/color]";
 		getGUIObjectByName("diplomacyPlayerCiv["+(i-1)+"]").caption = g_CivData[players[i].civ].Name;
 
 		getGUIObjectByName("diplomacyPlayerTeam["+(i-1)+"]").caption = (players[i].team < 0) ? "None" : players[i].team+1;
 
 		if (i != we)
 			getGUIObjectByName("diplomacyPlayerTheirs["+(i-1)+"]").caption = (players[i].isAlly[we] ? "Ally" : (players[i].isNeutral[we] ? "Neutral" : "Enemy"));
 
 		// Don't display the options for ourself, or if we or the other player aren't active anymore
 		if (i == we || players[we].state != "active" || players[i].state != "active")
 		{
 			// Hide the unused/unselectable options
 			for each (var a in ["TributeFood", "TributeWood", "TributeStone", "TributeMetal", "Ally", "Neutral", "Enemy"])
 				getGUIObjectByName("diplomacyPlayer"+a+"["+(i-1)+"]").hidden = true;
 			continue;
 		}
 
 		// Tribute
 		for each (var resource in ["food", "wood", "stone", "metal"])
 		{
 			var button = getGUIObjectByName("diplomacyPlayerTribute"+toTitleCase(resource)+"["+(i-1)+"]");
 			button.onpress = (function(player, resource, button){
 				// Implement something like how unit batch training works. Shift+click to send 500, shift+click+click to send 1000, etc.
 				// Also see input.js (searching for "INPUT_MASSTRIBUTING" should get all the relevant parts).
 				var multiplier = 1;
 				return function() {
 					var isBatchTrainPressed = Engine.HotkeyIsPressed("session.masstribute");
 					if (isBatchTrainPressed)
 					{
 						inputState = INPUT_MASSTRIBUTING;
 						multiplier += multiplier == 1 ? 4 : 5;
 					}
 					var amounts = {
 						"food": (resource == "food" ? 100 : 0) * multiplier,
 						"wood": (resource == "wood" ? 100 : 0) * multiplier,
 						"stone": (resource == "stone" ? 100 : 0) * multiplier,
 						"metal": (resource == "metal" ? 100 : 0) * multiplier,
 					};
 					button.tooltip = formatTributeTooltip(players[player], resource, amounts[resource]);
 					// This is in a closure so that we have access to `player`, `amounts`, and `multiplier` without some
 					// evil global variable hackery.
 					flushTributing = function() {
 						tributeResource({"player": player, "amounts": amounts});
 						multiplier = 1;
 						button.tooltip = formatTributeTooltip(players[player], resource, 100);
 					};
 					if (!isBatchTrainPressed)
 						flushTributing();
 				};
 			})(i, resource, button);
 			button.hidden = false;
 			button.tooltip = formatTributeTooltip(players[i], resource, 100);
 		}
 
 		// Skip our own teams on teams locked
 		if (players[we].teamsLocked && players[we].team != -1 && players[we].team == players[i].team)
 			continue;
 
 		// Diplomacy settings
 		// Set up the buttons
 		for each (var setting in ["ally", "neutral", "enemy"])
 		{
 			var button = getGUIObjectByName("diplomacyPlayer"+toTitleCase(setting)+"["+(i-1)+"]");
 
 			if (setting == "ally")
 			{
 				if (players[we].isAlly[i])
 					button.caption = "x";
 				else
 					button.caption = "";
 			}
 			else if (setting == "neutral")
 			{
 				if (players[we].isNeutral[i])
 					button.caption = "x";
 				else
 					button.caption = "";
 			}
 			else // "enemy"
 			{
 				if (players[we].isEnemy[i])
 					button.caption = "x";
 				else
 					button.caption = "";
 			}
 			
 			button.onpress = (function(e){ return function() { setDiplomacy(e) } })({"player": i, "to": setting});
 			button.hidden = false;
 		}
 	}
 
 	getGUIObjectByName("diplomacyDialogPanel").hidden = false;
 }
 
 function closeDiplomacy()
 {
 	isDiplomacyOpen = false;
 	getGUIObjectByName("diplomacyDialogPanel").hidden = true;
 }
 
 function toggleDiplomacy()
 {
 	if (isDiplomacyOpen)
 		closeDiplomacy();
 	else
 		openDiplomacy();
 };
 
 function toggleGameSpeed()
 {
 	var gameSpeed = getGUIObjectByName("gameSpeed");
 	gameSpeed.hidden = !gameSpeed.hidden;
 }
 
 function pauseGame()
 {
 	getGUIObjectByName("pauseButtonText").caption = RESUME;
 	getGUIObjectByName("pauseOverlay").hidden = false;
 	setPaused(true);
 }
 
 function resumeGame()
 {
 	getGUIObjectByName("pauseButtonText").caption = PAUSE;
 	getGUIObjectByName("pauseOverlay").hidden = true;
 	setPaused(false);
 }
 
 function togglePause()
 {
 	closeMenu();
 	closeOpenDialogs();
 
 	var pauseOverlay = getGUIObjectByName("pauseOverlay");
 
 	if (pauseOverlay.hidden)
 	{
 		getGUIObjectByName("pauseButtonText").caption = RESUME;
 		setPaused(true);
 	}
 	else
 	{
 		setPaused(false);
 		getGUIObjectByName("pauseButtonText").caption = PAUSE;
 	}
 
 	pauseOverlay.hidden = !pauseOverlay.hidden;
 }
 
 function openManual()
 {
 	closeMenu();
 	closeOpenDialogs();
 	pauseGame();
 	Engine.PushGuiPage("page_manual.xml", {"page": "intro", "closeCallback": resumeGame});
 }
 
 function toggleDeveloperOverlay()
 {
+	if (Engine.HasXmppClient() && Engine.IsRankedGame())
+		return;
+
 	var devCommands = getGUIObjectByName("devCommands");
 	var text = devCommands.hidden ? "opened." : "closed.";
 	submitChatDirectly("The Developer Overlay was " + text);
 	// Update the options dialog
 	getGUIObjectByName("developerOverlayCheckbox").checked = devCommands.hidden;
 	devCommands.hidden = !devCommands.hidden;
 }
 
 function closeOpenDialogs()
 {
 	closeMenu();
 	closeChat();
 	closeDiplomacy();
 	closeSettings(false);
 }
 
 function formatTributeTooltip(player, resource, amount)
 {
 	var playerColor = player.color.r + " " + player.color.g + " " + player.color.b;
 	return "Tribute " + amount + " " + resource + " to [color=\"" + playerColor + "\"]" + player.name +
 		"[/color]. Shift-click to tribute " + (amount < 500 ? 500 : amount + 500) + ".";
 }
Index: ps/trunk/binaries/data/mods/public/gui/session/session.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.js	(revision 14112)
+++ ps/trunk/binaries/data/mods/public/gui/session/session.js	(revision 14113)
@@ -1,816 +1,818 @@
 // Network Mode
 var g_IsNetworked = false;
 
 // Is this user in control of game settings (i.e. is a network server, or offline player)
 var g_IsController;
 // Match ID for tracking
 var g_MatchID;
 
 // Cache the basic player data (name, civ, color)
 var g_Players = [];
 // Cache the useful civ data
 var g_CivData = {};
 
 var g_GameSpeeds = {};
 var g_CurrentSpeed;
 
 var g_PlayerAssignments = { "local": { "name": "You", "player": 1 } };
 
 // Cache dev-mode settings that are frequently or widely used
 var g_DevSettings = {
 	controlAll: false
 };
 
 // Whether status bars should be shown for all of the player's units.
 var g_ShowAllStatusBars = false;
 
 // Indicate when one of the current player's training queues is blocked
 // (this is used to support population counter blinking)
 var g_IsTrainingBlocked = false;
 
 // Cache simulation state (updated on every simulation update)
 var g_SimState;
 
 // Cache EntityStates
 var g_EntityStates = {}; // {id:entState}
 
 // Whether the player has lost/won and reached the end of their game
 var g_GameEnded = false;
 
 var g_Disconnected = false; // Lost connection to server
 
 // Holds player states from the last tick
 var g_CachedLastStates = "";
 
 // Colors to flash when pop limit reached
 const DEFAULT_POPULATION_COLOR = "white";
 const POPULATION_ALERT_COLOR = "orange";
 
 function GetSimState()
 {
 	if (!g_SimState)
 	{
 		g_SimState = Engine.GuiInterfaceCall("GetSimulationState");
 	}
 
 	return g_SimState;
 }
 
 function GetEntityState(entId)
 {
 	if (!(entId in g_EntityStates))
 	{
 		var entState = Engine.GuiInterfaceCall("GetEntityState", entId);
 		g_EntityStates[entId] = entState;
 	}
 
 	return g_EntityStates[entId];
 }
 
 // Cache TemplateData
 var g_TemplateData = {}; // {id:template}
 
 
 function GetTemplateData(templateName)
 {
 	if (!(templateName in g_TemplateData))
 	{
 		var template = Engine.GuiInterfaceCall("GetTemplateData", templateName);
 		g_TemplateData[templateName] = template;
 	}
 
 	return g_TemplateData[templateName];
 }
 
 // Cache TechnologyData
 var g_TechnologyData = {}; // {id:template}
 
 function GetTechnologyData(technologyName)
 {
 	if (!(technologyName in g_TechnologyData))
 	{
 		var template = Engine.GuiInterfaceCall("GetTechnologyData", technologyName);
 		g_TechnologyData[technologyName] = template;
 	}
 
 	return g_TechnologyData[technologyName];
 }
 
 // Init
 function init(initData, hotloadData)
 {
 	if (initData)
 	{
 		g_IsNetworked = initData.isNetworked; // Set network mode
 		g_IsController = initData.isController; // Set controller mode
 		g_PlayerAssignments = initData.playerAssignments;
 		g_MatchID = initData.attribs.matchID;
 
 		// Cache the player data
 		// (This may be updated at runtime by handleNetMessage)
 		g_Players = getPlayerData(g_PlayerAssignments);
 
 		if (initData.savedGUIData)
 			restoreSavedGameData(initData.savedGUIData);
 
 		getGUIObjectByName("gameSpeedButton").hidden = g_IsNetworked;
 	}
 	else // Needed for autostart loading option
 	{
 		g_Players = getPlayerData(null);
 	}
 
 	// Cache civ data
 	g_CivData = loadCivData();
 	g_CivData["gaia"] = { "Code": "gaia", "Name": "Gaia" };
 
 	g_GameSpeeds = initGameSpeeds();
 	g_CurrentSpeed = Engine.GetSimRate();
 	var gameSpeed = getGUIObjectByName("gameSpeed");
 	gameSpeed.list = g_GameSpeeds.names;
 	gameSpeed.list_data = g_GameSpeeds.speeds;
 	var idx = g_GameSpeeds.speeds.indexOf(g_CurrentSpeed);
 	gameSpeed.selected = idx != -1 ? idx : g_GameSpeeds["default"];
 	gameSpeed.onSelectionChange = function() { changeGameSpeed(+this.list_data[this.selected]); }
 
 	getGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[Engine.GetPlayerID()].civ].Emblem;
 	getGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[Engine.GetPlayerID()].civ].Name;
 	initMenuPosition(); // set initial position
 
 	// Populate player selection dropdown
 	var playerNames = [];
 	var playerIDs = [];
 	for (var player in g_Players)
 	{
 		playerNames.push(g_Players[player].name);
 		playerIDs.push(player);
 	}
 
 	var viewPlayerDropdown = getGUIObjectByName("viewPlayer");
 	viewPlayerDropdown.list = playerNames;
 	viewPlayerDropdown.list_data = playerIDs;
 	viewPlayerDropdown.selected = Engine.GetPlayerID();
 
 	// If in Atlas editor, disable the exit button
 	if (Engine.IsAtlasRunning())
 		getGUIObjectByName("menuExitButton").enabled = false;
 
 	if (hotloadData)
 	{
 		g_Selection.selected = hotloadData.selection;
 	}
 	else
 	{
 		// Starting for the first time:
 		var civMusic = g_CivData[g_Players[Engine.GetPlayerID()].civ].Music;
 		initMusic();
 		global.music.storeTracks(civMusic);
 		global.music.setState(global.music.states.PEACE);
 		playRandomAmbient("temperate");
 	}
 
 	if (Engine.ConfigDB_GetValue("user", "gui.session.timeelapsedcounter") === "true")
 		getGUIObjectByName("timeElapsedCounter").hidden = false;
 
 	onSimulationUpdate();
 
 	// Report the performance after 5 seconds (when we're still near
 	// the initial camera view) and a minute (when the profiler will
 	// have settled down if framerates as very low), to give some
 	// extremely rough indications of performance
 	setTimeout(function() { reportPerformance(5); }, 5000);
 	setTimeout(function() { reportPerformance(60); }, 60000);
 }
 
 function selectViewPlayer(playerID)
 {
 	Engine.SetPlayerID(playerID);
 	if (playerID != 0) {
 		getGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[playerID].civ].Emblem;
 		getGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[playerID].civ].Name;
 	}
 }
 
 function reportPerformance(time)
 {
 	var settings = Engine.GetMapSettings();
 	var data = {
 		time: time,
 		map: settings.Name,
 		seed: settings.Seed, // only defined for random maps
 		size: settings.Size, // only defined for random maps
 		profiler: Engine.GetProfilerState()
 	};
 
 	Engine.SubmitUserReport("profile", 3, JSON.stringify(data));
 }
 
 function resignGame()
 {
 	var simState = GetSimState();
 
 	// Players can't resign if they've already won or lost.
 	if (simState.players[Engine.GetPlayerID()].state != "active" || g_Disconnected)
 		return;
 
 	// Tell other players that we have given up and been defeated
 	Engine.PostNetworkCommand({
 		"type": "defeat-player",
 		"playerId": Engine.GetPlayerID()
 	});
 
 	global.music.setState(global.music.states.DEFEAT);
 	resumeGame();
 }
 
 function leaveGame()
 {
 	var extendedSimState = Engine.GuiInterfaceCall("GetExtendedSimulationState");
 	var playerState = extendedSimState.players[Engine.GetPlayerID()];
 	var mapSettings = Engine.GetMapSettings();
 	var gameResult;
 
 	if (g_Disconnected)
 	{
 		gameResult = "You have been disconnected."
 	}
 	else if (playerState.state == "won")
 	{
 		gameResult = "You have won the battle!";
 	}
 	else if (playerState.state == "defeated")
 	{
 		gameResult = "You have been defeated...";
 	}
 	else // "active"
 	{
 		gameResult = "You have abandoned the game.";
 
 		// Tell other players that we have given up and been defeated
 		Engine.PostNetworkCommand({
 			"type": "defeat-player",
 			"playerId": Engine.GetPlayerID()
 		});
 
 		global.music.setState(global.music.states.DEFEAT);
 	}
 
 	stopAmbient();
 	endGame();
 
-	if (g_IsController)
-	{
+	if (g_IsController && Engine.HasXmppClient())
 		Engine.SendUnregisterGame();
-	}
+
 	Engine.SwitchGuiPage("page_summary.xml", {
 							"gameResult"  : gameResult,
 							"timeElapsed" : extendedSimState.timeElapsed,
 							"playerStates": extendedSimState.players,
 							"players": g_Players,
 							"mapSettings": mapSettings
 						 });
 }
 
 // Return some data that we'll use when hotloading this file after changes
 function getHotloadData()
 {
 	return { selection: g_Selection.selected };
 }
 
 // Return some data that will be stored in saved game files
 function getSavedGameData()
 {
 	var data = {};
 	data.playerAssignments = g_PlayerAssignments;
 	data.groups = g_Groups.groups;
 	// TODO: any other gui state?
 	return data;
 }
 
 function restoreSavedGameData(data)
 {
 	// Clear selection when loading a game
 	g_Selection.reset();
 
 	// Restore control groups
 	for (var groupNumber in data.groups)
 	{
 		g_Groups.groups[groupNumber].groups = data.groups[groupNumber].groups;
 		g_Groups.groups[groupNumber].ents = data.groups[groupNumber].ents;
 	}
 	updateGroups();
 }
 
 var lastTickTime = new Date;
 
 /**
  * Called every frame.
  */
 function onTick()
 {
 	var now = new Date;
 	var tickLength = new Date - lastTickTime;
 	lastTickTime = now;
 
 	checkPlayerState();
 
 	while (true)
 	{
 		var message = Engine.PollNetworkClient();
 		if (!message)
 			break;
 		handleNetMessage(message);
 	}
 
 	updateCursorAndTooltip();
 
 	// If the selection changed, we need to regenerate the sim display (the display depends on both the
 	// simulation state and the current selection).
 	if (g_Selection.dirty)
 	{
 		onSimulationUpdate();
 
 		// Display rally points for selected buildings
 		Engine.GuiInterfaceCall("DisplayRallyPoint", { "entities": g_Selection.toList() });
 	}
 
 	// Run timers
 	updateTimers();
 
 	// Animate menu
 	updateMenuPosition(tickLength);
 
 	// When training is blocked, flash population (alternates colour every 500msec)
 	if (g_IsTrainingBlocked && (Date.now() % 1000) < 500)
 		getGUIObjectByName("resourcePop").textcolor = POPULATION_ALERT_COLOR;
 	else
 		getGUIObjectByName("resourcePop").textcolor = DEFAULT_POPULATION_COLOR;
 
 	// Clear renamed entities list
 	Engine.GuiInterfaceCall("ClearRenamedEntities");
 }
 
 function checkPlayerState()
 {
 	// Once the game ends, we're done here.
 	if (g_GameEnded)
 		return;
 
 	// Send a game report for each player in this game.
 	var m_simState = GetSimState();
 	var playerState = m_simState.players[Engine.GetPlayerID()];
 	var tempStates = "";
 	for each (var player in m_simState.players) {tempStates += player.state + ",";}
 
 	if (g_CachedLastStates != tempStates)
 	{
 		g_CachedLastStates = tempStates;
 		reportGame(Engine.GuiInterfaceCall("GetExtendedSimulationState"));
 	}
 
 	// If the local player hasn't finished playing, we return here to avoid the victory/defeat messages.
 	if (playerState.state == "active")
 		return;
 
 	// We can't resign once the game is over.
 	getGUIObjectByName("menuResignButton").enabled = false;
 
 	// Make sure nothing is open to avoid stacking.
 	closeMenu();
 	closeOpenDialogs();
 
 	// Make sure this doesn't run again.
 	g_GameEnded = true;
 
 	if (Engine.IsAtlasRunning())
 	{
 		// If we're in Atlas, we can't leave the game
 		var btCaptions = ["OK"];
 		var btCode = [null];
 		var message = "Press OK to continue";
 	}
 	else
 	{
 		var btCaptions = ["Yes", "No"];
 		var btCode = [leaveGame, null];
 		var message = "Do you want to quit?";
 	}
 
 	if (playerState.state == "defeated")
 	{
 		global.music.setState(global.music.states.DEFEAT);
 		messageBox(400, 200, message, "DEFEATED!", 0, btCaptions, btCode);
 	}
 	else if (playerState.state == "won")
 	{
 		global.music.setState(global.music.states.VICTORY);
 		// TODO: Reveal map directly instead of this silly proxy.
 		if (!getGUIObjectByName("devCommandsRevealMap").checked)
 			getGUIObjectByName("devCommandsRevealMap").checked = true;
 		messageBox(400, 200, message, "VICTORIOUS!", 0, btCaptions, btCode);
 	}
 
 }
 
 function changeGameSpeed(speed)
 {
 	// For non-networked games only
 	if (!g_IsNetworked)
 	{
 		Engine.SetSimRate(speed);
 		g_CurrentSpeed = speed;
 	}
 }
 
 /**
  * Recomputes GUI state that depends on simulation state or selection state. Called directly every simulation
  * update (see session.xml), or from onTick when the selection has changed.
  */
 function onSimulationUpdate()
 {
 	g_Selection.dirty = false;
 	g_EntityStates = {};
 	g_TemplateData = {};
 	g_TechnologyData = {};
 
 	g_SimState = Engine.GuiInterfaceCall("GetSimulationState");
 
 	// If we're called during init when the game is first loading, there will be no simulation yet, so do nothing
 	if (!g_SimState)
 		return;
 
 	handleNotifications();
 
 	if (g_ShowAllStatusBars)
 		recalculateStatusBarDisplay();
 
 	updateHero();
 	updateGroups();
 	updateDebug();
 	updatePlayerDisplay();
 	updateSelectionDetails();
 	updateResearchDisplay();
 	updateBuildingPlacementPreview();
 	updateTimeElapsedCounter();
 
 	// Update music state on basis of battle state.
 	var battleState = Engine.GuiInterfaceCall("GetBattleState", Engine.GetPlayerID());
 	if (battleState)
 		global.music.setState(global.music.states[battleState]);
 }
 
 function updateHero()
 {
 	var simState = GetSimState();
 	var playerState = simState.players[Engine.GetPlayerID()];
 	var heroButton = getGUIObjectByName("unitHeroButton");
 
 	if (!playerState || playerState.heroes.length <= 0)
 	{
 		heroButton.hidden = true;
 		return;
 	}
 
 	var heroImage = getGUIObjectByName("unitHeroImage");
 	var heroState = GetEntityState(playerState.heroes[0]);
 	var template = GetTemplateData(heroState.template);
 	heroImage.sprite = "stretched:session/portraits/" + template.icon;
 	var hero = playerState.heroes[0];
 
 	heroButton.onpress = function()
 	{
 		if (!Engine.HotkeyIsPressed("selection.add"))
 			g_Selection.reset();
 		g_Selection.addList([hero]);
 	};
 	heroButton.ondoublepress = function() { selectAndMoveTo(getEntityOrHolder(hero)); };
 	heroButton.hidden = false;
 
 	// Setup tooltip
 	var tooltip = "[font=\"serif-bold-16\"]" + template.name.specific + "[/font]";
 	tooltip += "\n[font=\"serif-bold-13\"]Health:[/font] " + heroState.hitpoints + "/" + heroState.maxHitpoints;
 	tooltip += "\n[font=\"serif-bold-13\"]" + (heroState.attack ? heroState.attack.type + " " : "")
 	           + "Attack:[/font] " + damageTypeDetails(heroState.attack);
 	// Show max attack range if ranged attack, also convert to tiles (4m per tile)
 	if (heroState.attack && heroState.attack.type == "Ranged")
 		tooltip += ", [font=\"serif-bold-13\"]Range:[/font] " + Math.round(heroState.attack.maxRange/4);
 
 	tooltip += "\n[font=\"serif-bold-13\"]Armor:[/font] " + damageTypeDetails(heroState.armour);
 	tooltip += "\n" + template.tooltip;
 
 	heroButton.tooltip = tooltip;
 };
 
 function updateGroups()
 {
 	var guiName = "Group";
 	g_Groups.update();
 	for (var i = 0; i < 10; i++)
 	{
 		var button = getGUIObjectByName("unit"+guiName+"Button["+i+"]");
 		var label = getGUIObjectByName("unit"+guiName+"Label["+i+"]").caption = i;
 		if (g_Groups.groups[i].getTotalCount() == 0)
 			button.hidden = true;
 		else
 			button.hidden = false;
 		button.onpress = (function(i) { return function() { performGroup((Engine.HotkeyIsPressed("selection.add") ? "add" : "select"), i); } })(i);
 		button.ondoublepress = (function(i) { return function() { performGroup("snap", i); } })(i);
 	}
 	var numButtons = i;
 	var rowLength = 1;
 	var numRows = Math.ceil(numButtons / rowLength);
 	var buttonSideLength = getGUIObjectByName("unit"+guiName+"Button[0]").size.bottom;
 	var buttonSpacer = buttonSideLength+1;
 	for (var i = 0; i < numRows; i++)
 		layoutButtonRow(i, guiName, buttonSideLength, buttonSpacer, rowLength*i, rowLength*(i+1) );
 }
 
 function updateDebug()
 {
 	var simState = GetSimState();
 	var debug = getGUIObjectByName("debug");
 
 	if (getGUIObjectByName("devDisplayState").checked)
 	{
 		debug.hidden = false;
 	}
 	else
 	{
 		debug.hidden = true;
 		return;
 	}
 
 	var conciseSimState = deepcopy(simState);
 	conciseSimState.players = "<<<omitted>>>";
 	var text = "simulation: " + uneval(conciseSimState);
 
 	var selection = g_Selection.toList();
 	if (selection.length)
 	{
 		var entState = GetEntityState(selection[0]);
 		if (entState)
 		{
 			var template = GetTemplateData(entState.template);
 			text += "\n\nentity: {\n";
 			for (var k in entState)
 				text += "  "+k+":"+uneval(entState[k])+"\n";
 			text += "}\n\ntemplate: " + uneval(template);
 		}
 	}
 
 	debug.caption = text;
 }
 
 function updatePlayerDisplay()
 {
 	var simState = GetSimState();
 	var playerState = simState.players[Engine.GetPlayerID()];
 	if (!playerState)
 		return;
 
 	getGUIObjectByName("resourceFood").caption = playerState.resourceCounts.food;
 	getGUIObjectByName("resourceWood").caption = playerState.resourceCounts.wood;
 	getGUIObjectByName("resourceStone").caption = playerState.resourceCounts.stone;
 	getGUIObjectByName("resourceMetal").caption = playerState.resourceCounts.metal;
 	getGUIObjectByName("resourcePop").caption = playerState.popCount + "/" + playerState.popLimit;
 
 	g_IsTrainingBlocked = playerState.trainingBlocked;
 }
 
 function selectAndMoveTo(ent)
 {
 	var entState = GetEntityState(ent);
 	if (!entState || !entState.position)
 		return;
 
 	g_Selection.reset();
 	g_Selection.addList([ent]);
 
 	var position = entState.position;
 	Engine.CameraMoveTo(position.x, position.z);
 }
 
 function updateResearchDisplay()
 {
 	var researchStarted = Engine.GuiInterfaceCall("GetStartedResearch", Engine.GetPlayerID());
 	if (!researchStarted)
 		return;
 
 	// Set up initial positioning.
 	var buttonSideLength = getGUIObjectByName("researchStartedButton[0]").size.right;
 	for (var i = 0; i < 10; ++i)
 	{
 		var button = getGUIObjectByName("researchStartedButton[" + i + "]");
 		var size = button.size;
 		size.top = (4 + buttonSideLength) * i;
 		size.bottom = size.top + buttonSideLength;
 		button.size = size;
 	}
 
 	var numButtons = 0;
 	for (var tech in researchStarted)
 	{
 		// Show at most 10 in-progress techs.
 		if (numButtons >= 10)
 			break;
 
 		var template = GetTechnologyData(tech);
 		var button = getGUIObjectByName("researchStartedButton[" + numButtons + "]");
 		button.hidden = false;
 		button.tooltip = getEntityNames(template);
 		button.onpress = (function(e) { return function() { selectAndMoveTo(e) } })(researchStarted[tech].researcher);
 
 		var icon = "stretched:session/portraits/" + template.icon;
 		getGUIObjectByName("researchStartedIcon[" + numButtons + "]").sprite = icon;
 
 		// Scale the progress indicator.
 		var size = getGUIObjectByName("researchStartedProgressSlider[" + numButtons + "]").size;
 
 		// Buttons are assumed to be square, so left/right offsets can be used for top/bottom.
 		size.top = size.left + Math.round(researchStarted[tech].progress * (size.right - size.left));
 		getGUIObjectByName("researchStartedProgressSlider[" + numButtons + "]").size = size;
 
 		++numButtons;
 	}
 
 	// Hide unused buttons.
 	for (var i = numButtons; i < 10; ++i)
 		getGUIObjectByName("researchStartedButton[" + i + "]").hidden = true;
 }
 
 function updateTimeElapsedCounter()
 {
 	var simState = GetSimState();
 	var speed = g_CurrentSpeed != 1.0 ? " (" + g_CurrentSpeed + "x)" : "";
 	var timeElapsedCounter = getGUIObjectByName("timeElapsedCounter");
 	timeElapsedCounter.caption = timeToString(simState.timeElapsed) + speed;
 }
 
 // Toggles the display of status bars for all of the player's entities.
 function recalculateStatusBarDisplay()
 {
 	if (g_ShowAllStatusBars)
 		var entities = Engine.PickFriendlyEntitiesOnScreen(Engine.GetPlayerID());
 	else
 	{
 		var selected = g_Selection.toList();
 		for each (var ent in g_Selection.highlighted)
 			selected.push(ent);
 
 		// Remove selected entities from the 'all entities' array, to avoid disabling their status bars.
 		var entities = Engine.GuiInterfaceCall("GetPlayerEntities").filter(
 				function(idx) { return (selected.indexOf(idx) == -1); }
 		);
 	}
 
 	Engine.GuiInterfaceCall("SetStatusBars", { "entities": entities, "enabled": g_ShowAllStatusBars });
 }
 
 // Temporarily adding this here
 const AMBIENT_TEMPERATE = "temperate";
 var currentAmbient;
 function playRandomAmbient(type)
 {
 	switch (type)
 	{
 		case AMBIENT_TEMPERATE:
 			// Seem to need the underscore at the end of "temperate" to avoid crash
 			// (Might be caused by trying to randomly load day_temperate.xml)
 //			currentAmbient = newRandomSound("ambient", "temperate_", "dayscape");
 
 			const AMBIENT = "audio/ambient/dayscape/day_temperate_gen_03.ogg";
 			Engine.PlayAmbientSound( AMBIENT, true );
 			break;
 
 		default:
 			Engine.Console_Write("Unrecognized ambient type: " + type);
 			break;
 	}
 }
 
 // Temporarily adding this here
 function stopAmbient()
 {
 	if (currentAmbient)
 	{
 		currentAmbient.free();
 		currentAmbient = null;
 	}
 }
 // Send a report on the game status to the lobby
 function reportGame(extendedSimState)
 {
+	if (!Engine.HasXmppClient())
+		return;
+
 	// Resources gathered and used
 	var playerFoodGatheredString = "";
 	var playerWoodGatheredString  = "";
 	var playerStoneGatheredString = "";
 	var playerMetalGatheredString = "";
 	var playerFoodUsedString = "";
 	var playerWoodUsedString  = "";
 	var playerStoneUsedString = "";
 	var playerMetalUsedString = "";
 	// Resources exchanged
 	var playerFoodBoughtString = "";
 	var playerWoodBoughtString = "";
 	var playerStoneBoughtString = "";
 	var playerMetalBoughtString = "";
 	var playerFoodSoldString = "";
 	var playerWoodSoldString = "";
 	var playerStoneSoldString = "";
 	var playerMetalSoldString = "";
 	var playerTradeIncomeString = "";
 	// Unit Stats
 	var playerUnitsLostString = "";
 	var playerUnitsTrainedString = "";
 	var playerEnemyUnitsKilledString = "";
 	// Building stats
 	var playerBuildingsConstructedString = "";
 	var playerBuildingsLostString = "";
 	var playerEnemyBuildingsDestroyedString = "";
 	var playerCivCentersBuiltString = "";
 	var playerEnemyCivCentersDestroyedString = "";
 	// Tribute
 	var playerTributeSentString = "";
 	var playerTributeReceivedString = "";
 	// Various
 	var mapName = Engine.GetMapSettings().Name;
 	var playerStatesString = "";
 	var playerCivsString = "";
 	var playerPercentMapExploredString = "";
 	var playerTreasuresCollectedString = "";
 
 	// Serialize the statistics for each player into a comma-separated list.
 	for each (var player in extendedSimState.players)
 	{
 		playerStatesString += player.state + ",";
 		playerCivsString += player.civ + ",";
 		playerFoodGatheredString += player.statistics.resourcesGathered.food + ",";
 		playerWoodGatheredString += player.statistics.resourcesGathered.wood + ",";
 		playerStoneGatheredString += player.statistics.resourcesGathered.stone + ",";
 		playerMetalGatheredString += player.statistics.resourcesGathered.metal + ",";
 		playerFoodUsedString += player.statistics.resourcesUsed.food + ",";
 		playerWoodUsedString += player.statistics.resourcesUsed.wood + ",";
 		playerStoneUsedString += player.statistics.resourcesUsed.stone + ",";
 		playerMetalUsedString += player.statistics.resourcesUsed.metal + ",";
 		playerUnitsLostString += player.statistics.unitsLost + ",";
 		playerUnitsTrainedString += player.statistics.unitsTrained + ",";
 		playerEnemyUnitsKilledString += player.statistics.enemyUnitsKilled + ",";
 		playerBuildingsConstructedString += player.statistics.buildingsConstructed + ",";
 		playerBuildingsLostString += player.statistics.buildingsLost + ",";
 		playerEnemyBuildingsDestroyedString += player.statistics.enemyBuildingsDestroyed + ",";
 		playerFoodBoughtString += player.statistics.resourcesBought.food + ",";
 		playerWoodBoughtString += player.statistics.resourcesBought.wood + ",";
 		playerStoneBoughtString += player.statistics.resourcesBought.stone + ",";
 		playerMetalBoughtString += player.statistics.resourcesBought.metal + ",";
 		playerFoodSoldString += player.statistics.resourcesSold.food + ",";
 		playerWoodSoldString += player.statistics.resourcesSold.wood + ",";
 		playerStoneSoldString += player.statistics.resourcesSold.stone + ",";
 		playerMetalSoldString += player.statistics.resourcesSold.metal + ",";
 		playerTributeSentString += player.statistics.tributesSent + ",";
 		playerTributeReceivedString += player.statistics.tributesReceived + ",";
 		playerPercentMapExploredString += player.statistics.precentMapExplored = ",";
 		playerCivCentersBuiltString += player.statistics.civCentresBuilt + ",";
 		playerEnemyCivCentersDestroyedString += player.statistics.enemyCivCentresDestroyed + ",";
 		playerTreasuresCollectedString += player.statistics.treasuresCollected + ",";
 		playerTradeIncomeString += player.statistics.tradeIncome + ",";
 	}
 
 	// Send the report with serialized data
 	Engine.SendGameReport({
 			"timeElapsed" : extendedSimState.timeElapsed,
 			"playerStates" : playerStatesString,
 			"playerID": Engine.GetPlayerID(),
 			"matchID": g_MatchID,
 			"civs" : playerCivsString,
 			"mapName" : mapName,
 			"foodGathered": playerFoodGatheredString,
 			"woodGathered": playerWoodGatheredString,
 			"stoneGathered": playerStoneGatheredString,
 			"metalGathered": playerMetalGatheredString,
 			"foodUsed": playerFoodUsedString,
 			"woodUsed": playerWoodUsedString,
 			"stoneUsed": playerStoneUsedString,
 			"metalUsed": playerMetalUsedString,
 			"unitsLost": playerUnitsLostString,
 			"unitsTrained": playerUnitsTrainedString,
 			"enemyUnitsKilled": playerEnemyUnitsKilledString,
 			"buildingsLost": playerBuildingsLostString,
 			"buildingsConstructed": playerBuildingsConstructedString,
 			"enemyBuildingsDestroyed": playerEnemyBuildingsDestroyedString,
 			"foodBought": playerFoodBoughtString,
 			"woodBought": playerWoodBoughtString,
 			"stoneBought": playerStoneBoughtString,
 			"metalBought": playerMetalBoughtString,
 			"foodSold": playerFoodSoldString,
 			"woodSold": playerWoodSoldString,
 			"stoneSold": playerStoneSoldString,
 			"metalSold": playerMetalSoldString,
 			"tributeSent": playerTributeSentString,
 			"tributeReceived": playerTributeReceivedString,
 			"precentMapExplored": playerPercentMapExploredString,
 			"civCentersBuilt": playerCivCentersBuiltString,
 			"enemyCivCentersDestroyed": playerEnemyCivCentersDestroyedString,
 			"treasuresCollected": playerTreasuresCollectedString,
 			"tradeIncome": playerTradeIncomeString
 		});
 }
Index: ps/trunk/binaries/data/mods/public/gui/session/session.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.xml	(revision 14112)
+++ ps/trunk/binaries/data/mods/public/gui/session/session.xml	(revision 14113)
@@ -1,1260 +1,1261 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
     <script file="gui/common/functions_civinfo.js"/>
     <script file="gui/common/functions_utility.js" />
     <script file="gui/common/functions_global_object.js" />
     <script file="gui/common/music.js"/>
     <script file="gui/common/timer.js"/>
     <script file="gui/session/session.js"/>
     <script file="gui/session/selection.js"/>
     <script file="gui/session/placement.js"/>
     <script file="gui/session/input.js"/>
     <script file="gui/session/menu.js"/>
     <script file="gui/session/selection_details.js"/>
     <script file="gui/session/unit_commands.js"/>
     <script file="gui/session/messages.js"/>
     <script file="gui/session/utility_functions.js"/>
 
     <object name="sn" hotkey="session.gui.toggle">
 	<action on="Tick">
 	    onTick();
 	</action>
 
 	<action on="SimulationUpdate">
 	    onSimulationUpdate();
 	</action>
 
 	<action on="Press">
 	    this.hidden = !this.hidden;
 	</action>
 
 	<!-- ================================  ================================ -->
 	<!-- HOTKEYS (For some reason, they won't work properly unless outside menu) -->
 	<!-- ================================  ================================ -->
 
 	<!-- Exit button Hotkey  -->
 	<!--
 		<action on="Press"><![CDATA[
 			messageBox(400, 200, "Do you really want to quit?", "Confirmation", 0,
 				["Yes", "No!"], [leaveGame, null]);
 		]]></action>
 	-->
 
 	<object hotkey="leave">
 	    <action on="Press">closeOpenDialogs();</action>
 	</object>
 
 	<!-- Chat: Depending on the current state, it either opens message window or closes message window / posts message -->
 	<object hotkey="chat">
 	    <action on="Press">toggleChatWindow();</action>
 	</object>
 
 	<!-- Team Chat: Does the same as the above, but sets the window up to only send messages to teammates. -->
 	<object hotkey="teamchat">
 	    <action on="Press">toggleChatWindow(true);</action>
 	</object>
 
 	<!-- Menu -->
 	<object hotkey="menu.toggle">
 	    <action on="Press">openMenu();</action>
 	</object>
 
 	<!-- Unit silhouettes -->
 	<object hotkey="silhouettes">
 	    <action on="Press">
 		var newSetting = !Engine.Renderer_GetSilhouettesEnabled();
 		Engine.Renderer_SetSilhouettesEnabled(newSetting);
 		getGUIObjectByName("silhouettesCheckbox").checked = newSetting;
 	    </action>
 	</object>
 
 	<!-- Sky -->
 	<object hotkey="showsky">
 	    <action on="Press">
 		var newSetting =  !Engine.Renderer_GetShowSkyEnabled();
 		Engine.Renderer_SetShowSkyEnabled(newSetting);
 	    </action>
 	</object>
 
 	<!-- Pause -->
 	<object hotkey="pause">
 	    <action on="Press">togglePause();</action>
 	</object>
 
 	<!-- Quicksave/load -->
 	<object hotkey="quicksave">
 	    <action on="Press">Engine.QuickSave();</action>
 	</object>
 	<object hotkey="quickload">
 	    <action on="Press">Engine.QuickLoad();</action>
 	</object>
 
 	<!-- Delete button Hotkey (For some reason it won't work when the console is visible -->
 	<object hotkey="session.kill">
 	    <action on="Press">performCommand(g_Selection.toList()[0], "delete");</action>
 	</object>
 
 	<!-- camera.follow mode - follow the first unit in the selection -->
 	<object hotkey="camera.follow">
 	    <action on="Press">setCameraFollow(g_Selection.toList()[0]);</action>
 	</object>
 
 	<!-- Camera jumping - press a hotkey to mark a position and another hotkey to jump back there -->
 	<object hotkey="camera.jump.1">
 		<action on="Press">jumpCamera(1);</action>
 	</object>
 
 	<object hotkey="camera.jump.2">
 		<action on="Press">jumpCamera(2);</action>
 	</object>
 
 	<object hotkey="camera.jump.3">
 		<action on="Press">jumpCamera(3);</action>
 	</object>
 
 	<object hotkey="camera.jump.4">
 		<action on="Press">jumpCamera(4);</action>
 	</object>
 
 	<object hotkey="camera.jump.5">
 		<action on="Press">jumpCamera(5);</action>
 	</object>
 
 	<object hotkey="camera.jump.6">
 		<action on="Press">jumpCamera(6);</action>
 	</object>
 
 	<object hotkey="camera.jump.7">
 		<action on="Press">jumpCamera(7);</action>
 	</object>
 
 	<object hotkey="camera.jump.8">
 		<action on="Press">jumpCamera(8);</action>
 	</object>
 
 	<object hotkey="camera.jump.9">
 		<action on="Press">jumpCamera(9);</action>
 	</object>
 
 	<object hotkey="camera.jump.10">
 		<action on="Press">jumpCamera(10);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.1">
 		<action on="Press">setJumpCamera(1);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.2">
 		<action on="Press">setJumpCamera(2);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.3">
 		<action on="Press">setJumpCamera(3);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.4">
 		<action on="Press">setJumpCamera(4);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.5">
 		<action on="Press">setJumpCamera(5);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.6">
 		<action on="Press">setJumpCamera(6);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.7">
 		<action on="Press">setJumpCamera(7);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.8">
 		<action on="Press">setJumpCamera(8);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.9">
 		<action on="Press">setJumpCamera(9);</action>
 	</object>
 
 	<object hotkey="camera.jump.set.10">
 		<action on="Press">setJumpCamera(10);</action>
 	</object>
 	
 	<!-- Stop the selected units -->
 	<object hotkey="session.stop">
 	    <action on="Press">stopUnits(g_Selection.toList());</action>
 	</object>
 	
 	<!-- queue first unit in the training queue  -->
 	<object hotkey="session.queueunit.1">
 	    <action on="Press">addTrainingByPosition(0);</action>
 	</object>
 
 	<!-- queue 2nd unit in the training queue  -->
 	<object hotkey="session.queueunit.2">
 	    <action on="Press">addTrainingByPosition(1);</action>
 	</object>
 
 	<!-- queue 3rd unit in the training queue  -->
 	<object hotkey="session.queueunit.3">
 	    <action on="Press">addTrainingByPosition(2);</action>
 	</object>
 
 	<!-- queue 4th unit in the training queue  -->
 	<object hotkey="session.queueunit.4">
 	    <action on="Press">addTrainingByPosition(3);</action>
 	</object>
 	
 	<!-- queue 5th unit in the training queue  -->
 	<object hotkey="session.queueunit.5">
 	    <action on="Press">addTrainingByPosition(4);</action>
 	</object>
 
 	<!-- queue 6th unit in the training queue  -->
 	<object hotkey="session.queueunit.6">
 	    <action on="Press">addTrainingByPosition(5);</action>
 	</object>
 
 	<!-- queue 7th unit in the training queue  -->
 	<object hotkey="session.queueunit.7">
 	    <action on="Press">addTrainingByPosition(6);</action>
 	</object>
 
 		<!-- Find idle warrior - TODO: Potentially move this to own UI button? -->
 	<object hotkey="selection.idlewarrior">
 	    <action on="Press">findIdleUnit(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"]);</action>
 	</object>
 
 	<!-- Unselect any selected entities -->
 	<object hotkey="selection.cancel">
 	    <action on="Press">clearSelection()</action>
 	</object>
 	<!-- ================================  ================================ -->
 	<!-- Developer / Debug items -->
 	<!-- ================================  ================================ -->
 
 	<!-- Debug text -->
 	<object name="debug"
 		type="text"
 		size="0 70 80% 100%"
 		ghost="true"
 		textcolor="yellow"
 		font="mono-stroke-10"
 		/>
 
 	<!-- Dev/cheat commands -->
 	<object name="devCommands" size="100%-156 50%-88 100%-8 50%+104" type="image" sprite="devCommandsBackground" z="40"
 		hidden="true" hotkey="session.devcommands.toggle">
-		<action on="Press">
-		if (!Engine.IsRankedGame()) toggleDeveloperOverlay();
-		</action>
+		<action on="Press">toggleDeveloperOverlay();</action>
 
 	    <object size="0 0 100%-18 16" type="text" style="devCommandsText">Control all units</object>
 	    <object size="100%-16 0 100% 16" type="checkbox" name="devControlAll" style="StoneCrossBox">
 		<action on="Press">
 		    g_DevSettings.controlAll = this.checked;
 		    Engine.PostNetworkCommand( {"type": "control-all", "flag": this.checked} );
 		</action>
 	    </object>
 
 	    <object size="0 16 100%-18 32" type="text" style="devCommandsText">Change perspective</object>
 	    <object size="100%-16 16 100% 32" type="checkbox" style="StoneCrossBox">
 		<action on="Press">getGUIObjectByName("viewPlayer").hidden = !this.checked;</action>
 	    </object>
 
 	    <object size="0 32 100%-18 48" type="text" style="devCommandsText">Display selection state</object>
 	    <object size="100%-16 32 100% 48" type="checkbox" name="devDisplayState" style="StoneCrossBox"/>
 
 	    <object size="0 48 100%-18 64" type="text" style="devCommandsText">Pathfinder overlay</object>
 	    <object size="100%-16 48 100% 64" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetPathfinderDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 64 100%-18 80" type="text" style="devCommandsText">Obstruction overlay</object>
 	    <object size="100%-16 64 100% 80" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetObstructionDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 80 100%-18 96" type="text" style="devCommandsText">Unit motion overlay</object>
 	    <object size="100%-16 80 100% 96" type="checkbox" style="StoneCrossBox">
 		<action on="Press">g_Selection.SetMotionDebugOverlay(this.checked);</action>
 	    </object>
 
 	    <object size="0 96 100%-18 112" type="text" style="devCommandsText">Range overlay</object>
 	    <object size="100%-16 96 100% 112" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.GuiInterfaceCall("SetRangeDebugOverlay", this.checked);</action>
 	    </object>
 
 	    <object size="0 112 100%-18 128" type="text" style="devCommandsText">Bounding box overlay</object>
 	    <object size="100%-16 112 100% 128" type="checkbox" style="StoneCrossBox">
 		<action on="Press">Engine.SetBoundingBoxDebugOverlay(this.checked);</action>
 	    </object>
 
 	    <object size="0 128 100%-18 144" type="text" style="devCommandsText">Restrict camera</object>
 	    <object size="100%-16 128 100% 144" type="checkbox" style="StoneCrossBox" checked="true">
 		<action on="Press">Engine.GameView_SetConstrainCameraEnabled(this.checked);</action>
 	    </object>
 
 	    <object size="0 144 100%-18 160" type="text" style="devCommandsText">Reveal map</object>
 	    <object size="100%-16 144 100% 160" type="checkbox" name="devCommandsRevealMap" style="StoneCrossBox">
 		<action on="Press">Engine.PostNetworkCommand({"type": "reveal-map", "enable": this.checked});</action>
 	    </object>
 
 	    <object size="0 160 100%-18 176" type="text" style="devCommandsText">Enable time warp</object>
 	    <object size="100%-16 160 100% 176" type="checkbox" name="devTimeWarp" style="StoneCrossBox">
 		<action on="Press">
         if (this.checked)
           messageBox(500, 250, "Note: time warp mode is a developer option, and not intended\nfor use over long periods of time. Using it incorrectly may\ncause the game to run out of memory or crash.", "Time warp mode", 2);
         Engine.EnableTimeWarpRecording(this.checked ? 10 : 0);</action>
 	    </object>
 
 	    <object size="0 176 100%-18 192" type="text" style="devCommandsText">Promote selected units</object>
 	    <object size="100%-16 176 100% 192" type="button" style="StoneCrossBox">
 		<action on="Press">Engine.PostNetworkCommand({"type": "promote", "entities": g_Selection.toList()});</action>
 	    </object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Time elapsed counter -->
 	<!-- ================================  ================================ -->
 	
 	<object size="100%-120 45 100%-10 65" type="text" name="timeElapsedCounter" style="SettingsText" hotkey="timeelapsedcounter.toggle" hidden="true">
 	    <action on="Press">this.hidden = !this.hidden;</action>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Pause Overlay -->
 	<!-- ================================  ================================ -->
 	<object type="button"
 		name="pauseOverlay"
 		size="0 0 100% 100%"
 		tooltip_style="sessionToolTip"
 		hidden="true"
 		z="0"
 	>
 	    <object size="0 0 100% 100%" type="image" sprite="devCommandsBackground" ghost="true" z="0"/>
 	    <object size="50%-128 50%-20 50%+128 50%+20" type="text" style="PauseText" ghost="true" z="0">Game Paused</object>
 	    <object size="50%-128 50%+20 50%+128 50%+30" type="text" style="PauseMessageText" ghost="true" z="0">Click to Resume Game</object>
 	    <action on="Press">togglePause();</action>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Notification Area -->
 	<!-- ================================  ================================ -->
 	<object name="notificationPanel" type="image" size="50%-300 60 50%+300 120" ghost="true">
 	    <object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Chat -->
 	<!-- ================================  ================================ -->
 
 	<!-- Chat panel -->
 	<object name="chatPanel" size="0 130 100% 100%-240" type="image" ghost="true">
 	    <object name="chatText" size="3 1 100%-1 100%-1" type="text" style="chatPanel" ghost="true"/>
 	</object>
 
 	<!-- Chat window -->
 	<object name="chatDialogPanel" size="50%-180 50%-48 50%+180 50%+36" type="image" hidden="true" sprite="genericPanel">
 	    <object name="chatInput" size="16 12 100%-16 36" type="input" style="StoneInput" max_length="80">
 		<action on="Press">submitChatInput();</action>
 	    </object>
 
 	    <object size="16 100%-40 30%+16 100%-12" type="button" style="StoneButton">
 		Send
 		<action on="Press">submitChatInput();</action>
 	    </object>
 
 	    <object size="30%+24 100%-40 60%+24 100%-12" type="button" style="StoneButton">
 		Cancel
 		<action on="Press">closeChat();</action>
 	    </object>
 	    <object name="toggleTeamChat" size="60%+32 100%-34 60%+48 100%-6" type="checkbox" style="StoneCrossBox"/>
 	    <object size="60%+48 100%-40 100% 100%-12" type="text"  style="LeftLabelText">
 		Team Only
 	    </object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Diplomacy Window -->
 	<!-- ================================  ================================ -->
 	<object name="diplomacyDialogPanel"
 		size="50%-300 50%-200 50%+300 50%+150"
 		type="image"
 		hidden="true"
 		sprite="StoneDialog"
 	>
 		<object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Diplomacy</object>
 
 		<object name="diplomacyHeader" size="32 32 100%-32 64">
 			<object name="diplomacyHeaderName" size="0 0 150 100%" type="text" style="chatPanel" ghost="true" caption="Name"/>
 			<object name="diplomacyHeaderCiv" size="150 0 250 100%" type="text" style="chatPanel" ghost="true" caption="Civilization"/>
 			<object name="diplomacyHeaderTeam" size="250 0 300 100%" type="text" style="chatPanel" ghost="true" caption="Team"/>
 			<object name="diplomacyHeaderTheirs" size="300 0 360 100%" type="text" style="chatPanel" ghost="true" caption="Theirs"/>
 			<object name="diplomacyHeaderAlly" size="100%-180 0 100%-160 100%" type="text" style="chatPanel" caption="A" tooltip="Ally" tooltip_style="sessionToolTipBold"/>
 			<object name="diplomacyHeaderNeutral" size="100%-160 0 100%-140 100%" type="text" style="chatPanel" caption="N" tooltip="Neutral" tooltip_style="sessionToolTipBold"/>
 			<object name="diplomacyHeaderEnemy" size="100%-140 0 100%-120 100%" type="text" style="chatPanel" caption="E" tooltip="Enemy" tooltip_style="sessionToolTipBold"/>
 			<object name="diplomacyHeaderTribute" size="100%-110 0 100% 100%" type="text" style="chatPanel" caption="Tribute"/>
 		</object>
 
 		<object size="32 64 100%-32 384">
 			<repeat count="16">
 				<object name="diplomacyPlayer[n]" size="0 0 100% 20" type="image" hidden="false">
 					<object name="diplomacyPlayerName[n]" size="0 0 150 100%" type="text" style="chatPanel" ghost="true"/>
 					<object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="chatPanel" ghost="true"/>
 					<object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="chatPanel" ghost="true"/>
 					<object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="chatPanel" ghost="true"/>
 
 					<!-- Diplomatic stance - selection -->
 					<object name="diplomacyPlayerAlly[n]" size="100%-180 0 100%-160 100%" type="button" style="StoneButton" hidden="true"/>
 					<object name="diplomacyPlayerNeutral[n]" size="100%-160 0 100%-140 100%" type="button" style="StoneButton" hidden="true"/>
 					<object name="diplomacyPlayerEnemy[n]" size="100%-140 0 100%-120 100%" type="button" style="StoneButton" hidden="true"/>
 
 					<!-- Tribute -->
 					<object name="diplomacyPlayerTributeFood[n]" size="100%-110 0 100%-90 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
 						<object name="diplomacyPlayerTributeFoodImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/food.png" ghost="true"/>
 					</object>
 					<object name="diplomacyPlayerTributeWood[n]" size="100%-90 0 100%-70 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
 						<object name="diplomacyPlayerTributeWoodImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/wood.png" ghost="true"/>
 					</object>
 					<object name="diplomacyPlayerTributeStone[n]" size="100%-70 0 100%-50 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
 						<object name="diplomacyPlayerTributeStoneImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/stone.png" ghost="true"/>
 					</object>
 					<object name="diplomacyPlayerTributeMetal[n]" size="100%-50 0 100%-30 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true">
 						<object name="diplomacyPlayerTributeMetalImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/resources/metal.png" ghost="true"/>
 					</object>
 				</object>
 			</repeat>
 		</object>
 
 		<object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">
 		    Close
 		    <action on="Press">closeDiplomacy();</action>
 		</object>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Settings Window -->
 	<!-- ================================  ================================ -->
 		<object name="settingsDialogPanel"
 			style="StoneDialog"
 			type="image"
 			size="50%-180 50%-225 50%+180 50%+225"
 			hidden="true"
 			z="200"
 			>
 			<object type="text" style="TitleText" size="50%-96 -16 50%+96 16">Settings</object>
 			
 			<object style="TranslucentPanelThinBorder"
 				type="image"
 				size="32 32 100%-32 100%-70"
 				>
 				<!-- Settings / shadows -->
 				<object size="0 10 100%-80 35" type="text" style="RightLabelText" ghost="true">Enable Shadows</object>
 				<object name="shadowsCheckbox" size="100%-56 15 100%-30 40" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetShadowsEnabled();</action>
 					<action on="Press">Engine.Renderer_SetShadowsEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Shadow PCF -->
 				<object size="0 35 100%-80 60" type="text" style="RightLabelText" ghost="true">Enable Shadow Filtering</object>
 				<object name="shadowPCFCheckbox" size="100%-56 40 100%-30 65" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetShadowPCFEnabled();</action>
 					<action on="Press">Engine.Renderer_SetShadowPCFEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Water Normals -->
 				<object size="0 60 100%-80 85" type="text" style="RightLabelText" ghost="true">Water - HQ Waviness</object>
 				<object name="waterNormalCheckox" size="100%-56 65 100%-30 90"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterNormalEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterNormalEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Real Depth -->
 				<object size="0 85 100%-80 110" type="text" style="RightLabelText" ghost="true">Water - Use Actual Depth</object>
 				<object name="waterRealDepthCheckbox" size="100%-56 90 100%-30 115"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterRealDepthEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterRealDepthEnabled(this.checked);</action>
 				</object>
 
 				<!-- Settings / Reflection -->
 				<object size="0 110 100%-80 135" type="text" style="RightLabelText" ghost="true">Water - Enable Reflections</object>
 				<object name="waterReflectionCheckbox" size="100%-56 115 100%-30 140"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterReflectionEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterReflectionEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Refraction -->
 				<object size="0 135 100%-80 160" type="text" style="RightLabelText" ghost="true">Water - Enable Refraction</object>
 				<object name="waterRefractionCheckbox" size="100%-56 140 100%-30 165"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterRefractionEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterRefractionEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Foam -->
 				<object size="0 160 100%-80 185" type="text" style="RightLabelText" ghost="true">Water - Enable Shore Foam</object>
 				<object name="waterFoamCheckbox" size="100%-56 165 100%-30 190"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterFoamEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterFoamEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Waves -->
 				<object size="0 185 100%-80 210" type="text" style="RightLabelText" ghost="true">Water - Enable Shore Waves</object>
 				<object name="waterCoastalWavesCheckbox" size="100%-56 190 100%-30 215"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetWaterCoastalWavesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetWaterCoastalWavesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Shadows -->
 				<object size="0 210 100%-80 235" type="text" style="RightLabelText" ghost="true">Water - Use Surface Shadows</object>
 				<object name="waterShadowsCheckbox" size="100%-56 215 100%-30 240"  type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">if (Engine.Renderer_GetWaterShadowEnabled()) this.checked = true; else this.checked = false;</action>
 					<action on="Press">Engine.Renderer_SetWaterShadowEnabled(this.checked);</action>
 				</object>
 
 				<!-- Settings / Particles -->
 				<object size="0 235 100%-80 260" type="text" style="RightLabelText" ghost="true">Enable Particles</object>
 				<object name="particlesCheckbox" size="100%-56 240 100%-30 265" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetParticlesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetParticlesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Unit Silhouettes -->
 				<object size="0 260 100%-80 285" type="text" style="RightLabelText" ghost="true">Enable Unit Silhouettes</object>
 				<object name="silhouettesCheckbox" size="100%-56 265 100%-30 290" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Load">this.checked = Engine.Renderer_GetSilhouettesEnabled();</action>
 					<action on="Press">Engine.Renderer_SetSilhouettesEnabled(this.checked);</action>
 				</object>
 				
 				<!-- Settings / Music-->
 				<object size="0 285 100%-80 310" type="text" style="RightLabelText" ghost="true">Enable Music</object>
 				<object name="musicCheckbox" size="100%-56 290 100%-30 315" type="checkbox" style="StoneCrossBox" checked="true">
 					<action on="Press">if (this.checked) global.music.start(); else global.music.stop();</action>
 				</object>
 				
 				<!-- Settings / Dev Overlay -->
 				<object size="0 310 100%-80 335" type="text" style="RightLabelText" ghost="true">Developer Overlay</object>
 				<object name="developerOverlayCheckbox" size="100%-56 315 100%-30 340" type="checkbox" style="StoneCrossBox" checked="false">
-					<action on="Load">if (Engine.IsRankedGame()) this.enabled = false;</action>
+					<action on="Load"><![CDATA[
+						if (Engine.HasXmppClient() && Engine.IsRankedGame())
+							this.enabled = false;
+					]]></action>
 					<action on="Press">toggleDeveloperOverlay();</action>
 				</object>
 			</object>
 			
 			<!-- Close button -->
 			<object type="button"
 				style="StoneButton"
 				size="50%-64 100%-52 50%+64 100%-24"
 				tooltip_style="sessionToolTip"
 				>
 				Close
 				<action on="Press">closeSettings(true);</action>
 			</object>
 		</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Top Panel  -->
 	<!-- ================================  ================================ -->
 	<object name="topPanel"
 		type="image"
 		sprite="topPanel"
 		size="-3 0 100%+3 36"
 	>
 	    <!-- ================================  ================================ -->
 	    <!-- Player resource bar -->
 	    <!-- ================================  ================================ -->
 	    <object
 		size="10 0 45% 100%"
 	    >
 		<!-- Food -->
 		<object size="0 0 90 100%" type="image" style="resourceCounter" tooltip="Food" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/food.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceFood"/>
 		</object>
 
 		<!-- Wood -->
 		<object size="90 0 180 100%" type="image" style="resourceCounter" tooltip="Wood" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/wood.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceWood"/>
 		</object>
 
 		<!-- Stone -->
 		<object size="180 0 270 100%" type="image" style="resourceCounter" tooltip="Stone" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/stone.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceStone"/>
 		</object>
 
 		<!-- Metal -->
 		<object size="270 0 360 100%"  type="image" style="resourceCounter" tooltip="Metal" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/metal.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceMetal"/>
 		</object>
 
 		<!-- Population -->
 		<object size="360 0 450 100%" type="image" style="resourceCounter" tooltip="Population (current / limit)" tooltip_style="sessionToolTipBold">
 		    <object size="0 -4 40 34" type="image" sprite="stretched:session/icons/resources/population.png" ghost="true"/>
 		    <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourcePop"/>
 		</object>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Civ Icon -->
 	    <!-- ================================  ================================ -->
 	    <object size="50%-48 -26 50%+48 70" name="civIcon" type="image" tooltip_style="sessionToolTipBold"/>
 
 	    <!-- Switch the view perspective to another player's (largely for AI development) -->
 	    <object size="50%+50 5 50%+150 100%-5" name="viewPlayer" type="dropdown" hidden="true" style="StoneDropDown" tooltip_style="sessionToolTipBold" tooltip="Choose player to view">
 		<action on="SelectionChange">selectViewPlayer(this.selected);</action>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Phase -->
 	    <!-- ================================  ================================ -->
 	    <!--<object size="50%+50 4 50%+300 100%-2" name="PhaseTitleBar" type="text" font="serif-bold-stroke-14" textcolor="white"> Death Match :: Village Phase</object>-->
 
 
 	    <!-- ================================  ================================ -->
 	    <!-- ALPHA LABELS (alpha, build time, revision) -->
 	    <!-- ================================  ================================ -->
 
 	    <!-- Displays Alpha name and number -->
 	    <object size="50%+48 0 100%-226 100%" name="alphaLabel" type="text" style="CenteredLabelText" text_valign="top" ghost="true">
 		ALPHA XIV : Naukratis<!-- IMPORTANT: remember to update pregame/mainmenu.xml in sync with this -->
 
 		<!-- Displays build date and revision number-->
 		<object size="50%-128 0 50%+128 100%-2" name="buildTimeLabel" type="text" style="BuildNameText" ghost="true">
 		    <action on="Load">this.caption = buildTime(0) + " (" + buildTime(2) + ")"</action>
 		</object>
 	    </object>
 
 		<!-- ================================  ================================ -->
 	    <!-- Game Speed Button -->
 	    <!-- ================================  ================================ -->
 	    <object type="button"
 		name="gameSpeedButton"
 		size="100%-226 4 100%-198 32"
 		style="iconButton"
 		tooltip_style="sessionToolTip"
 		tooltip="Game speed"
 	    >
 			<object size="5 5 100%-5 100%-5" type="image" sprite="stretched:session/icons/resources/time_small.png" ghost="true"/>
 			<action on="Press">
 				toggleGameSpeed();
 			</action>
 	    </object>
 
 		<object size="100%-348 40 100%-198 65" name="gameSpeed" type="dropdown" buffer_zone="5" style="StoneDropDown" hidden="true" tooltip="Choose game speed" tooltip_style="sessionToolTip"/>
 		
 	    <!-- ================================  ================================ -->
 	    <!-- Diplomacy Button -->
 	    <!-- ================================  ================================ -->
 	    <object type="button"
 		name="diplomacyButton1"
 		size="100%-194 4 100%-166 32"
 		style="iconButton"
 		tooltip_style="sessionToolTip"
 		tooltip="Diplomacy"
 	    >
 		<!-- TODO make the button less ugly -->
 		<object size="0 0 100% 100%" name="diplomacyButtonImage" type="image" sprite="stretched:session/icons/diplomacy.png" ghost="true"/>
 		<action on="Press">
 		    toggleDiplomacy();
 		</action>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Menu Button -->
 	    <!-- ================================  ================================ -->
 	    <object type="button"
 		    name="menuButton"
 		    size="100%-164 4 100%-8 32"
 		    style="StoneButtonFancy"
 		    tooltip_style="sessionToolTip"
 		    z="70"
 	    >
 		<!-- This object covers up the text on the menu
 		buttons as they slide by so that you don't see
 		them on top of the main menu button -->
 		<object size="0 -4 100% 0" type="image" sprite="horizontalThinBorder" ghost="true"/>
 
 		<object size="50%-32 50%-16 50%+32 50%+16" type="image" sprite="menuButton" ghost="true">MENU</object>
 		<action on="Press">
 		    toggleMenu();
 		</action>
 	    </object> <!-- END OF MENU BUTTON -->
 	</object> <!-- END OF TOP PANEL -->
 
 	<!-- ================================  ================================ -->
 	<!-- Menu -->
 	<!-- ================================  ================================ -->
 	<object name="menu"
 		style="StonePanelThinBorder"
 		type="image"
 		hidden="false"
 		z="40"
 	>
 	    <object size="4 36 100%-4 50%+20">
 
 		<!-- Settings button -->
 		<object type="button"
 			name="settingsButton"
 			style="StoneButtonFancy"
 			size="0 0 100% 28"
 			tooltip_style="sessionToolTip"
 		>
 		    Settings
 		    <action on="Press">settingsMenuButton();</action>
 		</object>
 
 
 		<!-- Save game button -->
 		<object type="button"
 			name="saveGameButton"
 			style="StoneButtonFancy"
 			size="0 32 100% 60"
 			tooltip_style="sessionToolTip"
 		>
 		    Save
 		    <action on="Press">
 			openSave();
 		    </action>
 		</object>
 
 		<!-- Chat button -->
 		<object type="button"
 			name="chatButton"
 			style="StoneButtonFancy"
 			size="0 64 100% 92"
 			tooltip_style="sessionToolTip"
 		>
 		    Chat
 		    <action on="Press">chatMenuButton();</action>
 		</object>
 
 		<!-- Resign button -->
 		<object type="button"
 			name="menuResignButton"
 			style="StoneButtonFancy"
 			size="0 96 100% 124"
 			tooltip_style="sessionToolTip"
 		>
 		    Resign
 		    <action on="Press">resignMenuButton();</action>
 		</object>
 
 		<!-- Exit button -->
 		<object type="button"
 			name="menuExitButton"
 			style="StoneButtonFancy"
 			size="0 128 100% 156"
 			tooltip_style="sessionToolTip"
 		>
 		    Exit
 		    <action on="Press">exitMenuButton();</action>
 		</object>
 
 		<!-- Pause / Resume Button -->
 		<object type="button"
 			name="pauseButton"
 			style="StoneButtonFancy"
 			size="0 160 100% 188"
 			tooltip_style="sessionToolTip"
 		>
 		    <object name="pauseButtonText" type="text" style="CenteredButtonText" ghost="true">Pause</object>
 		    <action on="Press">togglePause();</action>
 		</object>
 
 		<!-- Manual button -->
 		<object type="button"
 			name="manualButton"
 			style="StoneButtonFancy"
 			size="0 192 100% 220"
 			tooltip_style="sessionToolTip"
 		>
 			Manual
 			<action on="Press">openManual();</action>
 		</object>
 		</object>
 	</object>
 
 	<!-- In-progress research -->
 	<object size="100%-50 85 100%-10 100%-200">
 		<repeat count="10">
 			<object name="researchStartedButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
 				<object name="researchStartedIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
 				<object name="researchStartedProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37"/>
 			</object>
 		</repeat>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Hero Selection -->
 	<!-- ================================  ================================ -->
 	<object
 	    name="unitHeroPanel"
 	    size="0 36 50 86"
 	>
 		<object name="unitHeroButton" size="0 0 50 50" type="button" hidden="false" style="iconButton" 
 			tooltip_style="sessionToolTip" tooltip="Attack and Armor">
 			<object name="unitHeroImage" size="5 5 100%-5 100%-5" type="image" ghost="true"/>
 		</object>
 	</object>
 	
 	<!-- ================================  ================================ -->
 	<!-- Unit Selection Groups -->
 	<!-- ================================  ================================ -->
 	<object
 	    name="unitGroupPanel"
 	    size="0% 50%-216 0%+36 50%+144"
 	>
 	    <repeat count="10">
 		<object name="unitGroupButton[n]" size="0 0 36 36" type="button" hidden="false" style="iconButton" tooltip_style="sessionToolTipBottomBold"
 			tooltip="Click to select grouped units.">
 		    <object name="unitGroupIcon[n]" size="3 3 33 33" type="image" sprite="groupsIcon" ghost="true"/>
 		    <object name="unitGroupLabel[n]" type="text" style="largeCenteredOutlinedText" ghost="true"/>
 		</object>
 	    </repeat>
 	</object>
 
 	<!-- ================================  ================================ -->
 	<!-- Information tooltip
 		Follows the mouse around if 'independent' is set to 'true'. -->
 	<!-- ================================  ================================ -->
 	<object name="informationTooltip" type="tooltip" independent="true" style="informationTooltip"/>
 
 	<!-- ================================  ================================ -->
 	<!-- Building placement info tooltip									-->
 	<!-- ================================  ================================ -->
 	<object name="placementTooltip" type="tooltip" independent="true" style="informationTooltip"/>
 
 	<!-- ================================  ================================ -->
 	<!-- START of BOTTOM PANEL -->
 	<!-- ================================  ================================ -->
 
 	<object size="50%-512 100%-180 50%+512 100%">
 
 	    <!-- ================================  ================================ -->
 	    <!-- Minimap -->
 	    <!-- ================================  ================================ -->
 	    <object
 		name="minimapPanel"
 		size="0 100%-212 212 100%"
 		type="image"
 		sprite="mapPanel"
 		z="20"
 	    >
 		<object name="minimap"
 			type="minimap"
 			size="14 14 100%-14 100%-14"
 		>
 		    <action on="WorldClick">handleMinimapEvent(arguments[0]);</action>
 		</object>
 
 		<object name="minimapOverlay" size="10 10 100%-10 100%-10" type="image" sprite="stretched:session/minimap_circle.png" ghost="true"/>
 
 		<!-- Idle Worker Button -->
 		<object type="image"
 			size="100%-36 4 100%-4 36"
 		>
 		    <object type="button"
 			    style="iconButton"
 			    tooltip_style="sessionToolTip"
 			    tooltip="Find idle worker"
 			    hotkey="selection.idleworker"
 		    >
 			<!-- TODO: should highlight the button if there's non-zero idle workers -->
 			<object size="0 0 100% 100%" type="image" sprite="idleWorker" ghost="true" />
 			<action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
 		    </object>
 		</object>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Supplemental Details Panel (Left of Selection Details) -->
 	    <!-- ================================  ================================ -->
 	    <object size="50%-304 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="supplementalDetailsPanel" z="20">
 
 		<object name="unitFormationPanel"
 			size="24 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="16">
 			    <object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
 				<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
 				<object name="unitFormationSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitGarrisonPanel"
 			size="24 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="12">
 			    <object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
 				<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
 				<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitBarterPanel" 
 			size="6 36 100% 100%"
 			hidden="true"
 		>
 		    <object ghost="true" style="resourceText" type="text" size="0 0 100% 20">Exchange resources:</object>
 		    <object size="0 32 100% 78">
 			<repeat count="4">
 			    <object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
 				<object name="unitBarterSellIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitBarterSellUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
 				<object name="unitBarterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
 				<object name="unitBarterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		    <object size="0 78 100% 124">
 			<repeat count="4">
 			    <object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold">
 				<object name="unitBarterBuyIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitBarterBuyUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
 				<object name="unitBarterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<!-- Stance Selection -->
 		<object name="unitStancePanel"
 			style="TranslucentPanel"
 			size="4 100%-43 100%-4 100%-4"
 			type="text"
 		>
 		    <object size="1 2 100% 100%">
 			<repeat count="5">
 			    <object name="unitStanceButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
 				<object name="unitStanceIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
 				<object name="unitStanceSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 	    </object>
 
 	    <!-- ================================  ================================ -->
 	    <!-- Selection Details Panel (Middle) -->
 	    <!-- ================================  ================================ -->
 	    <object name="selectionDetails"
 		    type="image"
 		    sprite="selectionDetailsPanel"
 		    size="50%-114 100%-205 50%+114 100%"
 		    hidden="false"
 	    >
 		<!-- Unit details for Single Unit -->
 		<object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
 		    
 		    <!-- Stats Bars -->
 		    <object size= "2 0 100%-2 98" type="image" tooltip_style="sessionToolTip">
 			
 			<object size="0 8 100% 60" type="image" sprite="edgedPanelShader">
 			    <!-- Health bar -->
 			    <object size="88 0 100% 24" name="healthSection">
 				<object size="0 0 100% 16" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">Health:</object>
 				<object size="0 0 100% 16" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 16 100% 23" name="health" type="image">
 				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				    <object type="image" sprite="healthBackground" ghost="true"/>
 				    <object type="image" sprite="healthForeground" ghost="true" name="healthBar"/>
 				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 				</object>
 			    </object>
 
 			    <!-- Stamina bar -->
 			    <object size="88 28 100% 52" name="staminaSection">
 				<object size="0 0 100% 16" name="staminaLabel" type="text" style="StatsTextLeft" ghost="true">Stamina:</object>
 				<object size="0 0 100% 16" name="staminaStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 16 100% 23" name="stamina" type="image">
 				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				    <object type="image" sprite="staminaBackground" ghost="true"/>
 				    <object type="image" sprite="staminaForeground" ghost="true" name="staminaBar"/>
 				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 				</object>
 			    </object>
 
 			    <!-- Resource bar -->
 			    <object size="88 28 100% 52" name="resourceSection">
 				<object size="0 0 100% 16" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>
 				<object size="0 0 100% 16" name="resourceStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 16 100% 23" name="resources" type="image">
 				    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				    <object type="image" sprite="resourceBackground" ghost="true"/>
 				    <object type="image" sprite="resourceForeground" ghost="true" name="resourceBar"/>
 				    <object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
 				</object>
 			    </object>
 			</object>
 			
 			<object size="0 60 100% 96" type="image" sprite="edgedPanelShader">
 			    <!-- Attack and Armor -->
 			    <object size="90 -2 126 34" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip="Attack and Armor" tooltip_style="sessionToolTip"/>
 
 			    <!-- Resource carrying icon/counter -->
 			    <!-- Used also for number of gatherers/builders -->
 			    <object size="100%-98 -2 100%-28 34" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
 			    <object size="100%-36 -2 100% 34" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
 			</object>
 			
 			<!-- Big unit icon -->
 			<object size="-8 -8 88 88" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
 			    <object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
 			
 			    <!-- Experience bar -->
 			    <object size="2 2 6 100%-2" type="image" name="experience" tooltip="Experience" tooltip_style="sessionToolTip">
 				<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 				<object type="image" sprite="experienceBackground" ghost="true"/>
 				<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
 				<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 			    </object>
 			
 			    <object z="20" size="4 4 20 20" name="rankIcon" type="image" tooltip="Rank" tooltip_style="sessionToolTip"/>
 			</object>
 		    </object>
 		    
 		    <!-- Names (this must come before the attack and armor icon to avoid clipping issues) -->
 		    <object size="2 96 100%-2 100%-36" name="statsArea" type="image" sprite="edgedPanelShader">
 			
 			<!-- These images are used to clip off the top and bottom of the civ icon -->
 			<object z="30" size="0 -5 100% 40" ghost="true" type="image" sprite="remove"/>
 			<object z="30" size="0 100%-5 100% 100%+40" ghost="true" type="image" sprite="remove"/>
 			
 			<object z="30" size="0 2 100% 45" ghost="true">
 			    <!-- Specific Name -->
 			    <object size="0 0 100% 20" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
 
 			    <!-- Generic Name -->
 			    <object size="0 15 100% 36" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
 			</object>
 			
 			<!-- Player Name and Civ -->
 			<object size="0 40 100% 100%">
 			    <object size="50%-64 50%-64 50%+64 50%+64" name="playerCivIcon" type="image" ghost="true"/>
 			    <object size="0 0 100% 100%" name="playerColorBackground" type="image" sprite="playerColorBackground" ghost="true"/>
 			    <object size="0 0 100% 100%" type="image" sprite="bottomEdgedPanelShader" ghost="true"/>
 			    
 			    <!-- Why is this being automatically ghosted? In the mean time, set ghost to false -->
 			    <object ghost="false" size="0 0 100% 100%-5" name="player" type="text" style="largeCenteredOutlinedText" tooltip_style="sessionToolTip"/>
 			</object>
 		    </object>
 
 		</object>
 
 		<!-- Unit details for Multiple Units -->
 		<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
 
 		    <object name="unitSelectionPanel"
 			    size="20 12 100%-20 100%"
 		    >
 			<object size="0 0 100% 100%">
 			    <repeat count="16">
 				<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBold" z="100">
 				    <object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
 				    <object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
 				    <object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true">
 				    </object>
 				</object>
 			    </repeat>
 			</object>
 		    </object>
 
 		    <!-- Total -->
 		    <object size="100%-42 12 100%-8 46" type="image" sprite="groupsIcon">
 			<object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits"/>
 		    </object>
 
 		    <!-- Stats Bars -->
 		    <object size= "100%-38 50 100%-18 100%-44" type="image" tooltip_style="sessionToolTip">
 			<!-- Health bar -->
 			<object size="4 0 11 100%" type="image" name="healthMultiple" tooltip="Hitpoints" tooltip_style="sessionToolTip">
 			    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 			    <object type="image" sprite="healthBackground" ghost="true"/>
 			    <object type="image" sprite="healthForeground" ghost="true" name="healthBarMultiple"/>
 			    <object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 			</object>
 
 			<!-- Stamina bar -->
 			<object size="15 0 22 100%" type="image" name="staminaMultiple" tooltip="Stamina" tooltip_style="sessionToolTipBold">
 			    <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 			    <object type="image" sprite="staminaBackground" ghost="true"/>
 			    <object type="image" sprite="staminaForeground" ghost="true" name="staminaBarMultiple"/>
 			    <object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 			</object>
 		    </object>
 		</object>
 
 		<!-- Unit Commands -->
 		<object name="unitCommandPanel"
 			size="0 100%-36 100% 100%-4"
 			type="image"
 			z="30"
 		>
 		    <object size="0 1 100% 100%">
 			<repeat count="6">
 			    <object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
 				<object name="unitCommandIcon[n]" ghost="true" type="image" size="0 0 100% 100%" style="commandIcon"/>
 				<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<!-- shading for unit commands area -->
 		<object z="50" size="4 100%-36 100%-4 100%-4" ghost="true" type="image" sprite="bottomEdgedPanelShader"/>
 
 	    </object> <!-- END OF SELECTION DETAILS -->
 
 	    <!-- ================================  ================================ -->
 	    <!-- Commands Panel (Right of Selection Details) -->
 	    <!-- ================================  ================================ -->
 	    <object name="unitCommands"
 		    type="image"
 		    sprite="unitCommandsPanel"
 		    size="50%+110 100%-170 50%+512 100%"
 		    hidden="false"
 		    z="20"
 	    >
 		<object name="unitConstructionPanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="24">
 			    <object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitConstructionUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitResearchPanel"
 			size="10 100%-102 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="16">
 			    <object name="unitResearchButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitResearchIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitResearchUnchosenIcon[n]" type="image" hidden="true" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/tech_pair_would_be_unavailable.png"/>
 				<object name="unitResearchUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 60"/>
 			    </object>
 			</repeat>
 			<repeat count="8">
 			    <object name="unitResearchPair[n]" hidden="true" size="0 0 46 92">
 				<object name="unitResearchPairIcon[n]" type="image" ghost="true" size="8 38 38 54" sprite="stretched:session/icons/vertical_pair.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitTrainingPanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="24">
 			    <object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitTrainingUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
 				<object name="unitTrainingCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitTradingPanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="4">
 			    <object name="unitTradingButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitTradingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitTradingSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitQueuePanel"
 			size="4 -56 100% 0"
 			type="image"
 			sprite="queuePanelShader"
 		>
 		    <object size="-4 -2 52 54" type="image" sprite="stretched:session/icons/production.png" tooltip_style="sessionToolTipBottom" tooltip="Production queue">
 			<object name="queueProgress" ghost="true" style="iconButtonProgress" type="text"/>
 		    </object>
 
 		    <object size="48 6 100% 100%">
 			<repeat count="16">
 			    <object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
 				<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
 				<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
 				<object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 		<object name="unitGatePanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="8">
 			    <object name="unitGateButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitGateIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 				<object name="unitGateSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
 				<object name="unitGateUnaffordable[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="colour: 255 0 0 127"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
     
     <object name="unitPackPanel"
 			size="10 12 100% 100%"
 		>
 		    <object size="0 0 100% 100%">
 			<repeat count="8">
 			    <object name="unitPackButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
 				<object name="unitPackIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
 			    </object>
 			</repeat>
 		    </object>
 		</object>
 
 	    </object> <!-- END OF UNIT COMMANDS -->
 
 	</object><!-- END OF BOTTOM PANEL -->
 
     </object> <!-- END OF SN OBJECT -->
 
     <!-- ================================  ================================ -->
     <!-- Selection bandbox -->
     <!-- ================================  ================================ -->
     <object name="bandbox" type="image" sprite="bandbox" ghost="true" hidden="true" z="200"/>
 
     <!-- ================================  ================================ -->
     <!-- Network status -->
     <!-- ================================  ================================ -->
     <object name="netStatus" type="text" style="netStatus" z="100" hidden="true">
 	<object type="button"
 		name="disconnectedExitButton"
 		style="StoneButton"
 		size="50%-84 50%+128 50%+84 50%+160"
 		tooltip_style="sessionToolTip"
 	>
 	    <object size="0 0 100% 100%" type="text" style="CenteredButtonText" name="disconnectedExitButtonText" ghost="true">Exit</object>
 	    <action on="Press">leaveGame()</action>
 	</object>
 
     </object>
 
 </objects>
Index: ps/trunk/build/premake/premake4.lua
===================================================================
--- ps/trunk/build/premake/premake4.lua	(revision 14112)
+++ ps/trunk/build/premake/premake4.lua	(revision 14113)
@@ -1,1408 +1,1414 @@
 newoption { trigger = "android", description = "Use non-working Android cross-compiling mode" }
 newoption { trigger = "atlas", description = "Include Atlas scenario editor projects" }
 newoption { trigger = "collada", description = "Include COLLADA projects (requires FCollada library)" }
 newoption { trigger = "coverage", description = "Enable code coverage data collection (GCC only)" }
 newoption { trigger = "gles", description = "Use non-working OpenGL ES 2.0 mode" }
 newoption { trigger = "icc", description = "Use Intel C++ Compiler (Linux only; should use either \"--cc icc\" or --without-pch too, and then set CXX=icpc before calling make)" }
 newoption { trigger = "outpath", description = "Location for generated project files" }
 newoption { trigger = "without-audio", description = "Disable use of OpenAL/Ogg/Vorbis APIs" }
 newoption { trigger = "minimal-flags", description = "Only set compiler/linker flags that are really needed. Has no effect on Windows builds" }
 newoption { trigger = "without-nvtt", description = "Disable use of NVTT" }
 newoption { trigger = "without-tests", description = "Disable generation of test projects" }
 newoption { trigger = "without-pch", description = "Disable generation and usage of precompiled headers" }
 newoption { trigger = "without-lobby", description = "Disable the use of gloox and the multiplayer lobby" }
 newoption { trigger = "with-system-nvtt", description = "Search standard paths for nvidia-texture-tools library, instead of using bundled copy" }
 newoption { trigger = "with-system-enet", description = "Search standard paths for libenet, instead of using bundled copy" }
 newoption { trigger = "with-system-mozjs185", description = "Search standard paths for libmozjs185, instead of using bundled copy" }
 newoption { trigger = "with-c++11", description = "Enable C++11 on GCC" }
 newoption { trigger = "sysroot", description = "Set compiler system root path, used for building against a non-system SDK. For example /usr/local becomes SYSROOT/user/local" }
 newoption { trigger = "macosx-version-min", description = "Set minimum required version of the OS X API, the build will possibly fail if an older SDK is used, while newer API functions will be weakly linked (i.e. resolved at runtime)" }
 newoption { trigger = "macosx-bundle", description = "Enable OSX bundle, the argument is the bundle identifier string (e.g. com.wildfiregames.0ad)" }
 
 newoption { trigger = "build-shared-glooxwrapper", description = "Rebuild glooxwrapper DLL for Windows. Requires the same compiler version that gloox was built with" }
 newoption { trigger = "use-shared-glooxwrapper", description = "Use prebuilt glooxwrapper DLL for Windows" }
 
 newoption { trigger = "bindir", description = "Directory for executables (typically '/usr/games'); default is to be relocatable" }
 newoption { trigger = "datadir", description = "Directory for data files (typically '/usr/share/games/0ad'); default is ../data/ relative to executable" }
 newoption { trigger = "libdir", description = "Directory for libraries (typically '/usr/lib/games/0ad'); default is ./ relative to executable" }
 
 -- Root directory of project checkout relative to this .lua file
 rootdir = "../.."
 
 dofile("extern_libs4.lua")
 
 -- detect CPU architecture (simplistic, currently only supports x86, amd64 and ARM)
 arch = "x86"
 if _OPTIONS["android"] then
 	arch = "arm"
 elseif os.is("windows") then
 	if os.getenv("PROCESSOR_ARCHITECTURE") == "amd64" or os.getenv("PROCESSOR_ARCHITEW6432") == "amd64" then
 		arch = "amd64"
 	end
 else
 	arch = os.getenv("HOSTTYPE")
 	if arch == "x86_64" or arch == "amd64" then
 		arch = "amd64"
 	else
 		os.execute("gcc -dumpmachine > .gccmachine.tmp")
 		local f = io.open(".gccmachine.tmp", "r")
 		local machine = f:read("*line")
 		f:close()
 		if string.find(machine, "x86_64") == 1 or string.find(machine, "amd64") == 1 then
 			arch = "amd64"
 		elseif string.find(machine, "i.86") == 1 then
 			arch = "x86"
 		elseif string.find(machine, "arm") == 1 then
 			arch = "arm"
 		else
 			print("WARNING: Cannot determine architecture from GCC, assuming x86")
 		end
 	end
 end
 
 -- Set up the Solution
 solution "pyrogenesis"
 targetdir(rootdir.."/binaries/system")
 libdirs(rootdir.."/binaries/system")
 if not _OPTIONS["outpath"] then
 	error("You must specify the 'outpath' parameter")
 end
 location(_OPTIONS["outpath"])
 configurations { "Release", "Debug" }
 
 -- Get some environement specific information used later.
 if os.is("windows") then
 	nasmpath(rootdir.."/build/bin/nasm.exe")
 	lcxxtestpath = rootdir.."/build/bin/cxxtestgen.exe"
 	has_broken_pch = false
 else
 
 	lcxxtestpath = rootdir.."/build/bin/cxxtestgen.pl"
 
 	if os.is("linux") and arch == "amd64" then
 		nasmformat "elf64"
 	elseif os.is("macosx") and arch == "amd64" then
 		nasmformat "macho64"
 	elseif os.is("macosx") then
 		nasmformat "macho"
 	else
 		nasmformat "elf"
 	end
 
 	-- GCC bug (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10591) - PCH breaks anonymous namespaces
 	-- Fixed in 4.2.0, but we have to disable PCH for earlier versions, else
 	-- it conflicts annoyingly with wx 2.8 headers.
 	-- It's too late to do this test by the time we start compiling the PCH file, so
 	-- do the test in this build script instead (which is kind of ugly - please fix if
 	-- you have a better idea)
 	if not _OPTIONS["icc"] then
 		os.execute("gcc -dumpversion > .gccver.tmp")
 		local f = io.open(".gccver.tmp", "r")
 		major, dot, minor = f:read(1, 1, 1)
 		f:close()
 		major = 0+major -- coerce to number
 		minor = 0+minor
 		has_broken_pch = (major < 4 or (major == 4 and minor < 2))
 		if has_broken_pch then
 			print("WARNING: Detected GCC <4.2 -- disabling PCH for Atlas (will increase build times)")
 		end
 	end
 end
 
 source_root = rootdir.."/source/" -- default for most projects - overridden by local in others
 
 -- Rationale: projects should not have any additional include paths except for
 -- those required by external libraries. Instead, we should always write the
 -- full relative path, e.g. #include "maths/Vector3d.h". This avoids confusion
 -- ("which file is meant?") and avoids enormous include path lists.
 
 
 -- projects: engine static libs, main exe, atlas, atlas frontends, test.
 
 --------------------------------------------------------------------------------
 -- project helper functions
 --------------------------------------------------------------------------------
 
 function project_set_target(project_name)
 
 	-- Note: On Windows, ".exe" is added on the end, on unices the name is used directly
 
 	local obj_dir_prefix = _OPTIONS["outpath"].."/obj/"..project_name.."_"
 
 	configuration "Debug"
 		objdir(obj_dir_prefix.."Debug")
 		targetsuffix("_dbg")
 
 	configuration "Release"
 		objdir(obj_dir_prefix.."Release")
 
 	configuration { }
 
 end
 
 
 function project_set_build_flags()
 
 	flags { "Symbols", "NoEditAndContinue" }
 	if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
 		-- adds the -Wall compiler flag
 		flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
 	end
 
 	-- disable Windows debug heap, since it makes malloc/free hugely slower when
 	-- running inside a debugger
 	if os.is("windows") then
 		flags { "NoDebugHeap" }
 	end
 
 	configuration "Debug"
 		defines { "DEBUG" }
 
 	configuration "Release"
 		if os.is("windows") or not _OPTIONS["minimal-flags"] then
 			flags { "OptimizeSpeed" }
 		end
 		defines { "NDEBUG", "CONFIG_FINAL=1" }
 
 	configuration { }
 
 	if _OPTIONS["gles"] then
 		defines { "CONFIG2_GLES=1" }
 	end
 
 	if _OPTIONS["without-audio"] then
 		defines { "CONFIG2_AUDIO=0" }
 	end
 
 	if _OPTIONS["without-nvtt"] then
 		defines { "CONFIG2_NVTT=0" }
 	end
 
 	if _OPTIONS["without-lobby"] then
 		defines { "CONFIG2_LOBBY=0" }
 	end
 
 	-- required for the lowlevel library. must be set from all projects that use it, otherwise it assumes it is
 	-- being used as a DLL (which is currently not the case in 0ad)
 	defines { "LIB_STATIC_LINK" }
 
 	-- various platform-specific build flags
 	if os.is("windows") then
 
 		-- use native wchar_t type (not typedef to unsigned short)
 		flags { "NativeWChar" }
 		flags { "EnableSSE2" } -- Enable SSE2 code generation for VS
 
 		-- VC++ 2008 has implied FPO as the default (newer versions default to /Oy-)
 		-- disable it explicitly since it breaks our stack walker in release build
 		if _ACTION == "vs2008" then
 			buildoptions { "/Oy-" }
 		end
 
 	else	-- *nix
 		if _OPTIONS["icc"] and not _OPTIONS["minimal-flags"] then
 			buildoptions {
 				"-w1",
 				-- "-Wabi",
 				-- "-Wp64", -- complains about OBJECT_TO_JSVAL which is annoying
 				"-Wpointer-arith",
 				"-Wreturn-type",
 				-- "-Wshadow",
 				"-Wuninitialized",
 				"-Wunknown-pragmas",
 				"-Wunused-function",
 				"-wd1292" -- avoid lots of 'attribute "__nonnull__" ignored'
 			}
 			configuration "Debug"
 				buildoptions { "-O0" } -- ICC defaults to -O2
 			configuration { }
 			if os.is("macosx") then
 				linkoptions { "-multiply_defined","suppress" }
 			end
 		else
 			-- exclude most non-essential build options for minimal-flags
 			if not _OPTIONS["minimal-flags"] then
 				buildoptions {
 					-- enable most of the standard warnings
 					"-Wno-switch",		-- enumeration value not handled in switch (this is sometimes useful, but results in lots of noise)
 					"-Wno-reorder",		-- order of initialization list in constructors (lots of noise)
 					"-Wno-invalid-offsetof",	-- offsetof on non-POD types (see comment in renderer/PatchRData.cpp)
 
 					"-Wextra",
 					"-Wno-missing-field-initializers",	-- (this is common in external headers we can't fix)
 
 					-- add some other useful warnings that need to be enabled explicitly
 					"-Wunused-parameter",
 					"-Wredundant-decls",	-- (useful for finding some multiply-included header files)
 					-- "-Wformat=2",		-- (useful sometimes, but a bit noisy, so skip it by default)
 					-- "-Wcast-qual",		-- (useful for checking const-correctness, but a bit noisy, so skip it by default)
 					"-Wnon-virtual-dtor",	-- (sometimes noisy but finds real bugs)
 					"-Wundef",				-- (useful for finding macro name typos)
 
 					-- enable security features (stack checking etc) that shouldn't have
 					-- a significant effect on performance and can catch bugs
 					"-fstack-protector-all",
 					"-U_FORTIFY_SOURCE",	-- (avoid redefinition warning if already defined)
 					"-D_FORTIFY_SOURCE=2",
 
 					-- always enable strict aliasing (useful in debug builds because of the warnings)
 					"-fstrict-aliasing",
 
 					-- don't omit frame pointers (for now), because performance will be impacted
 					-- negatively by the way this breaks profilers more than it will be impacted
 					-- positively by the optimisation
 					"-fno-omit-frame-pointer"
 				}
 
 				if not _OPTIONS["without-pch"] then
 					buildoptions {
 						-- do something (?) so that ccache can handle compilation with PCH enabled
 						-- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
 						"-fpch-preprocess"
 					}
 				end
 
 				if arch == "x86" or arch == "amd64" then
 					buildoptions {
 						-- enable SSE intrinsics
 						"-msse"
 					}
 				end
 
 				if os.is("linux") or os.is("bsd") then
 					linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" }
 				end
 
 				if arch == "x86" then
 					buildoptions {
 						-- To support intrinsics like __sync_bool_compare_and_swap on x86
 						-- we need to set -march to something that supports them
 						"-march=i686"
 					}
 				end
 			end
 			
 			if _OPTIONS["with-c++11"] then
 				buildoptions {
 					-- Enable C++11 standard. VS2010 and higher automatically support C++11
 					-- but we have to enable it manually on GNU C++ and Intel C++
 					"-std=c++0x"
 				}
 			end
 
 			if arch == "arm" then
 				-- disable warnings about va_list ABI change and use
 				-- compile-time flags for futher configuration.
 				buildoptions { "-Wno-psabi" }
 				if _OPTIONS["android"] then
 					-- Android uses softfp, so we should too.
 					buildoptions { "-mfloat-abi=softfp" }
 				end
 			end
 
 			if _OPTIONS["coverage"] then
 				buildoptions { "-fprofile-arcs", "-ftest-coverage" }
 				links { "gcov" }
 			end
 
 			-- We don't want to require SSE2 everywhere yet, but OS X headers do
 			-- require it (and Intel Macs always have it) so enable it here
 			if os.is("macosx") then
 				buildoptions { "-msse2" }
 			end
 
 			-- Check if SDK path should be used
 			if _OPTIONS["sysroot"] then
 				buildoptions { "-isysroot " .. _OPTIONS["sysroot"] }
 				linkoptions { "-Wl,-syslibroot," .. _OPTIONS["sysroot"] }
 			end
 
 			-- On OS X, sometimes we need to specify the minimum API version to use
 			if _OPTIONS["macosx-version-min"] then
 				buildoptions { "-mmacosx-version-min=" .. _OPTIONS["macosx-version-min"] }
 				linkoptions { "-mmacosx-version-min=" .. _OPTIONS["macosx-version-min"] }
 			end
 
 			-- Check if we're building a bundle
 			if _OPTIONS["macosx-bundle"] then
 				defines { "BUNDLE_IDENTIFIER=" .. _OPTIONS["macosx-bundle"] }
 			end
 		end
 
 		if not _OPTIONS["minimal-flags"] then
 			buildoptions {
 				-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
 				-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
 				"-fvisibility=hidden"
 			}
 		end
 
 		if _OPTIONS["bindir"] then
 			defines { "INSTALLED_BINDIR=" .. _OPTIONS["bindir"] }
 		end
 		if _OPTIONS["datadir"] then
 			defines { "INSTALLED_DATADIR=" .. _OPTIONS["datadir"] }
 		end
 		if _OPTIONS["libdir"] then
 			defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
 		end
 
 		if os.is("linux") or os.is("bsd") then
 			-- To use our local shared libraries, they need to be found in the
 			-- runtime dynamic linker path. Add their path to -rpath.
 			if _OPTIONS["libdir"] then
 				linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] }
 			else
 				-- On FreeBSD we need to allow use of $ORIGIN
 				if os.is("bsd") then
 					linkoptions { "-Wl,-z,origin" }
 				end
 
 				-- Adding the executable path and taking care of correct escaping
 				if _ACTION == "gmake" then
 					linkoptions { "-Wl,-rpath,'$$ORIGIN'" } 
 				elseif _ACTION == "codeblocks" then
 					linkoptions { "-Wl,-R\\\\$$ORIGIN" }
 				end
 			end
 		end
 
 	end
 end
 
 -- add X11 includes paths after all the others so they don't conflict with
 -- bundled libs
 function project_add_x11_dirs()
 	if not os.is("windows") and not os.is("macosx") then
 		-- X11 includes may be installed in one of a gadzillion of three places
 		-- Famous last words: "You can't include too much! ;-)"
 		includedirs {
 			"/usr/X11R6/include/X11",
 			"/usr/X11R6/include",
 			"/usr/include/X11"
 		}
 		libdirs { "/usr/X11R6/lib" }
 	end
 end
 
 -- create a project and set the attributes that are common to all projects.
 function project_create(project_name, target_type)
 
 	project(project_name)
 	language "C++"
 	kind(target_type)
 
 	project_set_target(project_name)
 	project_set_build_flags()
 end
 
 
 -- OSX creates a .app bundle if the project type of the main application is set to "WindowedApp".
 -- We don't want this because this bundle would be broken (it lacks all the resources and external dependencies, Info.plist etc...)
 -- Windows opens a console in the background if it's set to ConsoleApp, which is not what we want.
 -- I didn't check if this setting matters for linux, but WindowedApp works there.
 function get_main_project_target_type()
 	if _OPTIONS["android"] then
 		return "SharedLib"
 	elseif os.is("macosx") then
 		return "ConsoleApp"
 	else
 		return "WindowedApp"
 	end
 end
 
 
 -- source_root: rel_source_dirs and rel_include_dirs are relative to this directory
 -- rel_source_dirs: A table of subdirectories. All source files in these directories are added.
 -- rel_include_dirs: A table of subdirectories to be included.
 -- extra_params: table including zero or more of the following:
 -- * no_pch: If specified, no precompiled headers are used for this project.
 -- * pch_dir: If specified, this directory will be used for precompiled headers instead of the default
 --   <source_root>/pch/<projectname>/.
 -- * extra_files: table of filenames (relative to source_root) to add to project
 -- * extra_links: table of library names to add to link step
 function project_add_contents(source_root, rel_source_dirs, rel_include_dirs, extra_params)
 
 	for i,v in pairs(rel_source_dirs) do
 		local prefix = source_root..v.."/"
 		files { prefix.."*.cpp", prefix.."*.h", prefix.."*.inl", prefix.."*.js", prefix.."*.asm", prefix.."*.mm" }
 	end
 
 	-- Put the project-specific PCH directory at the start of the
 	-- include path, so '#include "precompiled.h"' will look in
 	-- there first
 	local pch_dir
 	if not extra_params["pch_dir"] then
 		pch_dir = source_root .. "pch/" .. project().name .. "/"
 	else
 		pch_dir = extra_params["pch_dir"]
 	end
 	includedirs { pch_dir }
 
 	-- Precompiled Headers
 	-- rationale: we need one PCH per static lib, since one global header would
 	-- increase dependencies. To that end, we can either include them as
 	-- "projectdir/precompiled.h", or add "source/PCH/projectdir" to the
 	-- include path and put the PCH there. The latter is better because
 	-- many projects contain several dirs and it's unclear where there the
 	-- PCH should be stored. This way is also a bit easier to use in that
 	-- source files always include "precompiled.h".
 	-- Notes:
 	-- * Visual Assist manages to use the project include path and can
 	--   correctly open these files from the IDE.
 	-- * precompiled.cpp (needed to "Create" the PCH) also goes in
 	--   the abovementioned dir.
 	if (not _OPTIONS["without-pch"] and not extra_params["no_pch"]) then
 		pchheader(pch_dir.."precompiled.h")
 		pchsource(pch_dir.."precompiled.cpp")
 		defines { "USING_PCH" }
 		files { pch_dir.."precompiled.h", pch_dir.."precompiled.cpp" }
 	else
 		flags { "NoPCH" }
 	end
 
 	-- next is source root dir, for absolute (nonrelative) includes
 	-- (e.g. "lib/precompiled.h")
 	includedirs { source_root }
 
 	for i,v in pairs(rel_include_dirs) do
 		includedirs { source_root .. v }
 	end
 
 	if extra_params["extra_files"] then
 		for i,v in pairs(extra_params["extra_files"]) do
 			-- .rc files are only needed on Windows
 			if path.getextension(v) ~= ".rc" or os.is("windows") then
 				files { source_root .. v }
 			end
 		end
 	end
 
 	if extra_params["extra_links"] then
 		links { extra_params["extra_links"] }
 	end
 end
 
 
 -- Add command-line options to set up the manifest dependencies for Windows
 -- (See lib/sysdep/os/win/manifest.cpp)
 function project_add_manifest()
 	linkoptions { "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"" }
 	configuration "Debug"
 		linkoptions { "\"/manifestdependency:type='win32' name='Microsoft.VC80.DebugCRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'\"" }
 	configuration "Release"
 		linkoptions { "\"/manifestdependency:type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.4053' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'\"" }
 	configuration { }
 end
 
 --------------------------------------------------------------------------------
 -- engine static libraries
 --------------------------------------------------------------------------------
 
 -- the engine is split up into several static libraries. this eases separate
 -- distribution of those components, reduces dependencies a bit, and can
 -- also speed up builds.
 -- more to the point, it is necessary to efficiently support a separate
 -- test executable that also includes much of the game code.
 
 -- names of all static libs created. automatically added to the
 -- main app project later (see explanation at end of this file)
 static_lib_names = {}
 static_lib_names_debug = {}
 static_lib_names_release = {}
 
 -- set up one of the static libraries into which the main engine code is split.
 -- extra_params:
 --	no_default_link: If specified, linking won't be done by default.
 -- 	For the rest of extra_params, see project_add_contents().
 -- note: rel_source_dirs and rel_include_dirs are relative to global source_root.
 function setup_static_lib_project (project_name, rel_source_dirs, extern_libs, extra_params)
 
 	local target_type = "StaticLib"
 	project_create(project_name, target_type)
 	project_add_contents(source_root, rel_source_dirs, {}, extra_params)
 	project_add_extern_libs(extern_libs, target_type)
 	project_add_x11_dirs()
 
 	if not extra_params["no_default_link"] then
 		table.insert(static_lib_names, project_name)
 	end
 
 	if os.is("windows") then
 		flags { "NoRTTI" }
 	end
 end
 
 function setup_shared_lib_project (project_name, rel_source_dirs, extern_libs, extra_params)
 
 	local target_type = "SharedLib"
 	project_create(project_name, target_type)
 	project_add_contents(source_root, rel_source_dirs, {}, extra_params)
 	project_add_extern_libs(extern_libs, target_type)
 	project_add_x11_dirs()
 
 	if not extra_params["no_default_link"] then
 		table.insert(static_lib_names, project_name)
 	end
 
 	if os.is("windows") then
 		flags { "NoRTTI" }
 		links { "delayimp" }
 	end
 end
 
 
 -- this is where the source tree is chopped up into static libs.
 -- can be changed very easily; just copy+paste a new setup_static_lib_project,
 -- or remove existing ones. static libs are automagically added to
 -- main_exe link step.
 function setup_all_libs ()
 
 	-- relative to global source_root.
 	local source_dirs = {}
 	-- names of external libraries used (see libraries_dir comment)
 	local extern_libs = {}
 
 
 	source_dirs = {
 		"network",
 	}
 	extern_libs = {
 		"spidermonkey",
 		"enet",
 		"boost",	-- dragged in via server->simulation.h->random
 	}
 	setup_static_lib_project("network", source_dirs, extern_libs, {})
 
+
 	if not _OPTIONS["without-lobby"] then
 		source_dirs = {
 			"lobby",
 		}
 
 		extern_libs = {
 			"spidermonkey",
 			"boost",
 			"gloox",
 		}
 		setup_static_lib_project("lobby", source_dirs, extern_libs, {})
-	end
 
-	if _OPTIONS["use-shared-glooxwrapper"] and not _OPTIONS["build-shared-glooxwrapper"] then
-		table.insert(static_lib_names_debug, "glooxwrapper_dbg")
-		table.insert(static_lib_names_release, "glooxwrapper")
-	else
-		source_dirs = {
-			"lobby/glooxwrapper",
-		}
-		extern_libs = {
-			"boost",
-			"gloox",
-		}
-		if _OPTIONS["build-shared-glooxwrapper"] then
-			setup_shared_lib_project("glooxwrapper", source_dirs, extern_libs, {})
+		if _OPTIONS["use-shared-glooxwrapper"] and not _OPTIONS["build-shared-glooxwrapper"] then
+			table.insert(static_lib_names_debug, "glooxwrapper_dbg")
+			table.insert(static_lib_names_release, "glooxwrapper")
 		else
-			setup_static_lib_project("glooxwrapper", source_dirs, extern_libs, {})
+			source_dirs = {
+				"lobby/glooxwrapper",
+			}
+			extern_libs = {
+				"boost",
+				"gloox",
+			}
+			if _OPTIONS["build-shared-glooxwrapper"] then
+				setup_shared_lib_project("glooxwrapper", source_dirs, extern_libs, {})
+			else
+				setup_static_lib_project("glooxwrapper", source_dirs, extern_libs, {})
+			end
 		end
+	else
+		setup_static_lib_project("lobby", {}, {}, {})
+		files { source_root.."lobby/Globals.cpp" }
 	end
 
+
 	source_dirs = {
 		"simulation2",
 		"simulation2/components",
 		"simulation2/helpers",
 		"simulation2/scripting",
 		"simulation2/serialization",
 		"simulation2/system",
 		"simulation2/testcomponents",
 	}
 	extern_libs = {
 		"boost",
 		"opengl",
 		"spidermonkey",
 	}
 	setup_static_lib_project("simulation2", source_dirs, extern_libs, {})
 
 
 	source_dirs = {
 		"scriptinterface",
 	}
 	extern_libs = {
 		"boost",
 		"spidermonkey",
 		"valgrind",
 		"sdl",
 	}
 	setup_static_lib_project("scriptinterface", source_dirs, extern_libs, {})
 
 
 	source_dirs = {
 		"ps",
 		"ps/scripting",
 		"ps/Network",
 		"ps/GameSetup",
 		"ps/XML",
 		"soundmanager",
 		"soundmanager/data",
 		"soundmanager/items",
 		"soundmanager/scripting",
 		"scripting",
 		"maths",
 		"maths/scripting",
 	}
 	extern_libs = {
 		"spidermonkey",
 		"sdl",	-- key definitions
 		"libxml2",
 		"opengl",
 		"zlib",
 		"boost",
 		"enet",
 		"libcurl",
 	}
 	
 	if not _OPTIONS["without-audio"] then
 		table.insert(extern_libs, "openal")
 		table.insert(extern_libs, "vorbis")
 	end
 	
 	setup_static_lib_project("engine", source_dirs, extern_libs, {})
 
 
 	source_dirs = {
 		"graphics",
 		"graphics/scripting",
 		"renderer",
 		"renderer/scripting",
 		"third_party/mikktspace"
 	}
 	extern_libs = {
 		"opengl",
 		"sdl",	-- key definitions
 		"spidermonkey",	-- for graphics/scripting
 		"boost"
 	}
 	if not _OPTIONS["without-nvtt"] then
 		table.insert(extern_libs, "nvtt")
 	end
 	setup_static_lib_project("graphics", source_dirs, extern_libs, {})
 
+
 	source_dirs = {
 		"tools/atlas/GameInterface",
 		"tools/atlas/GameInterface/Handlers"
 	}
 	extern_libs = {
 		"boost",
 		"sdl",	-- key definitions
 		"opengl",
 		"spidermonkey"
 	}
 	setup_static_lib_project("atlas", source_dirs, extern_libs, {})
 
 
 	source_dirs = {
 		"gui",
 		"gui/scripting"
 	}
 	extern_libs = {
 		"spidermonkey",
 		"sdl",	-- key definitions
 		"opengl",
 		"boost",
 	}
 	setup_static_lib_project("gui", source_dirs, extern_libs, {})
 
 
 	source_dirs = {
 		"lib",
 		"lib/adts",
 		"lib/allocators",
 		"lib/external_libraries",
 		"lib/file",
 		"lib/file/archive",
 		"lib/file/common",
 		"lib/file/io",
 		"lib/file/vfs",
 		"lib/pch",
 		"lib/posix",
 		"lib/res",
 		"lib/res/graphics",
 		"lib/sysdep",
 		"lib/tex"
 	}
 	extern_libs = {
 		"boost",
 		"sdl",
 		"opengl",
 		"libpng",
 		"zlib",
 		"libjpg",
 		"valgrind",
 		"cxxtest",
 	}
 
 	-- CPU architecture-specific
 	if arch == "amd64" then
 		table.insert(source_dirs, "lib/sysdep/arch/amd64");
 		table.insert(source_dirs, "lib/sysdep/arch/x86_x64");
 	elseif arch == "x86" then
 		table.insert(source_dirs, "lib/sysdep/arch/ia32");
 		table.insert(source_dirs, "lib/sysdep/arch/x86_x64");
 	elseif arch == "arm" then
 		table.insert(source_dirs, "lib/sysdep/arch/arm");
 	end
 
 	-- OS-specific
 	sysdep_dirs = {
 		linux = { "lib/sysdep/os/linux", "lib/sysdep/os/unix" },
 		-- note: RC file must be added to main_exe project.
 		-- note: don't add "lib/sysdep/os/win/aken.cpp" because that must be compiled with the DDK.
 		windows = { "lib/sysdep/os/win", "lib/sysdep/os/win/wposix", "lib/sysdep/os/win/whrt" },
 		macosx = { "lib/sysdep/os/osx", "lib/sysdep/os/unix" },
 		bsd = { "lib/sysdep/os/bsd", "lib/sysdep/os/unix", "lib/sysdep/os/unix/x" },
 	}
 	for i,v in pairs(sysdep_dirs[os.get()]) do
 		table.insert(source_dirs, v);
 	end
 	
 	if os.is("linux") then
 		if _OPTIONS["android"] then
 			table.insert(source_dirs, "lib/sysdep/os/android")
 		else
 			table.insert(source_dirs, "lib/sysdep/os/unix/x")
 		end
 	end
 
 	-- runtime-library-specific
 	if _ACTION == "vs2005" or _ACTION == "vs2008" or _ACTION == "vs2010" or _ACTION == "vs2012" or _ACTION == "vs2013" then
 		table.insert(source_dirs, "lib/sysdep/rtl/msc");
 	else
 		table.insert(source_dirs, "lib/sysdep/rtl/gcc");
 	end
 
 	setup_static_lib_project("lowlevel", source_dirs, extern_libs, {})
 
 
 	-- Third-party libraries that are built as part of the main project,
 	-- not built externally and then linked
 	source_dirs = {
 		"third_party/mongoose",
 	}
 	extern_libs = {
 	}
 	setup_static_lib_project("mongoose", source_dirs, extern_libs, { no_pch = 1 })
 
 
 	-- CxxTest mock function support
 	extern_libs = {
 		"boost",
 		"cxxtest",
 	}
 
 	-- 'real' implementations, to be linked against the main executable
 	-- (files are added manually and not with setup_static_lib_project
 	-- because not all files in the directory are included)
 	setup_static_lib_project("mocks_real", {}, extern_libs, { no_default_link = 1, no_pch = 1 })
 	files { "mocks/*.h", source_root.."mocks/*_real.cpp" }
 	-- 'test' implementations, to be linked against the test executable
 	setup_static_lib_project("mocks_test", {}, extern_libs, { no_default_link = 1, no_pch = 1 })
 	files { source_root.."mocks/*.h", source_root.."mocks/*_test.cpp" }
 end
 
 --------------------------------------------------------------------------------
 -- main EXE
 --------------------------------------------------------------------------------
 
 -- used for main EXE as well as test
 used_extern_libs = {
 	"opengl",
 	"sdl",
 
 	"libjpg",
 	"libpng",
 	"zlib",
 
 	"spidermonkey",
 	"libxml2",
 
 	"boost",
 	"cxxtest",
 	"comsuppw",
 	"enet",
 	"libcurl",
 
 	"valgrind",
 }
 
 if not os.is("windows") and not _OPTIONS["android"] and not os.is("macosx") then
 	-- X11 should only be linked on *nix
 	table.insert(used_extern_libs, "x11")
 	table.insert(used_extern_libs, "xcursor")
 end
 
 if not _OPTIONS["without-audio"] then
 	table.insert(used_extern_libs, "openal")
 	table.insert(used_extern_libs, "vorbis")
 end
 
 if not _OPTIONS["without-nvtt"] then
 	table.insert(used_extern_libs, "nvtt")
 end
 
 if not _OPTIONS["without-lobby"] then
 	table.insert(used_extern_libs, "gloox")
 end
 
 -- Bundles static libs together with main.cpp and builds game executable.
 function setup_main_exe ()
 
 	local target_type = get_main_project_target_type()
 	project_create("pyrogenesis", target_type)
 
 	links { "mocks_real" }
 
 	local extra_params = {
 		extra_files = { "main.cpp" },
 		no_pch = 1
 	}
 	project_add_contents(source_root, {}, {}, extra_params)
 	project_add_extern_libs(used_extern_libs, target_type)
 	project_add_x11_dirs()
 
 	-- Platform Specifics
 	if os.is("windows") then
 
 		files { source_root.."lib/sysdep/os/win/icon.rc" }
 		-- from "lowlevel" static lib; must be added here to be linked in
 		files { source_root.."lib/sysdep/os/win/error_dialog.rc" }
 
 		flags { "NoRTTI" }
 
 		linkoptions {
 			-- wraps main thread in a __try block(see wseh.cpp). replace with mainCRTStartup if that's undesired.
 			"/ENTRY:wseh_EntryPoint",
 
 			-- see wstartup.h
 			"/INCLUDE:_wstartup_InitAndRegisterShutdown",
 
 			-- allow manual unload of delay-loaded DLLs
 			"/DELAY:UNLOAD",
 		}
 
 		-- see manifest.cpp
 		project_add_manifest()
 
 	elseif os.is("linux") or os.is("bsd") then
 
 		if not _OPTIONS["android"] and not (os.getversion().description == "OpenBSD") then
 			links { "rt" }
 		end
 
 		if _OPTIONS["android"] then
 			-- NDK's STANDALONE-TOOLCHAIN.html says this is required
 			linkoptions { "-Wl,--fix-cortex-a8" }
 
 			links { "log" }
 		end
 
 		if os.is("linux") or os.getversion().description == "GNU/kFreeBSD" then
 			links {
 				-- Dynamic libraries (needed for linking for gold)
 				"dl",
 			}
 		elseif os.is("bsd") then
 			links {
 				-- Needed for backtrace* on BSDs
 				"execinfo",
 			}
 		end
 
 		-- Threading support
 		buildoptions { "-pthread" }
 		if not _OPTIONS["android"] then
 			linkoptions { "-pthread" }
 		end
 
 		-- For debug_resolve_symbol
 		configuration "Debug"
 			linkoptions { "-rdynamic" }
 		configuration { }
 
 	elseif os.is("macosx") then
 
 		links { "pthread" }
 		linkoptions { "-framework ApplicationServices", "-framework Cocoa", "-framework CoreFoundation" }
 
 	end
 end
 
 
 --------------------------------------------------------------------------------
 -- atlas
 --------------------------------------------------------------------------------
 
 -- setup a typical Atlas component project
 -- extra_params, rel_source_dirs and rel_include_dirs: as in project_add_contents;
 function setup_atlas_project(project_name, target_type, rel_source_dirs, rel_include_dirs, extern_libs, extra_params)
 
 	local source_root = rootdir.."/source/tools/atlas/" .. project_name .. "/"
 	project_create(project_name, target_type)
 
 	-- if not specified, the default for atlas pch files is in the project root.
 	if not extra_params["pch_dir"] then
 		extra_params["pch_dir"] = source_root
 	end
 
 	project_add_contents(source_root, rel_source_dirs, rel_include_dirs, extra_params)
 	project_add_extern_libs(extern_libs, target_type)
 	project_add_x11_dirs()
 
 	-- Platform Specifics
 	if os.is("windows") then
 		defines { "_UNICODE" }
 		-- Link to required libraries
 		links { "winmm", "comctl32", "rpcrt4", "delayimp", "ws2_32" }
 		-- required to use WinMain() on Windows, otherwise will default to main()
 		flags { "WinMain" }
 
 	elseif os.is("linux") or os.is("bsd") then
 		buildoptions { "-rdynamic", "-fPIC" }
 		linkoptions { "-fPIC", "-rdynamic" }
 
 	elseif os.is("macosx") then
 		-- install_name settings aren't really supported yet by premake, but there are plans for the future.
 		-- we currently use this hack to work around some bugs with wrong install_names.
 		if target_type == "SharedLib" then
 			if _OPTIONS["macosx-bundle"] then
 				-- If we're building a bundle, it will be in ../Frameworks
 				linkoptions { "-install_name @executable_path/../Frameworks/lib"..project_name..".dylib" }
 			else
 				linkoptions { "-install_name @executable_path/lib"..project_name..".dylib" }
 			end
 		end
 	end
 
 end
 
 
 -- build all Atlas component projects
 function setup_atlas_projects()
 
 	setup_atlas_project("AtlasObject", "StaticLib",
 	{	-- src
 		"."
 	},{	-- include
 	},{	-- extern_libs
 		"boost",
 		"libxml2",
 		"spidermonkey",
 		"wxwidgets"
 	},{	-- extra_params
 		no_pch = 1
 	})
 
 	setup_atlas_project("AtlasScript", "StaticLib",
 	{	-- src
 		"."
 	},{	-- include
 		".."
 	},{	-- extern_libs
 		"boost",
 		"spidermonkey",
 		"valgrind",
 		"wxwidgets",
 	},{	-- extra_params
 		no_pch = 1
 	})
 
 	atlas_src = {
 		"ActorEditor",
 		"CustomControls/Buttons",
 		"CustomControls/Canvas",
 		"CustomControls/ColourDialog",
 		"CustomControls/DraggableListCtrl",
 		"CustomControls/EditableListCtrl",
 		"CustomControls/FileHistory",
 		"CustomControls/HighResTimer",
 		"CustomControls/MapDialog",
 		"CustomControls/SnapSplitterWindow",
 		"CustomControls/VirtualDirTreeCtrl",
 		"CustomControls/Windows",
 		"ErrorReporter",
 		"General",
 		"General/VideoRecorder",
 		"Misc",
 		"ScenarioEditor",
 		"ScenarioEditor/Sections/Common",
 		"ScenarioEditor/Sections/Cinematic",
 		"ScenarioEditor/Sections/Environment",
 		"ScenarioEditor/Sections/Map",
 		"ScenarioEditor/Sections/Object",
 		"ScenarioEditor/Sections/Player",
 		"ScenarioEditor/Sections/Terrain",
 		"ScenarioEditor/Sections/Trigger",
 		"ScenarioEditor/Tools",
 		"ScenarioEditor/Tools/Common",
 	}
 	atlas_extra_links = {
 		"AtlasObject",
 		"AtlasScript",
 	}
 
 	atlas_extern_libs = {
 		"boost",
 		"boost_signals",
 		"comsuppw",
 		--"ffmpeg", -- disabled for now because it causes too many build difficulties
 		"libxml2",
 		"sdl",	-- key definitions
 		"spidermonkey",
 		"wxwidgets",
 		"zlib",
 	}
 	if not os.is("windows") and not os.is("macosx") then
 		-- X11 should only be linked on *nix
 		table.insert(atlas_extern_libs, "x11")
 	end
 
 	setup_atlas_project("AtlasUI", "SharedLib", atlas_src,
 	{	-- include
 		"..",
 		"CustomControls",
 		"Misc"
 	},
 	atlas_extern_libs,
 	{	-- extra_params
 		pch_dir = rootdir.."/source/tools/atlas/AtlasUI/Misc/",
 		no_pch = (has_broken_pch),
 		extra_links = atlas_extra_links,
 		extra_files = { "Misc/atlas.rc" }
 	})
 end
 
 
 -- Atlas 'frontend' tool-launching projects
 function setup_atlas_frontend_project (project_name)
 
 	local target_type = get_main_project_target_type()
 	project_create(project_name, target_type)
 	project_add_extern_libs({
 		"spidermonkey",
 	},
 	target_type)
 	project_add_x11_dirs()
 
 	local source_root = rootdir.."/source/tools/atlas/AtlasFrontends/"
 	files { source_root..project_name..".cpp" }
 
 	if os.is("windows") then
 		files { source_root..project_name..".rc" }
 	end
 
 	includedirs { source_root .. ".." }
 
 	-- Platform Specifics
 	if os.is("windows") then
 		defines { "_UNICODE" }
 
 		-- required to use WinMain() on Windows, otherwise will default to main()
 		flags { "WinMain" }
 		
 		-- see manifest.cpp
 		project_add_manifest()
 
 	else -- Non-Windows, = Unix
 		links { "AtlasObject" }
 	end
 
 	links { "AtlasUI" }
 
 end
 
 function setup_atlas_frontends()
 	setup_atlas_frontend_project("ActorEditor")
 end
 
 
 --------------------------------------------------------------------------------
 -- collada
 --------------------------------------------------------------------------------
 
 function setup_collada_project(project_name, target_type, rel_source_dirs, rel_include_dirs, extern_libs, extra_params)
 
 	project_create(project_name, target_type)
 	local source_root = source_root.."collada/"
 	extra_params["pch_dir"] = source_root
 	project_add_contents(source_root, rel_source_dirs, rel_include_dirs, extra_params)
 	project_add_extern_libs(extern_libs, target_type)
 	project_add_x11_dirs()
 
 	-- Platform Specifics
 	if os.is("windows") then
 		-- required to use WinMain() on Windows, otherwise will default to main()
 		flags { "WinMain" }
 
 	elseif os.is("linux") then
 		defines { "LINUX" }
 
 		links {
 			"dl",
 		}
 
 		-- FCollada is not aliasing-safe, so disallow dangerous optimisations
 		-- (TODO: It'd be nice to fix FCollada, but that looks hard)
 		buildoptions { "-fno-strict-aliasing" }
 
 		buildoptions { "-rdynamic" }
 		linkoptions { "-rdynamic" }
 
 	elseif os.is("bsd") then
 		if os.getversion().description == "OpenBSD" then
 			links { "c", }
 		end
 
 		if os.getversion().description == "GNU/kFreeBSD" then
 			links {
 				"dl",
 			}
 		end
 
 		buildoptions { "-fno-strict-aliasing" }
 
 		buildoptions { "-rdynamic" }
 		linkoptions { "-rdynamic" }
 
 	elseif os.is("macosx") then
 		-- define MACOS-something?
 
 		-- install_name settings aren't really supported yet by premake, but there are plans for the future.
 		-- we currently use this hack to work around some bugs with wrong install_names.
 		if target_type == "SharedLib" then
 			if _OPTIONS["macosx-bundle"] then
 				-- If we're building a bundle, it will be in ../Frameworks
 				linkoptions { "-install_name @executable_path/../Frameworks/lib"..project_name..".dylib" }
 			else
 				linkoptions { "-install_name @executable_path/lib"..project_name..".dylib" }
 			end
 		end
 
 		buildoptions { "-fno-strict-aliasing" }
 		-- On OSX, fcollada uses a few utility functions from coreservices
 		linkoptions { "-framework CoreServices" }
 	end
 
 end
 
 -- build all Collada component projects
 function setup_collada_projects()
 
 	setup_collada_project("Collada", "SharedLib",
 	{	-- src
 		"."
 	},{	-- include
 	},{	-- extern_libs
 		"fcollada",
 		"libxml2"
 	},{	-- extra_params
 	})
 
 end
 
 
 --------------------------------------------------------------------------------
 -- tests
 --------------------------------------------------------------------------------
 
 -- Cxxtestgen needs to create .cpp files from the .h files before they can be compiled.
 -- By default we are using prebuildcommands, but we are also using customizations of premake
 -- for makefiles. The reason is that premake currently has a bug with makefiles and parallel
 -- builds (e.g. -j5). It's not guaranteed that prebuildcommands always run before building.
 -- All the *.cpp and *.h files need to be added to files no matter if prebuildcommands
 -- or customizations are used.
 -- If no customizations are implemented for a specific action (e.g. vs2010), passing the
 -- parameters won't have any effects.
 function configure_cxxtestgen()
 
 	local lcxxtestrootfile = source_root.."test_root.cpp"
 	files { lcxxtestrootfile }
 
 	-- Define the options used for cxxtestgen
 	local lcxxtestoptions = "--have-std"
 	local lcxxtestrootoptions = "--have-std"
 	if os.is("windows") then
 		lcxxtestrootoptions = lcxxtestrootoptions .. " --gui=PsTestWrapper --runner=Win32ODSPrinter"
 	else
 		lcxxtestrootoptions = lcxxtestrootoptions .. " --gui=PsTestWrapper --runner=ErrorPrinter"
 	end
 
 	-- Precompiled headers - the header is added to all generated .cpp files
 	-- note that the header isn't actually precompiled here, only #included
 	-- so that the build stage can use it as a precompiled header.
 	local include = " --include=precompiled.h"
 	lcxxtestrootoptions = lcxxtestrootoptions .. include
 	lcxxtestoptions = lcxxtestoptions .. include
 
 	-- Set all the parameters used in our cxxtestgen customization in premake.
 	cxxtestrootfile(lcxxtestrootfile)
 	cxxtestpath(lcxxtestpath)
 	cxxtestrootoptions(lcxxtestrootoptions)
 	cxxtestoptions(lcxxtestoptions)
 
 	-- The file paths needs to be made relative to the project directory for the prebuildcommands.
 	-- premake's paths are relative to premake4.lua by default.
 	lcxxtestrootfile = path.rebase(lcxxtestrootfile, path.getabsolute("."), _OPTIONS["outpath"])
 	lcxxtestpath = path.rebase(lcxxtestpath, path.getabsolute("."), _OPTIONS["outpath"])
 
 	-- On windows we have to use backlashes in our paths. We don't have to take care
 	-- of that for the parameters passed to our cxxtestgen customizations.
 	if os.is("windows") then
 		lcxxtestrootfile = path.translate(lcxxtestrootfile, "\\")
 		lcxxtestpath = path.translate(lcxxtestpath, "\\")
 	end
 
 	if _ACTION ~= "gmake" and _ACTION ~= "vs2010" and _ACTION ~= "vs2012" and _ACTION ~= "vs2013" then
 		prebuildcommands { lcxxtestpath.." --root "..lcxxtestrootoptions.." -o "..lcxxtestrootfile }
 	end
 
 	-- Find header files in 'test' subdirectories
 	local all_files = os.matchfiles(source_root .. "**/tests/*.h")
 	for i,v in pairs(all_files) do
 		-- Don't include sysdep tests on the wrong sys
 		-- Don't include Atlas tests unless Atlas is being built
 		if not (string.find(v, "/sysdep/os/win/") and not os.is("windows")) and
 		   not (string.find(v, "/tools/atlas/") and not _OPTIONS["atlas"]) and
 		   not (string.find(v, "/sysdep/arch/x86_x64/") and ((arch ~= "amd64") or (arch ~= "x86")))
 		then
 			local src_file = string.sub(v, 1, -3) .. ".cpp"
 			cxxtestsrcfiles { src_file }
 			files { src_file }
 			cxxtesthdrfiles { v }
 
 			if _ACTION ~= "gmake" and _ACTION ~= "vs2010" and _ACTION ~= "vs2012" and _ACTION ~= "vs2013" then
 				-- see detailed comment above.
 				src_file = path.rebase(src_file, path.getabsolute("."), _OPTIONS["outpath"])
 				v = path.rebase(v, path.getabsolute("."), _OPTIONS["outpath"])
 
 				if os.is("windows") then
 					src_file = path.translate(src_file, "\\")
 					v = path.translate(v, "\\")
 				end
 				prebuildcommands { lcxxtestpath.." --part "..lcxxtestoptions.." -o "..src_file.." "..v }
 			end
 		end
 
 
 	end
 end
 
 
 function setup_tests()
 
 	local target_type = get_main_project_target_type()
 	project_create("test", target_type)
 
 	configure_cxxtestgen()
 
 	links { static_lib_names }
 	configuration "Debug"
 		links { static_lib_names_debug }
 	configuration "Release"
 		links { static_lib_names_release }
 	configuration { }
 
 	links { "mocks_test" }
 	if _OPTIONS["atlas"] then
 		links { "AtlasObject" }
 		project_add_extern_libs({"wxwidgets"}, target_type)
 	end
 	extra_params = {
 		extra_files = { "test_setup.cpp" },
 	}
 
 	project_add_contents(source_root, {}, {}, extra_params)
 	project_add_extern_libs(used_extern_libs, target_type)
 	project_add_x11_dirs()
 
 	-- TODO: should fix the duplication between this OS-specific linking
 	-- code, and the similar version in setup_main_exe
 
 	if os.is("windows") then
 		-- from "lowlevel" static lib; must be added here to be linked in
 		files { source_root.."lib/sysdep/os/win/error_dialog.rc" }
 
 		flags { "NoRTTI" }
 
 		-- see wstartup.h
 		linkoptions { "/INCLUDE:_wstartup_InitAndRegisterShutdown" }
 		-- Enables console for the TEST project on Windows
 		linkoptions { "/SUBSYSTEM:CONSOLE" }
 
 		project_add_manifest()
 
 	elseif os.is("linux") or os.is("bsd") then
 
 		if not _OPTIONS["android"] and not (os.getversion().description == "OpenBSD") then
 			links { "rt" }
 		end
 
 		if _OPTIONS["android"] then
 			-- NDK's STANDALONE-TOOLCHAIN.html says this is required
 			linkoptions { "-Wl,--fix-cortex-a8" }
 		end
 
 		if os.is("linux") or os.getversion().description == "GNU/kFreeBSD" then
 			links {
 				-- Dynamic libraries (needed for linking for gold)
 				"dl",
 			}
 		elseif os.is("bsd") then
 			links {
 				-- Needed for backtrace* on BSDs
 				"execinfo",
 			}
 		end
 
 		-- Threading support
 		buildoptions { "-pthread" }
 		if not _OPTIONS["android"] then
 			linkoptions { "-pthread" }
 		end
 
 		-- For debug_resolve_symbol
 		configuration "Debug"
 			linkoptions { "-rdynamic" }
 		configuration { }
 
 		includedirs { source_root .. "pch/test/" }
 	end
 end
 
 -- must come first, so that VC sets it as the default project and therefore
 -- allows running via F5 without the "where is the EXE" dialog.
 setup_main_exe()
 
 setup_all_libs()
 
 -- add the static libs to the main EXE project. only now (after
 -- setup_all_libs has run) are the lib names known. cannot move
 -- setup_main_exe to run after setup_all_libs (see comment above).
 -- we also don't want to hardcode the names - that would require more
 -- work when changing the static lib breakdown.
 project("pyrogenesis") -- Set the main project active
 	links { static_lib_names }
 	configuration "Debug"
 		links { static_lib_names_debug }
 	configuration "Release"
 		links { static_lib_names_release }
 	configuration { }
 
 if _OPTIONS["atlas"] then
 	setup_atlas_projects()
 	setup_atlas_frontends()
 end
 
 if _OPTIONS["collada"] then
 	setup_collada_projects()
 end
 
 if not _OPTIONS["without-tests"] then
 	setup_tests()
 end
Index: ps/trunk/source/gui/scripting/ScriptFunctions.cpp
===================================================================
--- ps/trunk/source/gui/scripting/ScriptFunctions.cpp	(revision 14112)
+++ ps/trunk/source/gui/scripting/ScriptFunctions.cpp	(revision 14113)
@@ -1,997 +1,997 @@
 /* Copyright (C) 2013 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "scriptinterface/ScriptInterface.h"
 
 #include "graphics/Camera.h"
 #include "graphics/GameView.h"
 #include "graphics/MapReader.h"
 #include "gui/GUIManager.h"
 #include "graphics/scripting/JSInterface_GameView.h"
 #include "lib/timer.h"
 #include "lib/utf8.h"
 #include "lib/sysdep/sysdep.h"
+#include "lobby/IXmppClient.h"
+#include "lobby/sha.h"
 #include "maths/FixedVector3D.h"
 #include "network/NetClient.h"
 #include "network/NetServer.h"
 #include "network/NetTurnManager.h"
 #include "ps/CLogger.h"
 #include "ps/CConsole.h"
 #include "ps/Errors.h"
 #include "ps/Game.h"
 #include "ps/GUID.h"
 #include "ps/World.h"
 #include "ps/Hotkey.h"
 #include "ps/Overlay.h"
 #include "ps/ProfileViewer.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/SavedGame.h"
 #include "ps/scripting/JSInterface_ConfigDB.h"
 #include "ps/scripting/JSInterface_Console.h"
 #include "ps/UserReport.h"
 #include "ps/GameSetup/Atlas.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/ConfigDB.h"
 #include "renderer/scripting/JSInterface_Renderer.h"
 #include "tools/atlas/GameInterface/GameLoop.h"
-#include "lobby/IXmppClient.h"
-#include "lobby/sha.h"
 
 #include "simulation2/Simulation2.h"
 #include "simulation2/components/ICmpAIManager.h"
 #include "simulation2/components/ICmpCommandQueue.h"
 #include "simulation2/components/ICmpGuiInterface.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpTemplateManager.h"
 #include "simulation2/components/ICmpSelectable.h"
 #include "simulation2/helpers/Selection.h"
 
 #include "js/jsapi.h"
 /*
  * This file defines a set of functions that are available to GUI scripts, to allow
  * interaction with the rest of the engine.
  * Functions are exposed to scripts within the global object 'Engine', so
  * scripts should call "Engine.FunctionName(...)" etc.
  */
 
 extern void restart_mainloop_in_atlas(); // from main.cpp
 
 namespace {
 
 CScriptVal GetActiveGui(void* UNUSED(cbdata))
 {
 	return OBJECT_TO_JSVAL(g_GUI->GetScriptObject());
 }
 
 void PushGuiPage(void* UNUSED(cbdata), std::wstring name, CScriptVal initData)
 {
 	g_GUI->PushPage(name, initData);
 }
 
 void SwitchGuiPage(void* UNUSED(cbdata), std::wstring name, CScriptVal initData)
 {
 	g_GUI->SwitchPage(name, initData);
 }
 
 void PopGuiPage(void* UNUSED(cbdata))
 {
 	g_GUI->PopPage();
 }
 
 CScriptVal GuiInterfaceCall(void* cbdata, std::wstring name, CScriptVal data)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	if (!g_Game)
 		return JSVAL_VOID;
 	CSimulation2* sim = g_Game->GetSimulation2();
 	ENSURE(sim);
 
 	CmpPtr<ICmpGuiInterface> cmpGuiInterface(*sim, SYSTEM_ENTITY);
 	if (!cmpGuiInterface)
 		return JSVAL_VOID;
 
 	int player = -1;
 	if (g_Game)
 		player = g_Game->GetPlayerID();
 
 	CScriptValRooted arg (sim->GetScriptInterface().GetContext(), sim->GetScriptInterface().CloneValueFromOtherContext(guiManager->GetScriptInterface(), data.get()));
 	CScriptVal ret (cmpGuiInterface->ScriptCall(player, name, arg.get()));
 	return guiManager->GetScriptInterface().CloneValueFromOtherContext(sim->GetScriptInterface(), ret.get());
 }
 
 void PostNetworkCommand(void* cbdata, CScriptVal cmd)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	if (!g_Game)
 		return;
 	CSimulation2* sim = g_Game->GetSimulation2();
 	ENSURE(sim);
 
 	CmpPtr<ICmpCommandQueue> cmpCommandQueue(*sim, SYSTEM_ENTITY);
 	if (!cmpCommandQueue)
 		return;
 
 	jsval cmd2 = sim->GetScriptInterface().CloneValueFromOtherContext(guiManager->GetScriptInterface(), cmd.get());
 
 	cmpCommandQueue->PostNetworkCommand(cmd2);
 }
 
 std::vector<entity_id_t> PickEntitiesAtPoint(void* UNUSED(cbdata), int x, int y)
 {
 	return EntitySelection::PickEntitiesAtPoint(*g_Game->GetSimulation2(), *g_Game->GetView()->GetCamera(), x, y, g_Game->GetPlayerID(), false);
 }
 
 std::vector<entity_id_t> PickFriendlyEntitiesInRect(void* UNUSED(cbdata), int x0, int y0, int x1, int y1, int player)
 {
 	return EntitySelection::PickEntitiesInRect(*g_Game->GetSimulation2(), *g_Game->GetView()->GetCamera(), x0, y0, x1, y1, player, false);
 }
 
 std::vector<entity_id_t> PickFriendlyEntitiesOnScreen(void* cbdata, int player)
 {
 	return PickFriendlyEntitiesInRect(cbdata, 0, 0, g_xres, g_yres, player);
 }
 
 std::vector<entity_id_t> PickSimilarFriendlyEntities(void* UNUSED(cbdata), std::string templateName, bool includeOffScreen, bool matchRank, bool allowFoundations)
 {
 	return EntitySelection::PickSimilarEntities(*g_Game->GetSimulation2(), *g_Game->GetView()->GetCamera(), templateName, g_Game->GetPlayerID(), includeOffScreen, matchRank, false, allowFoundations);
 }
 
 CFixedVector3D GetTerrainAtScreenPoint(void* UNUSED(cbdata), int x, int y)
 {
 	CVector3D pos = g_Game->GetView()->GetCamera()->GetWorldCoordinates(x, y, true);
 	return CFixedVector3D(fixed::FromFloat(pos.X), fixed::FromFloat(pos.Y), fixed::FromFloat(pos.Z));
 }
 
 std::wstring SetCursor(void* UNUSED(cbdata), std::wstring name)
 {
 	std::wstring old = g_CursorName;
 	g_CursorName = name;
 	return old;
 }
 
 int GetPlayerID(void* UNUSED(cbdata))
 {
 	if (g_Game)
 		return g_Game->GetPlayerID();
 	return -1;
 }
 
 void SetPlayerID(void* UNUSED(cbdata), int id)
 {
 	if (g_Game)
 		g_Game->SetPlayerID(id);
 }
 
 void StartNetworkGame(void* UNUSED(cbdata))
 {
 	ENSURE(g_NetServer);
 	g_NetServer->StartGame();
 }
 
 void StartGame(void* cbdata, CScriptVal attribs, int playerID)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	ENSURE(!g_NetServer);
 	ENSURE(!g_NetClient);
 
 	ENSURE(!g_Game);
 	g_Game = new CGame();
 
 	// Convert from GUI script context to sim script context
 	CSimulation2* sim = g_Game->GetSimulation2();
 	CScriptValRooted gameAttribs (sim->GetScriptInterface().GetContext(),
 			sim->GetScriptInterface().CloneValueFromOtherContext(guiManager->GetScriptInterface(), attribs.get()));
 
 	g_Game->SetPlayerID(playerID);
 	g_Game->StartGame(gameAttribs, "");
 }
 
 CScriptVal StartSavedGame(void* cbdata, std::wstring name)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	ENSURE(!g_NetServer);
 	ENSURE(!g_NetClient);
 
 	ENSURE(!g_Game);
 
 	// Load the saved game data from disk
 	CScriptValRooted metadata;
 	std::string savedState;
 	Status err = SavedGames::Load(name, guiManager->GetScriptInterface(), metadata, savedState);
 	if (err < 0)
 		return CScriptVal();
 
 	g_Game = new CGame();
 
 	// Convert from GUI script context to sim script context
 	CSimulation2* sim = g_Game->GetSimulation2();
 	CScriptValRooted gameMetadata (sim->GetScriptInterface().GetContext(),
 		sim->GetScriptInterface().CloneValueFromOtherContext(guiManager->GetScriptInterface(), metadata.get()));
 
 	CScriptValRooted gameInitAttributes;
 	sim->GetScriptInterface().GetProperty(gameMetadata.get(), "initAttributes", gameInitAttributes);
 
 	int playerID;
 	sim->GetScriptInterface().GetProperty(gameMetadata.get(), "player", playerID);
 
 	// Start the game
 	g_Game->SetPlayerID(playerID);
 	g_Game->StartGame(gameInitAttributes, savedState);
 
 	return metadata.get();
 }
 
 void SaveGame(void* cbdata, std::wstring filename, std::wstring description)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	if (SavedGames::Save(filename, description, *g_Game->GetSimulation2(), guiManager, g_Game->GetPlayerID()) < 0)
 		LOGERROR(L"Failed to save game");
 }
 
 void SaveGamePrefix(void* cbdata, std::wstring prefix, std::wstring description)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	if (SavedGames::SavePrefix(prefix, description, *g_Game->GetSimulation2(), guiManager, g_Game->GetPlayerID()) < 0)
 		LOGERROR(L"Failed to save game");
 }
 
 void SetNetworkGameAttributes(void* cbdata, CScriptVal attribs)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	ENSURE(g_NetServer);
 
 	g_NetServer->UpdateGameAttributes(attribs, guiManager->GetScriptInterface());
 }
 
 void StartNetworkHost(void* cbdata, std::wstring playerName)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	ENSURE(!g_NetClient);
 	ENSURE(!g_NetServer);
 	ENSURE(!g_Game);
 
 	g_NetServer = new CNetServer();
 	if (!g_NetServer->SetupConnection())
 	{
 		guiManager->GetScriptInterface().ReportError("Failed to start server");
 		SAFE_DELETE(g_NetServer);
 		return;
 	}
 
 	g_Game = new CGame();
 	g_NetClient = new CNetClient(g_Game);
 	g_NetClient->SetUserName(playerName);
 
 	if (!g_NetClient->SetupConnection("127.0.0.1"))
 	{
 		guiManager->GetScriptInterface().ReportError("Failed to connect to server");
 		SAFE_DELETE(g_NetClient);
 		SAFE_DELETE(g_Game);
 	}
 }
 
 void StartNetworkJoin(void* cbdata, std::wstring playerName, std::string serverAddress)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	ENSURE(!g_NetClient);
 	ENSURE(!g_NetServer);
 	ENSURE(!g_Game);
 
 	g_Game = new CGame();
 	g_NetClient = new CNetClient(g_Game);
 	g_NetClient->SetUserName(playerName);
 	if (!g_NetClient->SetupConnection(serverAddress))
 	{
 		guiManager->GetScriptInterface().ReportError("Failed to connect to server");
 		SAFE_DELETE(g_NetClient);
 		SAFE_DELETE(g_Game);
 	}
 }
 
 void DisconnectNetworkGame(void* UNUSED(cbdata))
 {
 	// TODO: we ought to do async reliable disconnections
 
 	SAFE_DELETE(g_NetServer);
 	SAFE_DELETE(g_NetClient);
 	SAFE_DELETE(g_Game);
 }
 
 CScriptVal PollNetworkClient(void* cbdata)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	if (!g_NetClient)
 		return CScriptVal();
 
 	CScriptValRooted poll = g_NetClient->GuiPoll();
 
 	// Convert from net client context to GUI script context
 	return guiManager->GetScriptInterface().CloneValueFromOtherContext(g_NetClient->GetScriptInterface(), poll.get());
 }
 
 void AssignNetworkPlayer(void* UNUSED(cbdata), int playerID, std::string guid)
 {
 	ENSURE(g_NetServer);
 
 	g_NetServer->AssignPlayer(playerID, guid);
 }
 
 void SendNetworkChat(void* UNUSED(cbdata), std::wstring message)
 {
 	ENSURE(g_NetClient);
 
 	g_NetClient->SendChatMessage(message);
 }
 
 std::vector<CScriptValRooted> GetAIs(void* cbdata)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	return ICmpAIManager::GetAIs(guiManager->GetScriptInterface());
 }
 
 std::vector<CScriptValRooted> GetSavedGames(void* cbdata)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	return SavedGames::GetSavedGames(guiManager->GetScriptInterface());
 }
 
 bool DeleteSavedGame(void* UNUSED(cbdata), std::wstring name)
 {
 	return SavedGames::DeleteSavedGame(name);
 }
 
 void OpenURL(void* UNUSED(cbdata), std::string url)
 {
 	sys_open_url(url);
 }
 
 std::wstring GetMatchID(void* UNUSED(cbdata))
 {
 	return ps_generate_guid().FromUTF8();
 }
 
 void RestartInAtlas(void* UNUSED(cbdata))
 {
 	restart_mainloop_in_atlas();
 }
 
 bool AtlasIsAvailable(void* UNUSED(cbdata))
 {
 	return ATLAS_IsAvailable();
 }
 
 bool IsAtlasRunning(void* UNUSED(cbdata))
 {
 	return (g_AtlasGameLoop && g_AtlasGameLoop->running);
 }
 
 CScriptVal LoadMapSettings(void* cbdata, VfsPath pathname)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	CMapSummaryReader reader;
 
 	if (reader.LoadMap(pathname) != PSRETURN_OK)
 		return CScriptVal();
 
 	return reader.GetMapSettings(guiManager->GetScriptInterface()).get();
 }
 
 CScriptVal GetMapSettings(void* cbdata)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	if (!g_Game)
 		return CScriptVal();
 
 	return guiManager->GetScriptInterface().CloneValueFromOtherContext(
 		g_Game->GetSimulation2()->GetScriptInterface(),
 		g_Game->GetSimulation2()->GetMapSettings().get());
 }
 
 /**
  * Get the current X coordinate of the camera.
  */
 float CameraGetX(void* UNUSED(cbdata))
 {
 	if (g_Game && g_Game->GetView())
 		return g_Game->GetView()->GetCameraX();
 	return -1;
 }
 
 /**
  * Get the current Z coordinate of the camera.
  */
 float CameraGetZ(void* UNUSED(cbdata))
 {
 	if (g_Game && g_Game->GetView())
 		return g_Game->GetView()->GetCameraZ();
 	return -1;
 }
 
 /**
  * Start / stop camera following mode
  * @param entityid unit id to follow. If zero, stop following mode
  */
 void CameraFollow(void* UNUSED(cbdata), entity_id_t entityid)
 {
 	if (g_Game && g_Game->GetView())
 		g_Game->GetView()->CameraFollow(entityid, false);
 }
 
 /**
  * Start / stop first-person camera following mode
  * @param entityid unit id to follow. If zero, stop following mode
  */
 void CameraFollowFPS(void* UNUSED(cbdata), entity_id_t entityid)
 {
 	if (g_Game && g_Game->GetView())
 		g_Game->GetView()->CameraFollow(entityid, true);
 }
 
 /// Move camera to a 2D location
 void CameraMoveTo(void* UNUSED(cbdata), entity_pos_t x, entity_pos_t z)
 {
 	// called from JS; must not fail
 	if(!(g_Game && g_Game->GetWorld() && g_Game->GetView() && g_Game->GetWorld()->GetTerrain()))
 		return;
 
 	CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
 
 	CVector3D target;
 	target.X = x.ToFloat();
 	target.Z = z.ToFloat();
 	target.Y = terrain->GetExactGroundLevel(target.X, target.Z);
 
 	g_Game->GetView()->MoveCameraTarget(target);
 }
 
 entity_id_t GetFollowedEntity(void* UNUSED(cbdata))
 {
 	if (g_Game && g_Game->GetView())
 		return g_Game->GetView()->GetFollowedEntity();
 
 	return INVALID_ENTITY;
 }
 
 bool HotkeyIsPressed_(void* UNUSED(cbdata), std::string hotkeyName)
 {
 	return HotkeyIsPressed(hotkeyName);
 }
 
 void DisplayErrorDialog(void* UNUSED(cbdata), std::wstring msg)
 {
 	debug_DisplayError(msg.c_str(), DE_NO_DEBUG_INFO, NULL, NULL, NULL, 0, NULL, NULL);
 }
 
 CScriptVal GetProfilerState(void* cbdata)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	return g_ProfileViewer.SaveToJS(guiManager->GetScriptInterface());
 }
 
 
 bool IsUserReportEnabled(void* UNUSED(cbdata))
 {
 	return g_UserReporter.IsReportingEnabled();
 }
 
 bool IsSplashScreenEnabled(void* UNUSED(cbdata))
 {
 	bool splashScreenEnable = true;
 	CFG_GET_VAL("splashscreenenable", Bool, splashScreenEnable);
 	return splashScreenEnable;
 }
 
 void SetSplashScreenEnabled(void* UNUSED(cbdata), bool enabled)
 {
 	CStr val = (enabled ? "true" : "false");
 	g_ConfigDB.CreateValue(CFG_USER, "splashscreenenable")->m_String = val;
 	g_ConfigDB.WriteFile(CFG_USER);
 }
 
 
 void SetUserReportEnabled(void* UNUSED(cbdata), bool enabled)
 {
 	g_UserReporter.SetReportingEnabled(enabled);
 }
 
 std::string GetUserReportStatus(void* UNUSED(cbdata))
 {
 	return g_UserReporter.GetStatus();
 }
 
 void SubmitUserReport(void* UNUSED(cbdata), std::string type, int version, std::wstring data)
 {
 	g_UserReporter.SubmitReport(type.c_str(), version, utf8_from_wstring(data));
 }
 
 
 
 void SetSimRate(void* UNUSED(cbdata), float rate)
 {
 	g_Game->SetSimRate(rate);
 }
 
 float GetSimRate(void* UNUSED(cbdata))
 {
 	return g_Game->GetSimRate();
 }
 
 void SetTurnLength(void* UNUSED(cbdata), int length)
 {
 	if (g_NetServer)
 		g_NetServer->SetTurnLength(length);
 	else
 		LOGERROR(L"Only network host can change turn length");
 }
 
 // Focus the game camera on a given position.
 void SetCameraTarget(void* UNUSED(cbdata), float x, float y, float z)
 {
 	g_Game->GetView()->ResetCameraTarget(CVector3D(x, y, z));
 }
 
 // Deliberately cause the game to crash.
 // Currently implemented via access violation (read of address 0).
 // Useful for testing the crashlog/stack trace code.
 int Crash(void* UNUSED(cbdata))
 {
 	debug_printf(L"Crashing at user's request.\n");
 	return *(volatile int*)0;
 }
 
 void DebugWarn(void* UNUSED(cbdata))
 {
 	debug_warn(L"Warning at user's request.");
 }
 
 // Force a JS garbage collection cycle to take place immediately.
 // Writes an indication of how long this took to the console.
 void ForceGC(void* cbdata)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	double time = timer_Time();
 	JS_GC(guiManager->GetScriptInterface().GetContext());
 	time = timer_Time() - time;
 	g_Console->InsertMessage(L"Garbage collection completed in: %f", time);
 }
 
 void DumpSimState(void* UNUSED(cbdata))
 {
 	OsPath path = psLogDir()/"sim_dump.txt";
 	std::ofstream file (OsString(path).c_str(), std::ofstream::out | std::ofstream::trunc);
 	g_Game->GetSimulation2()->DumpDebugState(file);
 }
 
 void DumpTerrainMipmap(void* UNUSED(cbdata))
 {
 	VfsPath filename(L"screenshots/terrainmipmap.png");
 	g_Game->GetWorld()->GetTerrain()->GetHeightMipmap().DumpToDisk(filename);
 	OsPath realPath;
 	g_VFS->GetRealPath(filename, realPath);
 	LOGMESSAGERENDER(L"Terrain mipmap written to '%ls'", realPath.string().c_str());
 }
 
 void EnableTimeWarpRecording(void* UNUSED(cbdata), unsigned int numTurns)
 {
 	g_Game->GetTurnManager()->EnableTimeWarpRecording(numTurns);
 }
 
 void RewindTimeWarp(void* UNUSED(cbdata))
 {
 	g_Game->GetTurnManager()->RewindTimeWarp();
 }
 
 /* Begin lobby related functions */
 
+bool HasXmppClient(void* UNUSED(cbdata))
+{
+	return (g_XmppClient ? true : false);
+}
+
 void StartXmppClient(void* cbdata, std::string sUsername, std::string sPassword, std::string sRoom, std::string sNick)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	ENSURE(!g_XmppClient);
 
 	g_XmppClient = IXmppClient::create(guiManager->GetScriptInterface(), sUsername, sPassword, sRoom, sNick);
 	g_rankedGame = true;
 }
 
 void StartRegisterXmppClient(void* cbdata, std::string sUsername, std::string sPassword)
 {
 	CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
 
 	ENSURE(!g_XmppClient);
 
 	g_XmppClient = IXmppClient::create(guiManager->GetScriptInterface(), sUsername, sPassword, "", "", true);
 }
 
-bool HasXmppClient(void* UNUSED(cbdata))
-{
-	return (g_XmppClient ? true : false);
-}
-
 void StopXmppClient(void* UNUSED(cbdata))
 {
 	ENSURE(g_XmppClient);
 	SAFE_DELETE(g_XmppClient);
 	g_rankedGame = false;
 }
 
 void ConnectXmppClient(void* UNUSED(cbdata))
 {
 	ENSURE(g_XmppClient);
 	g_XmppClient->connect();
 }
 
 void DisconnectXmppClient(void* UNUSED(cbdata))
 {
 	ENSURE(g_XmppClient);
 	g_XmppClient->disconnect();
 }
 
 void RecvXmppClient(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return;
 	g_XmppClient->recv();
 }
 
 void SendGetGameList(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return;
 	g_XmppClient->SendIqGetGameList();
 }
 
 void SendGetBoardList(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return;
 	g_XmppClient->SendIqGetBoardList();
 }
 
 void SendGameReport(void* UNUSED(cbdata), CScriptVal data)
 {
 	if (!g_XmppClient)
 		return;
 	g_XmppClient->SendIqGameReport(data);
 }
 
 void SendRegisterGame(void* UNUSED(cbdata), CScriptVal data)
 {
 	if (!g_XmppClient)
 		return;
 	g_XmppClient->SendIqRegisterGame(data);
 }
 
 void SendUnregisterGame(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return;
 	g_XmppClient->SendIqUnregisterGame();
 }
 
 void SendChangeStateGame(void* UNUSED(cbdata), std::string nbp, std::string players)
 {
 	if (!g_XmppClient)
 		return;
 	g_XmppClient->SendIqChangeStateGame(nbp, players);
 }
 
 CScriptVal GetPlayerList(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return CScriptVal();
 
 	CScriptValRooted playerList = g_XmppClient->GUIGetPlayerList();
 
 	return playerList.get();
 }
 
 CScriptVal GetGameList(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return CScriptVal();
 
 	CScriptValRooted gameList = g_XmppClient->GUIGetGameList();
 
 	return gameList.get();
 }
 
 CScriptVal GetBoardList(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return CScriptVal();
 
 	CScriptValRooted boardList = g_XmppClient->GUIGetBoardList();
 
 	return boardList.get();
 }
 
 CScriptVal LobbyGuiPollMessage(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return CScriptVal();
 
 	CScriptValRooted poll = g_XmppClient->GuiPollMessage();
 
 	return poll.get();
 }
 
 void LobbySendMessage(void* UNUSED(cbdata), std::string message)
 {
 	if (!g_XmppClient)
 		return;
 
 	g_XmppClient->SendMUCMessage(message);
 }
 
 void LobbySetPlayerPresence(void* UNUSED(cbdata), std::string presence)
 {
 	if (!g_XmppClient)
 		return;
 
 	g_XmppClient->SetPresence(presence);
 }
 
 void LobbySetNick(void* UNUSED(cbdata), std::string nick)
 {
 	if (!g_XmppClient)
 		return;
 
 	g_XmppClient->SetNick(nick);
 }
 
 std::string LobbyGetNick(void* UNUSED(cbdata))
 {
 	if (!g_XmppClient)
 		return "";
 
 	std::string nick;
 	g_XmppClient->GetNick(nick);
 	return nick;
 }
 
 void LobbyKick(void* UNUSED(cbdata), std::string nick, std::string reason)
 {
 	if (!g_XmppClient)
 		return;
 
 	g_XmppClient->kick(nick, reason);
 }
 
 void LobbyBan(void* UNUSED(cbdata), std::string nick, std::string reason)
 {
 	if (!g_XmppClient)
 		return;
 
 	g_XmppClient->ban(nick, reason);
 }
 
 std::string LobbyGetPlayerPresence(void* UNUSED(cbdata), std::string nickname)
 {
 	if (!g_XmppClient)
 		return "";
 
 	std::string presence;
 	g_XmppClient->GetPresence(nickname, presence);
 	return presence;
 }
 
 /* End lobby related functions */
 
 void QuickSave(void* UNUSED(cbdata))
 {
 	g_Game->GetTurnManager()->QuickSave();
 }
 
 void QuickLoad(void* UNUSED(cbdata))
 {
 	g_Game->GetTurnManager()->QuickLoad();
 }
 
 void SetBoundingBoxDebugOverlay(void* UNUSED(cbdata), bool enabled)
 {
 	ICmpSelectable::ms_EnableDebugOverlays = enabled;
 }
 
 // Non-public secure PBKDF2 hash function with salting and 1,337 iterations
 void EncryptPassword(const std::string& username, std::string& password)
 {
         const int DIGESTSIZE = SHA_DIGEST_SIZE;
         const int ITERATIONS = 1337;
 
         static const byte salt_base[DIGESTSIZE] = {
                 244, 243, 249, 244, 32, 33, 34, 35, 10, 11, 12, 13, 14, 15, 16, 17,
                 18, 19, 20, 32, 33, 244, 224, 127, 129, 130, 140, 153, 133, 123, 234, 123 };
 
         // initialize the salt buffer
         byte salt_buffer[DIGESTSIZE] = {0};
         SHA256 hash;
         hash.update(salt_base, username.length());
         hash.update(username.c_str(), username.length());
         hash.finish(salt_buffer);
 
         // PBKDF2 to create the buffer
         byte encrypted[DIGESTSIZE];
         pbkdf2(encrypted, (byte*)password.c_str(), password.length(), salt_buffer, DIGESTSIZE, ITERATIONS);
 
         static const char base16[] = "0123456789ABCDEF";
         char hex[2 * DIGESTSIZE];
         for(int i = 0; i < DIGESTSIZE; ++i)
         {
                 hex[i*2] = base16[encrypted[i] >> 4];           // 4 high bits
                 hex[i*2 + 1] = base16[encrypted[i] & 0x0F];// 4 low bits
         }
         password.assign(hex, sizeof(hex));
 }
 
 // Public hash interface.
 std::string EncryptPassword(void* UNUSED(cbdata), std::string user, std::string pass)
 {
         EncryptPassword(user, pass);
         return pass;
 }
 
 bool IsRankedGame(void* UNUSED(cbdata))
 {
 	return g_rankedGame;
 }
 
 void SetRankedGame(void* UNUSED(cbdata), bool isRanked)
 {
 	g_rankedGame = isRanked;
 }
 
 } // namespace
 
 void GuiScriptingInit(ScriptInterface& scriptInterface)
 {
 	JSI_GameView::RegisterScriptFunctions(scriptInterface);
 	JSI_Renderer::RegisterScriptFunctions(scriptInterface);
 	JSI_Console::RegisterScriptFunctions(scriptInterface);
 	JSI_ConfigDB::RegisterScriptFunctions(scriptInterface);
 
 	// GUI manager functions:
 	scriptInterface.RegisterFunction<CScriptVal, &GetActiveGui>("GetActiveGui");
 	scriptInterface.RegisterFunction<void, std::wstring, CScriptVal, &PushGuiPage>("PushGuiPage");
 	scriptInterface.RegisterFunction<void, std::wstring, CScriptVal, &SwitchGuiPage>("SwitchGuiPage");
 	scriptInterface.RegisterFunction<void, &PopGuiPage>("PopGuiPage");
 
 	// Simulation<->GUI interface functions:
 	scriptInterface.RegisterFunction<CScriptVal, std::wstring, CScriptVal, &GuiInterfaceCall>("GuiInterfaceCall");
 	scriptInterface.RegisterFunction<void, CScriptVal, &PostNetworkCommand>("PostNetworkCommand");
 
 	// Entity picking
 	scriptInterface.RegisterFunction<std::vector<entity_id_t>, int, int, &PickEntitiesAtPoint>("PickEntitiesAtPoint");
 	scriptInterface.RegisterFunction<std::vector<entity_id_t>, int, int, int, int, int, &PickFriendlyEntitiesInRect>("PickFriendlyEntitiesInRect");
 	scriptInterface.RegisterFunction<std::vector<entity_id_t>, int, &PickFriendlyEntitiesOnScreen>("PickFriendlyEntitiesOnScreen");
 	scriptInterface.RegisterFunction<std::vector<entity_id_t>, std::string, bool, bool, bool, &PickSimilarFriendlyEntities>("PickSimilarFriendlyEntities");
 	scriptInterface.RegisterFunction<CFixedVector3D, int, int, &GetTerrainAtScreenPoint>("GetTerrainAtScreenPoint");
 
 	// Network / game setup functions
 	scriptInterface.RegisterFunction<void, &StartNetworkGame>("StartNetworkGame");
 	scriptInterface.RegisterFunction<void, CScriptVal, int, &StartGame>("StartGame");
 	scriptInterface.RegisterFunction<void, std::wstring, &StartNetworkHost>("StartNetworkHost");
 	scriptInterface.RegisterFunction<void, std::wstring, std::string, &StartNetworkJoin>("StartNetworkJoin");
 	scriptInterface.RegisterFunction<void, &DisconnectNetworkGame>("DisconnectNetworkGame");
 	scriptInterface.RegisterFunction<CScriptVal, &PollNetworkClient>("PollNetworkClient");
 	scriptInterface.RegisterFunction<void, CScriptVal, &SetNetworkGameAttributes>("SetNetworkGameAttributes");
 	scriptInterface.RegisterFunction<void, int, std::string, &AssignNetworkPlayer>("AssignNetworkPlayer");
 	scriptInterface.RegisterFunction<void, std::wstring, &SendNetworkChat>("SendNetworkChat");
 	scriptInterface.RegisterFunction<std::vector<CScriptValRooted>, &GetAIs>("GetAIs");
 
 	// Saved games
 	scriptInterface.RegisterFunction<CScriptVal, std::wstring, &StartSavedGame>("StartSavedGame");
 	scriptInterface.RegisterFunction<std::vector<CScriptValRooted>, &GetSavedGames>("GetSavedGames");
 	scriptInterface.RegisterFunction<bool, std::wstring, &DeleteSavedGame>("DeleteSavedGame");
 	scriptInterface.RegisterFunction<void, std::wstring, std::wstring, &SaveGame>("SaveGame");
 	scriptInterface.RegisterFunction<void, std::wstring, std::wstring, &SaveGamePrefix>("SaveGamePrefix");
 	scriptInterface.RegisterFunction<void, &QuickSave>("QuickSave");
 	scriptInterface.RegisterFunction<void, &QuickLoad>("QuickLoad");
 
 	// Misc functions
 	scriptInterface.RegisterFunction<std::wstring, std::wstring, &SetCursor>("SetCursor");
 	scriptInterface.RegisterFunction<int, &GetPlayerID>("GetPlayerID");
 	scriptInterface.RegisterFunction<void, int, &SetPlayerID>("SetPlayerID");
 	scriptInterface.RegisterFunction<void, std::string, &OpenURL>("OpenURL");
 	scriptInterface.RegisterFunction<std::wstring, &GetMatchID>("GetMatchID");
 	scriptInterface.RegisterFunction<void, &RestartInAtlas>("RestartInAtlas");
 	scriptInterface.RegisterFunction<bool, &AtlasIsAvailable>("AtlasIsAvailable");
 	scriptInterface.RegisterFunction<bool, &IsAtlasRunning>("IsAtlasRunning");
 	scriptInterface.RegisterFunction<CScriptVal, VfsPath, &LoadMapSettings>("LoadMapSettings");
 	scriptInterface.RegisterFunction<CScriptVal, &GetMapSettings>("GetMapSettings");
 	scriptInterface.RegisterFunction<float, &CameraGetX>("CameraGetX");
 	scriptInterface.RegisterFunction<float, &CameraGetZ>("CameraGetZ");
 	scriptInterface.RegisterFunction<void, entity_id_t, &CameraFollow>("CameraFollow");
 	scriptInterface.RegisterFunction<void, entity_id_t, &CameraFollowFPS>("CameraFollowFPS");
 	scriptInterface.RegisterFunction<void, entity_pos_t, entity_pos_t, &CameraMoveTo>("CameraMoveTo");
 	scriptInterface.RegisterFunction<entity_id_t, &GetFollowedEntity>("GetFollowedEntity");
 	scriptInterface.RegisterFunction<bool, std::string, &HotkeyIsPressed_>("HotkeyIsPressed");
 	scriptInterface.RegisterFunction<void, std::wstring, &DisplayErrorDialog>("DisplayErrorDialog");
 	scriptInterface.RegisterFunction<CScriptVal, &GetProfilerState>("GetProfilerState");
 
 	// User report functions
 	scriptInterface.RegisterFunction<bool, &IsUserReportEnabled>("IsUserReportEnabled");
 	scriptInterface.RegisterFunction<void, bool, &SetUserReportEnabled>("SetUserReportEnabled");
 	scriptInterface.RegisterFunction<std::string, &GetUserReportStatus>("GetUserReportStatus");
 	scriptInterface.RegisterFunction<void, std::string, int, std::wstring, &SubmitUserReport>("SubmitUserReport");
 
 	// Splash screen functions
 	scriptInterface.RegisterFunction<bool, &IsSplashScreenEnabled>("IsSplashScreenEnabled");
 	scriptInterface.RegisterFunction<void, bool, &SetSplashScreenEnabled>("SetSplashScreenEnabled");
 
 	// Development/debugging functions
 	scriptInterface.RegisterFunction<void, float, &SetSimRate>("SetSimRate");
 	scriptInterface.RegisterFunction<float, &GetSimRate>("GetSimRate");
 	scriptInterface.RegisterFunction<void, int, &SetTurnLength>("SetTurnLength");
 	scriptInterface.RegisterFunction<void, float, float, float, &SetCameraTarget>("SetCameraTarget");
 	scriptInterface.RegisterFunction<int, &Crash>("Crash");
 	scriptInterface.RegisterFunction<void, &DebugWarn>("DebugWarn");
 	scriptInterface.RegisterFunction<void, &ForceGC>("ForceGC");
 	scriptInterface.RegisterFunction<void, &DumpSimState>("DumpSimState");
 	scriptInterface.RegisterFunction<void, &DumpTerrainMipmap>("DumpTerrainMipmap");
 	scriptInterface.RegisterFunction<void, unsigned int, &EnableTimeWarpRecording>("EnableTimeWarpRecording");
 	scriptInterface.RegisterFunction<void, &RewindTimeWarp>("RewindTimeWarp");
 	scriptInterface.RegisterFunction<void, bool, &SetBoundingBoxDebugOverlay>("SetBoundingBoxDebugOverlay");
 
-#if CONFIG2_LOBBY // Allow the lobby to be disabled
 	// Lobby functions
+	scriptInterface.RegisterFunction<bool, &HasXmppClient>("HasXmppClient");
+#if CONFIG2_LOBBY // Allow the lobby to be disabled
 	scriptInterface.RegisterFunction<void, std::string, std::string, std::string, std::string, &StartXmppClient>("StartXmppClient");
 	scriptInterface.RegisterFunction<void, std::string, std::string, &StartRegisterXmppClient>("StartRegisterXmppClient");
-	scriptInterface.RegisterFunction<bool, &HasXmppClient>("HasXmppClient");
 	scriptInterface.RegisterFunction<void, &StopXmppClient>("StopXmppClient");
 	scriptInterface.RegisterFunction<void, &ConnectXmppClient>("ConnectXmppClient");
 	scriptInterface.RegisterFunction<void, &DisconnectXmppClient>("DisconnectXmppClient");
 	scriptInterface.RegisterFunction<void, &RecvXmppClient>("RecvXmppClient");
 	scriptInterface.RegisterFunction<void, &SendGetGameList>("SendGetGameList");
 	scriptInterface.RegisterFunction<void, &SendGetBoardList>("SendGetBoardList");
 	scriptInterface.RegisterFunction<void, CScriptVal, &SendRegisterGame>("SendRegisterGame");
 	scriptInterface.RegisterFunction<void, CScriptVal, &SendGameReport>("SendGameReport");
 	scriptInterface.RegisterFunction<void, &SendUnregisterGame>("SendUnregisterGame");
 	scriptInterface.RegisterFunction<void, std::string, std::string, &SendChangeStateGame>("SendChangeStateGame");
 	scriptInterface.RegisterFunction<CScriptVal, &GetPlayerList>("GetPlayerList");
 	scriptInterface.RegisterFunction<CScriptVal, &GetGameList>("GetGameList");
 	scriptInterface.RegisterFunction<CScriptVal, &GetBoardList>("GetBoardList");
 	scriptInterface.RegisterFunction<CScriptVal, &LobbyGuiPollMessage>("LobbyGuiPollMessage");
 	scriptInterface.RegisterFunction<void, std::string, &LobbySendMessage>("LobbySendMessage");
 	scriptInterface.RegisterFunction<void, std::string, &LobbySetPlayerPresence>("LobbySetPlayerPresence");
 	scriptInterface.RegisterFunction<void, std::string, &LobbySetNick>("LobbySetNick");
 	scriptInterface.RegisterFunction<std::string, &LobbyGetNick>("LobbyGetNick");
 	scriptInterface.RegisterFunction<void, std::string, std::string, &LobbyKick>("LobbyKick");
 	scriptInterface.RegisterFunction<void, std::string, std::string, &LobbyBan>("LobbyBan");
 	scriptInterface.RegisterFunction<std::string, std::string, &LobbyGetPlayerPresence>("LobbyGetPlayerPresence");
 	scriptInterface.RegisterFunction<std::string, std::string, std::string, &EncryptPassword>("EncryptPassword");
 	scriptInterface.RegisterFunction<bool, &IsRankedGame>("IsRankedGame");
 	scriptInterface.RegisterFunction<void, bool, &SetRankedGame>("SetRankedGame");
 #endif // CONFIG2_LOBBY
 }
Index: ps/trunk/source/lobby/Globals.cpp
===================================================================
--- ps/trunk/source/lobby/Globals.cpp	(nonexistent)
+++ ps/trunk/source/lobby/Globals.cpp	(revision 14113)
@@ -0,0 +1,23 @@
+/* Copyright (C) 2013 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 0 A.D. is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "precompiled.h"
+
+#include "IXmppClient.h"
+
+IXmppClient *g_XmppClient = NULL;
+bool g_rankedGame = false;
Index: ps/trunk/source/lobby/XmppClient.cpp
===================================================================
--- ps/trunk/source/lobby/XmppClient.cpp	(revision 14112)
+++ ps/trunk/source/lobby/XmppClient.cpp	(revision 14113)
@@ -1,852 +1,848 @@
 /* Copyright (C) 2013 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 #include "XmppClient.h"
 #include "StanzaExtensions.h"
 
 // Debug
 // TODO: Use builtin error/warning/logging functions.
 #include <iostream>
 #include "ps/CLogger.h"
 
 // Gloox
 #include "glooxwrapper/glooxwrapper.h"
 
 // Game - script
 #include "scriptinterface/ScriptInterface.h"
 
 // Configuration
 #include "ps/ConfigDB.h"
 
-//global
-IXmppClient *g_XmppClient = NULL;
-bool g_rankedGame = false;
-
 //debug
 #if 1
 #define DbgXMPP(x)
 #else
 #define DbgXMPP(x) std::cout << x << std::endl;
 
 static std::string tag_xml(const glooxwrapper::IQ& iq)
 {
 	std::string ret;
 	glooxwrapper::Tag* tag = iq.tag();
 	ret = tag->xml().to_string();
 	glooxwrapper::Tag::free(tag);
 	return ret;
 }
 #endif
 
 static std::string tag_name(const glooxwrapper::IQ& iq)
 {
 	std::string ret;
 	glooxwrapper::Tag* tag = iq.tag();
 	ret = tag->name().to_string();
 	glooxwrapper::Tag::free(tag);
 	return ret;
 }
 
 IXmppClient* IXmppClient::create(ScriptInterface& scriptInterface, const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, bool regOpt)
 {
 	return new XmppClient(scriptInterface, sUsername, sPassword, sRoom, sNick, regOpt);
 }
 
 /**
  * Construct the xmpp client
  */
 XmppClient::XmppClient(ScriptInterface& scriptInterface, const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, bool regOpt)
 	: m_ScriptInterface(scriptInterface), m_client(NULL), m_mucRoom(NULL), m_registration(NULL), m_username(sUsername), m_password(sPassword), m_nick(sNick)
 {
 	// Read lobby configuration from default.cfg
 	std::string sServer;
 	std::string sXpartamupp;
 	CFG_GET_VAL("lobby.server", String, sServer);
 	CFG_GET_VAL("lobby.xpartamupp", String, sXpartamupp);
 
 	m_xpartamuppId = sXpartamupp + "@" + sServer + "/CC";
 	glooxwrapper::JID clientJid(sUsername + "@" + sServer + "/0ad");
 	glooxwrapper::JID roomJid(sRoom + "@conference." + sServer + "/" + sNick);
 
 	// If we are connecting, use the full jid and a password
 	// If we are registering, only use the server name
 	if(!regOpt)
 		m_client = new glooxwrapper::Client(clientJid, sPassword);
 	else
 		m_client = new glooxwrapper::Client(sServer);
 
 	// Disable TLS as we haven't set a certificate on the server yet
 	m_client->setTls(gloox::TLSDisabled);
 
 	// Disable use of the SASL PLAIN mechanism, to prevent leaking credentials
 	// if the server doesn't list any supported SASL mechanism or the response
 	// has been modified to exclude those.
 	const int mechs = gloox::SaslMechAll ^ gloox::SaslMechPlain;
 	m_client->setSASLMechanisms(mechs);
 
 	m_client->registerConnectionListener( this );
 	m_client->setPresence(gloox::Presence::Available, -1);
 	m_client->disco()->setVersion( "Pyrogenesis", "0.0.15" );
 	m_client->disco()->setIdentity( "client", "bot" );
 	m_client->setCompression(false);
 
 	m_client->registerStanzaExtension( new GameListQuery() );
 	m_client->registerIqHandler( this, ExtGameListQuery);
 
 	m_client->registerStanzaExtension( new BoardListQuery() );
 	m_client->registerIqHandler( this, ExtBoardListQuery);
 
 	m_client->registerMessageHandler( this );
 
 	// Uncomment to see the raw stanzas
 	//m_client->logInstance().registerLogHandler( LogLevelDebug, LogAreaAll, this );
 
 	if (!regOpt)
 	{
 		// Create a Multi User Chat Room
 		m_mucRoom = new glooxwrapper::MUCRoom(m_client, roomJid, this, 0);
 		// Disable the history because its anoying
 		m_mucRoom->setRequestHistory(0, gloox::MUCRoom::HistoryMaxStanzas);
 	}
 	else
 	{
 		// Registration
 		m_registration = new glooxwrapper::Registration(m_client);
 		m_registration->registerRegistrationHandler(this);
 	}
 }
 
 /**
  * Destroy the xmpp client
  */
 XmppClient::~XmppClient()
 {
 	DbgXMPP("XmppClient destroyed");
 	delete m_registration;
 	delete m_mucRoom;
 
 	// Workaround for memory leak in gloox 1.0/1.0.1
 	m_client->removePresenceExtension(gloox::ExtCaps);
 
 	delete m_client;
 
 	for (std::vector<const glooxwrapper::Tag*>::const_iterator it = m_GameList.begin(); it != m_GameList.end(); ++it)
 		glooxwrapper::Tag::free(*it);
 	for (std::vector<const glooxwrapper::Tag*>::const_iterator it = m_BoardList.begin(); it != m_BoardList.end(); ++it)
 		glooxwrapper::Tag::free(*it);
 }
 
 /// Game - script
 ScriptInterface& XmppClient::GetScriptInterface()
 {
 	return m_ScriptInterface;
 }
 
 /// Network
 void XmppClient::connect()
 {
 	m_client->connect(false);
 }
 
 void XmppClient::disconnect()
 {
 	m_client->disconnect();
 }
 
 void XmppClient::recv()
 {
 	m_client->recv(1);
 }
 
 /**
  * Log (debug) Handler
  */
 void XmppClient::handleLog(gloox::LogLevel level, gloox::LogArea area, const std::string& message)
 {
 	std::cout << "log: level: " << level << ", area: " << area << ", message: " << message << std::endl;
 }
 
 /*****************************************************
  * Connection handlers                               *
  *****************************************************/
 
 /**
  * Handle connection
  */
 void XmppClient::onConnect()
 {
 	if (m_mucRoom)
 	{
 		CreateSimpleMessage("system", "connected");
 		m_mucRoom->join();
 		SendIqGetGameList();
 		SendIqGetBoardList();
 	}
 
 	if (m_registration)
 		m_registration->fetchRegistrationFields();
 }
 
 /**
  * Handle disconnection
  */
 void XmppClient::onDisconnect(gloox::ConnectionError error)
 {
 	// Make sure we properly leave the room so that
 	// everything works if we decide to come back later
 	if (m_mucRoom)
 		m_mucRoom->leave();
 
 	// Clear game, board and player lists.
 	for (std::vector<const glooxwrapper::Tag*>::const_iterator it = m_GameList.begin(); it != m_GameList.end(); ++it)
 		glooxwrapper::Tag::free(*it);
 	for (std::vector<const glooxwrapper::Tag*>::const_iterator it = m_BoardList.begin(); it != m_BoardList.end(); ++it)
 		glooxwrapper::Tag::free(*it);
 	m_BoardList.clear();
 	m_GameList.clear();
 	m_PlayerMap.clear();
 
 	if(error == gloox::ConnAuthenticationFailed)
 		CreateSimpleMessage("system", "authentication failed", "error");
 	else
 		CreateSimpleMessage("system", "disconnected");
 }
 
 /**
  * Handle TLS connection
  */
 bool XmppClient::onTLSConnect(const glooxwrapper::CertInfo& info)
 {
 	UNUSED2(info);
 	DbgXMPP("onTLSConnect");
 	DbgXMPP(
 		"status: " << info.status <<
 		"\nissuer: " << info.issuer <<
 		"\npeer: " << info.server <<
 		"\nprotocol: " << info.protocol <<
 		"\nmac: " << info.mac <<
 		"\ncipher: " << info.cipher <<
 		"\ncompression: " << info.compression );
 	return true;
 }
 
 /**
  * Handle MUC room errors
  */
 void XmppClient::handleMUCError(glooxwrapper::MUCRoom*, gloox::StanzaError err)
 {
 	std::string msg = StanzaErrorToString(err);
 	CreateSimpleMessage("system", msg, "error");
 }
 
 /*****************************************************
  * Requests to server                                *
  *****************************************************/
 
 /**
  * Request a listing of active games from the server.
  */
 void XmppClient::SendIqGetGameList()
 {
 	glooxwrapper::JID xpartamuppJid(m_xpartamuppId);
 
 	// Send IQ
 	glooxwrapper::IQ iq(gloox::IQ::Get, xpartamuppJid);
 	iq.addExtension(new GameListQuery());
 	DbgXMPP("SendIqGetGameList [" << tag_xml(iq) << "]");
 	m_client->send(iq);
 }
 
 /**
  * Request the leaderboard data from the server.
  */
 void XmppClient::SendIqGetBoardList()
 {
 	glooxwrapper::JID xpartamuppJid(m_xpartamuppId);
 
 	// Send IQ
 	glooxwrapper::IQ iq(gloox::IQ::Get, xpartamuppJid);
 	iq.addExtension(new BoardListQuery());
 	DbgXMPP("SendIqGetBoardList [" << tag_xml(iq) << "]");
 	m_client->send(iq);
 }
 
 /**
  * Send game report containing numerous game properties to the server.
  *
  * @param data A JS array of game statistics
  */
 void XmppClient::SendIqGameReport(CScriptVal data)
 {
 	glooxwrapper::JID xpartamuppJid(m_xpartamuppId);
 	jsval dataval = data.get();
 
 	// Setup some base stanza attributes
 	GameReport* game = new GameReport();
 	glooxwrapper::Tag* report = glooxwrapper::Tag::allocate("game");
 
 	// Iterate through all the properties reported and add them to the stanza.
 	std::vector<std::string> properties;
 	m_ScriptInterface.EnumeratePropertyNamesWithPrefix(dataval, "", properties);
 	for (std::vector<int>::size_type i = 0; i != properties.size(); i++)
 	{
 		std::string value;
 		m_ScriptInterface.GetProperty(dataval, properties[i].c_str(), value);
 		report->addAttribute(properties[i], value);
 	}
 
 	// Add stanza to IQ
 	game->m_GameReport.push_back(report);
 
 	// Send IQ
 	glooxwrapper::IQ iq(gloox::IQ::Set, xpartamuppJid);
 	iq.addExtension(game);
 	DbgXMPP("SendGameReport [" << tag_xml(iq) << "]");
 	m_client->send(iq);
 };
 
 /**
  * Send a request to register a game to the server.
  *
  * @param data A JS array of game attributes
  */
 void XmppClient::SendIqRegisterGame(CScriptVal data)
 {
 	glooxwrapper::JID xpartamuppJid(m_xpartamuppId);
 	jsval dataval = data.get();
 
 	// Setup some base stanza attributes
 	GameListQuery* g = new GameListQuery();
 	g->m_Command = "register";
 	glooxwrapper::Tag* game = glooxwrapper::Tag::allocate("game");
 	// Add a fake ip which will be overwritten by the ip stamp XMPP module on the server.
 	game->addAttribute("ip", "fake");
 
 	// Iterate through all the properties reported and add them to the stanza.
 	std::vector<std::string> properties;
 	m_ScriptInterface.EnumeratePropertyNamesWithPrefix(dataval, "", properties);
 	for (std::vector<int>::size_type i = 0; i != properties.size(); i++)
 	{
 		std::string value;
 		m_ScriptInterface.GetProperty(dataval, properties[i].c_str(), value);
 		game->addAttribute(properties[i], value);
 	}
 
 	// Push the stanza onto the IQ
 	g->m_GameList.push_back(game);
 
 	// Send IQ
 	glooxwrapper::IQ iq(gloox::IQ::Set, xpartamuppJid);
 	iq.addExtension(g);
 	DbgXMPP("SendIqRegisterGame [" << tag_xml(iq) << "]");
 	m_client->send(iq);
 }
 
 /**
  * Send a request to unregister a game to the server.
  */
 void XmppClient::SendIqUnregisterGame()
 {
 	glooxwrapper::JID xpartamuppJid(m_xpartamuppId);
 
 	// Send IQ
 	GameListQuery* g = new GameListQuery();
 	g->m_Command = "unregister";
 	g->m_GameList.push_back(glooxwrapper::Tag::allocate( "game" ));
 
 	glooxwrapper::IQ iq( gloox::IQ::Set, xpartamuppJid );
 	iq.addExtension( g );
 	DbgXMPP("SendIqUnregisterGame [" << tag_xml(iq) << "]");
 	m_client->send( iq );
 }
 
 /**
  * Send a request to change the state of a registered game on the server.
  *
  * A game can either be in the 'running' or 'waiting' state - the server
  * decides which - but we need to update the current players that are
  * in-game so the server can make the calculation.
  */
 void XmppClient::SendIqChangeStateGame(const std::string& nbp, const std::string& players)
 {
 	glooxwrapper::JID xpartamuppJid(m_xpartamuppId);
 
 	// Send IQ
 	GameListQuery* g = new GameListQuery();
 	g->m_Command = "changestate";
 	glooxwrapper::Tag* game = glooxwrapper::Tag::allocate("game");
 	game->addAttribute("nbp", nbp);
 	game->addAttribute("players", players);
 	g->m_GameList.push_back(game);
 
 	glooxwrapper::IQ iq(gloox::IQ::Set, xpartamuppJid);
 	iq.addExtension( g );
 	DbgXMPP("SendIqChangeStateGame [" << tag_xml(iq) << "]");
 	m_client->send(iq);
 }
 
 /*****************************************************
  * Account registration                              *
  *****************************************************/
 
 void XmppClient::handleRegistrationFields(const glooxwrapper::JID&, int fields, glooxwrapper::string)
 {
 	glooxwrapper::RegistrationFields vals;
 	vals.username = m_username;
 	vals.password = m_password;
 	m_registration->createAccount(fields, vals);
 }
 
 void XmppClient::handleRegistrationResult(const glooxwrapper::JID&, gloox::RegistrationResult result)
 {
 	if (result == gloox::RegistrationSuccess)
 	{
 		CreateSimpleMessage("system", "registered");
 	}
 	else
 	{
 	std::string msg;
 #define CASE(X, Y) case gloox::X: msg = Y; break
 		switch(result)
 		{
 		CASE(RegistrationNotAcceptable, "Registration not acceptable");
 		CASE(RegistrationConflict, "Registration conflict");
 		CASE(RegistrationNotAuthorized, "Registration not authorized");
 		CASE(RegistrationBadRequest, "Registration bad request");
 		CASE(RegistrationForbidden, "Registration forbidden");
 		CASE(RegistrationRequired, "Registration required");
 		CASE(RegistrationUnexpectedRequest, "Registration unexpected request");
 		CASE(RegistrationNotAllowed, "Registration not allowed");
 		default: msg = "Registration unknown error";
 		}
 #undef CASE
 		CreateSimpleMessage("system", msg, "error");
 	}
 	disconnect();
 }
 
 void XmppClient::handleAlreadyRegistered(const glooxwrapper::JID&)
 {
 	DbgXMPP("the account already exists");
 }
 
 void XmppClient::handleDataForm(const glooxwrapper::JID&, const glooxwrapper::DataForm&)
 {
 	DbgXMPP("dataForm received");
 }
 
 void XmppClient::handleOOB(const glooxwrapper::JID&, const glooxwrapper::OOB&)
 {
 	DbgXMPP("OOB registration requested");
 }
 
 /*****************************************************
  * Requests from GUI                                 *
  *****************************************************/
 
 /**
  * Handle requests from the GUI for the list of players.
  *
  * @return A JS array containing all known players and their presences
  */
 CScriptValRooted XmppClient::GUIGetPlayerList()
 {
 	std::string presence;
 	CScriptValRooted playerList;
 	m_ScriptInterface.Eval("({})", playerList);
 	for(std::map<std::string, gloox::Presence::PresenceType>::const_iterator it = m_PlayerMap.begin(); it != m_PlayerMap.end(); ++it)
 	{
 		CScriptValRooted player;
 		GetPresenceString(it->second, presence);
 		m_ScriptInterface.Eval("({})", player);
 		m_ScriptInterface.SetProperty(player.get(), "name", it->first.c_str());
 		m_ScriptInterface.SetProperty(player.get(), "presence", presence.c_str());
 
 		m_ScriptInterface.SetProperty(playerList.get(), it->first.c_str(), player);
 	}
 
 	return playerList;
 }
 
 /**
  * Handle requests from the GUI for the list of all active games.
  *
  * @return A JS array containing all known games
  */
 CScriptValRooted XmppClient::GUIGetGameList()
 {
 	CScriptValRooted gameList;
 	m_ScriptInterface.Eval("([])", gameList);
 	for(std::vector<const glooxwrapper::Tag*>::const_iterator it = m_GameList.begin(); it != m_GameList.end(); ++it)
 	{
 		CScriptValRooted game;
 		m_ScriptInterface.Eval("({})", game);
 
 		const char* stats[] = { "name", "ip", "state", "nbp", "tnbp", "players", "mapName", "niceMapName", "mapSize", "mapType", "victoryCondition" };
 		short stats_length = 11;
 		for (short i = 0; i < stats_length; i++)
 			m_ScriptInterface.SetProperty(game.get(), stats[i], (*it)->findAttribute(stats[i]).c_str());
 
 		m_ScriptInterface.CallFunctionVoid(gameList.get(), "push", game);
 	}
 
 	return gameList;
 }
 
 /**
  * Handle requests from the GUI for leaderboard data.
  *
  * @return A JS array containing all known leaderboard data
  */
 CScriptValRooted XmppClient::GUIGetBoardList()
 {
 	CScriptValRooted boardList;
 	m_ScriptInterface.Eval("([])", boardList);
 	for(std::vector<const glooxwrapper::Tag*>::const_iterator it = m_BoardList.begin(); it != m_BoardList.end(); ++it)
 	{
 		CScriptValRooted board;
 		m_ScriptInterface.Eval("({})", board);
 
 		const char* attributes[] = { "name", "rank", "rating" };
 		short attributes_length = 3;
 		for (short i = 0; i < attributes_length; i++)
 			m_ScriptInterface.SetProperty(board.get(), attributes[i], (*it)->findAttribute(attributes[i]).c_str());
 
 		m_ScriptInterface.CallFunctionVoid(boardList.get(), "push", board);
 	}
 
 	return boardList;
 }
 
 /*****************************************************
  * Message interfaces                                *
  *****************************************************/
 
 /**
  * Send GUI message queue when queried.
  */
 CScriptValRooted XmppClient::GuiPollMessage()
 {
 	if (m_GuiMessageQueue.empty())
 		return CScriptValRooted();
 
 	CScriptValRooted r = m_GuiMessageQueue.front();
 	m_GuiMessageQueue.pop_front();
 	return r;
 }
 
 /**
  * Send a standard MUC textual message.
  */
 void XmppClient::SendMUCMessage(const std::string& message)
 {
 	m_mucRoom->send(message);
 }
 
 /**
  * Push a message onto the GUI queue.
  *
  * @param message Message to add to the queue
  */
 void XmppClient::PushGuiMessage(const CScriptValRooted& message)
 {
 	ENSURE(!message.undefined());
 	m_GuiMessageQueue.push_back(message);
 }
 
 /**
  * Handle a standard MUC textual message.
  */
 void XmppClient::handleMUCMessage(glooxwrapper::MUCRoom*, const glooxwrapper::Message& msg, bool)
 {
 	DbgXMPP(msg.from().resource() << " said " << msg.body());
 
 	CScriptValRooted message;
 	m_ScriptInterface.Eval("({ 'type':'mucmessage'})", message);
 	m_ScriptInterface.SetProperty(message.get(), "from", msg.from().resource().to_string());
 	m_ScriptInterface.SetProperty(message.get(), "text", msg.body().to_string());
 	PushGuiMessage(message);
 }
 
 /**
  * Handle a standard textual message.
  */
 void XmppClient::handleMessage(const glooxwrapper::Message& msg, glooxwrapper::MessageSession *)
 {
 	DbgXMPP("type " << msg.subtype() << ", subject " << msg.subject()
 	  << ", message " << msg.body() << ", thread id " << msg.thread());
 
 	CScriptValRooted message;
 	m_ScriptInterface.Eval("({'type':'message'})", message);
 	m_ScriptInterface.SetProperty(message.get(), "from", msg.from().username().to_string());
 	m_ScriptInterface.SetProperty(message.get(), "text", msg.body().to_string());
 	PushGuiMessage(message);
 }
 
 /**
  * Handle portions of messages containing custom stanza extensions.
  */
 bool XmppClient::handleIq(const glooxwrapper::IQ& iq)
 {
 	DbgXMPP("handleIq [" << tag_xml(iq) << "]");
 
 	if(iq.subtype() == gloox::IQ::Result)
 	{
 		const GameListQuery* gq = iq.findExtension<GameListQuery>( ExtGameListQuery );
 		const BoardListQuery* bq = iq.findExtension<BoardListQuery>( ExtBoardListQuery );
 		if(gq)
 		{
 			for(std::vector<const glooxwrapper::Tag*>::const_iterator it = m_GameList.begin(); it != m_GameList.end(); ++it )
 				glooxwrapper::Tag::free(*it);
 			m_GameList.clear();
 
 			for(std::vector<const glooxwrapper::Tag*>::const_iterator it = gq->m_GameList.begin(); it != gq->m_GameList.end(); ++it)
 				m_GameList.push_back( (*it)->clone() );
 
 			CreateSimpleMessage("system", "gamelist updated", "internal");
 		}
 		if(bq)
 		{
 			for(std::vector<const glooxwrapper::Tag*>::const_iterator it = m_BoardList.begin(); it != m_BoardList.end(); ++it )
 				glooxwrapper::Tag::free(*it);
 			m_BoardList.clear();
 
 			for(std::vector<const glooxwrapper::Tag*>::const_iterator it = bq->m_BoardList.begin(); it != bq->m_BoardList.end(); ++it)
 				m_BoardList.push_back( (*it)->clone() );
 
 			CreateSimpleMessage("system", "boardlist updated", "internal");
 		}
 	}
 	else if(iq.subtype() == gloox::IQ::Error)
 	{
 		gloox::StanzaError err = iq.error_error();
 		std::string msg = StanzaErrorToString(err);
 		CreateSimpleMessage("system", msg, "error");
 	}
 	else
 	{
 		CreateSimpleMessage("system", std::string("unknown subtype : ") + tag_name(iq), "error");
 	}
 
 	return true;
 }
 
 /**
  * Create a new detail message for the GUI.
  *
  * @param type General message type
  * @param level Detailed message type
  * @param text Body of the message
  * @param data Optional field, used for auxiliary data
  */
 void XmppClient::CreateSimpleMessage(const std::string& type, const std::string& text, const std::string& level, const std::string& data)
 {
 	CScriptValRooted message;
 	m_ScriptInterface.Eval("({})", message);
 	m_ScriptInterface.SetProperty(message.get(), "type", type);
 	m_ScriptInterface.SetProperty(message.get(), "level", level);
 	m_ScriptInterface.SetProperty(message.get(), "text", text);
 	m_ScriptInterface.SetProperty(message.get(), "data", data);
 	PushGuiMessage(message);
 }
 
 /*****************************************************
  * Presence and nickname                             *
  *****************************************************/
 
 /**
  * Update local data when a user changes presence.
  */
 void XmppClient::handleMUCParticipantPresence(glooxwrapper::MUCRoom*, const glooxwrapper::MUCRoomParticipant participant, const glooxwrapper::Presence& presence)
 {
 	//std::string jid = participant.jid->full();
 	std::string nick = participant.nick->resource().to_string();
 	gloox::Presence::PresenceType presenceType = presence.presence();
 	if (presenceType == gloox::Presence::Unavailable)
 	{
 		if (!participant.newNick.empty() && (participant.flags & (gloox::UserNickChanged | gloox::UserSelf)))
 		{
 			// we have a nick change
 			m_PlayerMap[participant.newNick.to_string()] = gloox::Presence::Unavailable;
 			CreateSimpleMessage("muc", nick, "nick", participant.newNick.to_string());
 		}
 		else
 			CreateSimpleMessage("muc", nick, "leave");
 
 		DbgXMPP(nick << " left the room");
 		m_PlayerMap.erase(nick);
 	}
 	else
 	{
 		if (m_PlayerMap.find(nick) == m_PlayerMap.end())
 			CreateSimpleMessage("muc", nick, "join");
 		else
 			CreateSimpleMessage("muc", nick, "presence");
 
 		DbgXMPP(nick << " is in the room, presence : " << (int)presenceType);
 		m_PlayerMap[nick] = presenceType;
 	}
 }
 
 /**
  * Request nick change, real change via mucRoomHandler.
  *
  * @param nick Desired nickname
  */
 void XmppClient::SetNick(const std::string& nick)
 {
 	m_mucRoom->setNick(nick);
 }
 
 /**
  * Get current nickname.
  *
  * @param nick Variable to store the nickname in.
  */
 void XmppClient::GetNick(std::string& nick)
 {
 	nick = m_mucRoom->nick().to_string();
 }
 
 /**
  * Kick a player from the current room.
  *
  * @param nick Nickname to be kicked
  * @param reason Reason the player was kicked
  */
 void XmppClient::kick(const std::string& nick, const std::string& reason)
 {
 	m_mucRoom->kick(nick, reason);
 }
 
 /**
  * Ban a player from the current room.
  *
  * @param nick Nickname to be banned
  * @param reason Reason the player was banned
  */
 void XmppClient::ban(const std::string& nick, const std::string& reason)
 {
 	m_mucRoom->ban(nick, reason);
 }
 
 /**
  * Change the xmpp presence of the client.
  *
  * @param presence A string containing the desired presence
  */
 void XmppClient::SetPresence(const std::string& presence)
 {
 #define IF(x,y) if (presence == x) m_mucRoom->setPresence(gloox::Presence::y)
 	IF("available", Available);
 	else IF("chat", Chat);
 	else IF("away", Away);
 	else IF("playing", DND);
 	else IF("gone", XA);
 	else IF("offline", Unavailable);
 	// The others are not to be set
 #undef IF
 	else LOGERROR(L"Unknown presence '%hs'", presence.c_str());
 }
 
 /**
  * Get the current xmpp presence of the given nick.
  *
  * @param nick Nickname to look up presence for
  * @param presence Variable to store the presence in
  */
 void XmppClient::GetPresence(const std::string& nick, std::string& presence)
 {
 	if (m_PlayerMap.find(nick) != m_PlayerMap.end())
 		GetPresenceString(m_PlayerMap[nick], presence);
 	else
 		presence = "offline";
 }
 
 /*****************************************************
  * Utilities                                         *
  *****************************************************/
 
 /**
  * Convert a gloox presence type to string.
  *
  * @param p Presence to be converted
  * @param presence Variable to store the converted presence string in
  */
 void XmppClient::GetPresenceString(const gloox::Presence::PresenceType p, std::string& presence) const
 {
 	switch(p)
 	{
 #define CASE(x,y) case gloox::Presence::x: presence = y; break
 	CASE(Available, "available");
 	CASE(Chat, "chat");
 	CASE(Away, "away");
 	CASE(DND, "playing");
 	CASE(XA, "gone");
 	CASE(Unavailable, "offline");
 	CASE(Probe, "probe");
 	CASE(Error, "error");
 	CASE(Invalid, "invalid");
 	default:
 		LOGERROR(L"Unknown presence type '%d'", (int)p);
 		break;
 #undef CASE
 	}
 }
 
 /**
  * Convert a gloox stanza error type to string.
  *
  * @param err Error to be converted
  * @return Converted error string
  */
 std::string XmppClient::StanzaErrorToString(gloox::StanzaError err)
 {
 	std::string msg;
 #define CASE(X, Y) case gloox::X: return Y
 	switch (err)
 	{
 	CASE(StanzaErrorBadRequest, "Bad request");
 	CASE(StanzaErrorConflict, "Player name already in use");
 	CASE(StanzaErrorFeatureNotImplemented, "Feature not implemented");
 	CASE(StanzaErrorForbidden, "Forbidden");
 	CASE(StanzaErrorGone, "Recipient or server gone");
 	CASE(StanzaErrorInternalServerError, "Internal server error");
 	CASE(StanzaErrorItemNotFound, "Item not found");
 	CASE(StanzaErrorJidMalformed, "Jid malformed");
 	CASE(StanzaErrorNotAcceptable, "Not acceptable");
 	CASE(StanzaErrorNotAllowed, "Not allowed");
 	CASE(StanzaErrorNotAuthorized, "Not authorized");
 	CASE(StanzaErrorNotModified, "Not modified");
 	CASE(StanzaErrorPaymentRequired, "Payment required");
 	CASE(StanzaErrorRecipientUnavailable, "Recipient unavailable");
 	CASE(StanzaErrorRedirect, "Redirect");
 	CASE(StanzaErrorRegistrationRequired, "Registration required");
 	CASE(StanzaErrorRemoteServerNotFound, "Remote server not found");
 	CASE(StanzaErrorRemoteServerTimeout, "Remote server timeout");
 	CASE(StanzaErrorResourceConstraint, "Resource constraint");
 	CASE(StanzaErrorServiceUnavailable, "Service unavailable");
 	CASE(StanzaErrorSubscribtionRequired, "Subscribtion Required");
 	CASE(StanzaErrorUndefinedCondition, "Undefined condition");
 	CASE(StanzaErrorUnexpectedRequest, "Unexpected request");
 	CASE(StanzaErrorUnknownSender, "Unknown sender");
 	default:
 		return "Error undefined";
 	}
 #undef CASE
 }
Index: ps/trunk/source/ps/GameSetup/GameSetup.cpp
===================================================================
--- ps/trunk/source/ps/GameSetup/GameSetup.cpp	(revision 14112)
+++ ps/trunk/source/ps/GameSetup/GameSetup.cpp	(revision 14113)
@@ -1,1350 +1,1348 @@
 /* Copyright (C) 2013 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "lib/app_hooks.h"
 #include "lib/config2.h"
 #include "lib/input.h"
 #include "lib/ogl.h"
 #include "lib/timer.h"
 #include "lib/external_libraries/libsdl.h"
 #include "lib/file/common/file_stats.h"
 #include "lib/res/h_mgr.h"
 #include "lib/res/graphics/cursor.h"
 #include "lib/sysdep/cursor.h"
 #include "lib/sysdep/cpu.h"
 #include "lib/sysdep/gfx.h"
 #include "lib/sysdep/os_cpu.h"
 #include "lib/tex/tex.h"
 #if OS_WIN
 #include "lib/sysdep/os/win/wversion.h"
 #endif
 
 #include "graphics/CinemaTrack.h"
 #include "graphics/FontMetrics.h"
 #include "graphics/GameView.h"
 #include "graphics/LightEnv.h"
 #include "graphics/MapReader.h"
 #include "graphics/MaterialManager.h"
 #include "graphics/TerrainTextureManager.h"
 #include "gui/GUI.h"
 #include "gui/GUIManager.h"
 #include "gui/scripting/JSInterface_IGUIObject.h"
 #include "gui/scripting/JSInterface_GUITypes.h"
 #include "gui/scripting/ScriptFunctions.h"
 #include "maths/MathUtil.h"
 #include "network/NetServer.h"
 #include "network/NetClient.h"
 
 #include "ps/CConsole.h"
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/GameSetup/Atlas.h"
 #include "ps/GameSetup/GameSetup.h"
 #include "ps/GameSetup/Paths.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/GameSetup/CmdLineArgs.h"
 #include "ps/GameSetup/HWDetect.h"
 #include "ps/Globals.h"
 #include "ps/Hotkey.h"
 #include "ps/Joystick.h"
 #include "ps/Loader.h"
 #include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "ps/ProfileViewer.h"
 #include "ps/Profiler2.h"
 #include "ps/Pyrogenesis.h"	// psSetLogDir
 #include "ps/scripting/JSInterface_Console.h"
 #include "ps/TouchInput.h"
 #include "ps/UserReport.h"
 #include "ps/Util.h"
 #include "ps/VideoMode.h"
 #include "ps/World.h"
 
 #include "renderer/Renderer.h"
 #include "renderer/VertexBufferManager.h"
 #include "renderer/ModelRenderer.h"
 #include "scripting/ScriptingHost.h"
 #include "scripting/ScriptGlue.h"
 #include "scriptinterface/DebuggingServer.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/ScriptStats.h"
 #include "simulation2/Simulation2.h"
 #include "lobby/IXmppClient.h"
 #include "soundmanager/scripting/JSInterface_Sound.h"
 #include "soundmanager/ISoundManager.h"
 #include "tools/atlas/GameInterface/GameLoop.h"
 #include "tools/atlas/GameInterface/View.h"
 
 #if !(OS_WIN || OS_MACOSX || OS_ANDROID) // assume all other platforms use X11 for wxWidgets
 #define MUST_INIT_X11 1
 #include <X11/Xlib.h>
 #else
 #define MUST_INIT_X11 0
 #endif
 
 #if OS_WIN
 extern void wmi_Shutdown();
 #endif
 
 #include <iostream>
 
 ERROR_GROUP(System);
 ERROR_TYPE(System, SDLInitFailed);
 ERROR_TYPE(System, VmodeFailed);
 ERROR_TYPE(System, RequiredExtensionsMissing);
 
 bool g_DoRenderGui = true;
 bool g_DoRenderLogger = true;
 bool g_DoRenderCursor = true;
 
 static const int SANE_TEX_QUALITY_DEFAULT = 5;	// keep in sync with code
 
 static void SetTextureQuality(int quality)
 {
 	int q_flags;
 	GLint filter;
 
 retry:
 	// keep this in sync with SANE_TEX_QUALITY_DEFAULT
 	switch(quality)
 	{
 		// worst quality
 	case 0:
 		q_flags = OGL_TEX_HALF_RES|OGL_TEX_HALF_BPP;
 		filter = GL_NEAREST;
 		break;
 		// [perf] add bilinear filtering
 	case 1:
 		q_flags = OGL_TEX_HALF_RES|OGL_TEX_HALF_BPP;
 		filter = GL_LINEAR;
 		break;
 		// [vmem] no longer reduce resolution
 	case 2:
 		q_flags = OGL_TEX_HALF_BPP;
 		filter = GL_LINEAR;
 		break;
 		// [vmem] add mipmaps
 	case 3:
 		q_flags = OGL_TEX_HALF_BPP;
 		filter = GL_NEAREST_MIPMAP_LINEAR;
 		break;
 		// [perf] better filtering
 	case 4:
 		q_flags = OGL_TEX_HALF_BPP;
 		filter = GL_LINEAR_MIPMAP_LINEAR;
 		break;
 		// [vmem] no longer reduce bpp
 	case SANE_TEX_QUALITY_DEFAULT:
 		q_flags = OGL_TEX_FULL_QUALITY;
 		filter = GL_LINEAR_MIPMAP_LINEAR;
 		break;
 		// [perf] add anisotropy
 	case 6:
 		// TODO: add anisotropic filtering
 		q_flags = OGL_TEX_FULL_QUALITY;
 		filter = GL_LINEAR_MIPMAP_LINEAR;
 		break;
 		// invalid
 	default:
 		debug_warn(L"SetTextureQuality: invalid quality");
 		quality = SANE_TEX_QUALITY_DEFAULT;
 		// careful: recursion doesn't work and we don't want to duplicate
 		// the "sane" default values.
 		goto retry;
 	}
 
 	ogl_tex_set_defaults(q_flags, filter);
 }
 
 
 //----------------------------------------------------------------------------
 // GUI integration
 //----------------------------------------------------------------------------
 
 // display progress / description in loading screen
 void GUI_DisplayLoadProgress(int percent, const wchar_t* pending_task)
 {
 	g_ScriptingHost.GetScriptInterface().SetGlobal("g_Progress", percent, true);
 	g_ScriptingHost.GetScriptInterface().SetGlobal("g_LoadDescription", pending_task, true);
 	g_GUI->SendEventToAll("progress");
 }
 
 
 
 void Render()
 {
 	PROFILE3("render");
 
 	if (g_SoundManager)
 		g_SoundManager->IdleTask();
 
 	ogl_WarnIfError();
 
 	g_Profiler2.RecordGPUFrameStart();
 
 	ogl_WarnIfError();
 
 	// prepare before starting the renderer frame
 	if (g_Game && g_Game->IsGameStarted())
 		g_Game->GetView()->BeginFrame();
 
 	if (g_Game)
 		g_Renderer.SetSimulation(g_Game->GetSimulation2());
 
 	// start new frame
 	g_Renderer.BeginFrame();
 
 	ogl_WarnIfError();
 
 	if (g_Game && g_Game->IsGameStarted())
 		g_Game->GetView()->Render();
 
 	ogl_WarnIfError();
 
 	g_Renderer.RenderTextOverlays();
 
 	if (g_DoRenderGui)
 		g_GUI->Draw();
 
 	ogl_WarnIfError();
 
 	// If we're in Atlas game view, render special overlays (e.g. editor bandbox)
 	if (g_AtlasGameLoop && g_AtlasGameLoop->view)
 	{
 		g_AtlasGameLoop->view->DrawOverlays();
 		ogl_WarnIfError();
 	}
 
 	// Text:
 
  	glDisable(GL_DEPTH_TEST);
 
 	g_Console->Render();
 
 	ogl_WarnIfError();
 
 	if (g_DoRenderLogger)
 		g_Logger->Render();
 
 	ogl_WarnIfError();
 
 	// Profile information
 
 	g_ProfileViewer.RenderProfile();
 
 	ogl_WarnIfError();
 
 	// Draw the cursor (or set the Windows cursor, on Windows)
 	if (g_DoRenderCursor)
 	{
 		PROFILE3_GPU("cursor");
 		CStrW cursorName = g_CursorName;
 		if (cursorName.empty())
 		{
 			cursor_draw(g_VFS, NULL, g_mouse_x, g_yres-g_mouse_y, false);
 		}
 		else
 		{
 			bool forceGL = false;
 			CFG_GET_VAL("nohwcursor", Bool, forceGL);
 
 #if CONFIG2_GLES
 #warning TODO: implement cursors for GLES
 #else
 			// set up transform for GL cursor
 			glMatrixMode(GL_PROJECTION);
 			glPushMatrix();
 			glLoadIdentity();
 			glMatrixMode(GL_MODELVIEW);
 			glPushMatrix();
 			glLoadIdentity();
 			CMatrix3D transform;
 			transform.SetOrtho(0.f, (float)g_xres, 0.f, (float)g_yres, -1.f, 1000.f);
 			glLoadMatrixf(&transform._11);
 #endif
 
 #if OS_ANDROID
 #warning TODO: cursors for Android
 #else
 			if (cursor_draw(g_VFS, cursorName.c_str(), g_mouse_x, g_yres-g_mouse_y, forceGL) < 0)
 				LOGWARNING(L"Failed to draw cursor '%ls'", cursorName.c_str());
 #endif
 
 #if CONFIG2_GLES
 #warning TODO: implement cursors for GLES
 #else
 			// restore transform
 			glMatrixMode(GL_PROJECTION);
 			glPopMatrix();
 			glMatrixMode(GL_MODELVIEW);
 			glPopMatrix();
 #endif
 		}
 	}
 
 	glEnable(GL_DEPTH_TEST);
 
 	g_Renderer.EndFrame();
 
 	PROFILE2_ATTR("draw calls: %d", (int)g_Renderer.GetStats().m_DrawCalls);
 	PROFILE2_ATTR("terrain tris: %d", (int)g_Renderer.GetStats().m_TerrainTris);
 	PROFILE2_ATTR("water tris: %d", (int)g_Renderer.GetStats().m_WaterTris);
 	PROFILE2_ATTR("model tris: %d", (int)g_Renderer.GetStats().m_ModelTris);
 	PROFILE2_ATTR("overlay tris: %d", (int)g_Renderer.GetStats().m_OverlayTris);
 	PROFILE2_ATTR("blend splats: %d", (int)g_Renderer.GetStats().m_BlendSplats);
 	PROFILE2_ATTR("particles: %d", (int)g_Renderer.GetStats().m_Particles);
 
 	ogl_WarnIfError();
 
 	g_Profiler2.RecordGPUFrameEnd();
 
 	ogl_WarnIfError();
 }
 
 
 static void RegisterJavascriptInterfaces()
 {
 	// GUI
 	CGUI::ScriptingInit();
 
 	GuiScriptingInit(g_ScriptingHost.GetScriptInterface());
 	JSI_Sound::RegisterScriptFunctions(g_ScriptingHost.GetScriptInterface());
 }
 
 
 static void InitScripting()
 {
 	TIMER(L"InitScripting");
 
 	// Create the scripting host.  This needs to be done before the GUI is created.
 	// [7ms]
 	new ScriptingHost;
 	
 	RegisterJavascriptInterfaces();
 }
 
 
 static size_t OperatingSystemFootprint()
 {
 #if OS_WIN
 	switch(wversion_Number())
 	{
 	case WVERSION_2K:
 	case WVERSION_XP:
 		return 150;
 	case WVERSION_XP64:
 		return 200;
 	default:	// newer Windows version: assume the worst, and don't warn
 	case WVERSION_VISTA:
 		return 300;
 	case WVERSION_7:
 		return 250;
 	}
 #else
 	return 200;
 #endif
 }
 
 static size_t ChooseCacheSize()
 {
 	// (all sizes in MiB and signed to allow temporarily negative computations)
 
 	const ssize_t total = (ssize_t)os_cpu_MemorySize();
 	// (NB: os_cpu_MemoryAvailable is useless on Linux because free memory
 	// is marked as "in use" by OS caches.)
 	const ssize_t os = (ssize_t)OperatingSystemFootprint();
 	const ssize_t game = 300;	// estimated working set
 
 	ssize_t cache = 500;	// upper bound: total size of our data
 
 	// the cache reserves contiguous address space, which is a precious
 	// resource on 32-bit systems, so don't use too much:
 	if(ARCH_IA32 || sizeof(void*) == 4)
 		cache = std::min(cache, (ssize_t)200);
 
 	// try to leave over enough memory for the OS and game
 	cache = std::min(cache, total-os-game);
 
 	// always provide at least this much to ensure correct operation
 	cache = std::max(cache, (ssize_t)64);
 
 	debug_printf(L"Cache: %d (total: %d) MiB\n", (int)cache, (int)total);
 	return size_t(cache)*MiB;
 }
 
 
 ErrorReactionInternal psDisplayError(const wchar_t* UNUSED(text), size_t UNUSED(flags))
 {
 	// If we're fullscreen, then sometimes (at least on some particular drivers on Linux)
 	// displaying the error dialog hangs the desktop since the dialog box is behind the
 	// fullscreen window. So we just force the game to windowed mode before displaying the dialog.
 	// (But only if we're in the main thread, and not if we're being reentrant.)
 	if (ThreadUtil::IsMainThread())
 	{
 		static bool reentering = false;
 		if (!reentering)
 		{
 			reentering = true;
 			g_VideoMode.SetFullscreen(false);
 			reentering = false;
 		}
 	}
 
 	// We don't actually implement the error display here, so return appropriately
 	return ERI_NOT_IMPLEMENTED;
 }
 
 static std::vector<CStr> GetMods(const CmdLineArgs& args, bool dev)
 {
 	std::vector<CStr> mods = args.GetMultiple("mod");
 	// TODO: It would be nice to remove this hard-coding
 	mods.insert(mods.begin(), "public");
 
 	// Add the user mod if not explicitly disabled or we have a dev copy so
 	// that saved files end up in version control and not in the user mod.
 	if (!dev && !args.Has("noUserMod"))
 		mods.push_back("user");
 
 	return mods;
 }
 
 static void InitVfs(const CmdLineArgs& args, int flags)
 {
 	TIMER(L"InitVfs");
 
 	const bool setup_error = (flags & INIT_HAVE_DISPLAY_ERROR) == 0;
 
 	const Paths paths(args);
 
 	OsPath logs(paths.Logs());
 	CreateDirectories(logs, 0700);
 
 	psSetLogDir(logs);
 	// desired location for crashlog is now known. update AppHooks ASAP
 	// (particularly before the following error-prone operations):
 	AppHooks hooks = {0};
 	hooks.bundle_logs = psBundleLogs;
 	hooks.get_log_dir = psLogDir;
 	if (setup_error)
 		hooks.display_error = psDisplayError;
 	app_hooks_update(&hooks);
 
 	const size_t cacheSize = ChooseCacheSize();
 	g_VFS = CreateVfs(cacheSize);
 	
 	// Work out whether we are a dev version to make sure saved files
 	// (maps, etc) end up in version control.
 	const OsPath readonlyConfig = paths.RData()/"config"/"";
 	g_VFS->Mount(L"config/", readonlyConfig);
 	bool dev = (g_VFS->GetFileInfo(L"config/dev.cfg", NULL) == INFO::OK);
 
 	const std::vector<CStr> mods = GetMods(args, dev);
 
 	OsPath modPath = paths.RData()/"mods";
 	OsPath modUserPath = paths.UserData()/"mods";
 	for (size_t i = 0; i < mods.size(); ++i)
 	{
 		size_t priority = (i+1)*2;	// mods are higher priority than regular mountings, which default to priority 0
 		size_t userFlags = VFS_MOUNT_WATCH|VFS_MOUNT_ARCHIVABLE|VFS_MOUNT_REPLACEABLE;
 		size_t baseFlags = userFlags|VFS_MOUNT_MUST_EXIST;
 		
 		OsPath modName(mods[i]);
 		if (dev)
 		{
 			// We are running a dev copy, so only mount mods in the user mod path
 			// if the mod does not exist in the data path.
 			if (DirectoryExists(modPath / modName/""))
 				g_VFS->Mount(L"", modPath / modName/"", baseFlags, priority);
 			else
 				g_VFS->Mount(L"", modUserPath / modName/"", userFlags, priority);
 		}
 		else
 		{
 			g_VFS->Mount(L"", modPath / modName/"", baseFlags, priority);
 			// Ensure that user modified files are loaded, if they are present
 			g_VFS->Mount(L"", modUserPath / modName/"", userFlags, priority+1);
 		}
 	}
 
 	// We mount these dirs last as otherwise writing could result in files being placed in a mod's dir.
 	g_VFS->Mount(L"screenshots/", paths.UserData()/"screenshots"/"");
 	g_VFS->Mount(L"saves/", paths.UserData()/"saves"/"", VFS_MOUNT_WATCH);
 	// Mounting with highest priority, so that a mod supplied user.cfg is harmless
 	g_VFS->Mount(L"config/", readonlyConfig, 0, (size_t)-1);
 	if(readonlyConfig != paths.Config())
 		g_VFS->Mount(L"config/", paths.Config(), 0, (size_t)-1);
 
 	g_VFS->Mount(L"cache/", paths.Cache(), VFS_MOUNT_ARCHIVABLE);	// (adding XMBs to archive speeds up subsequent reads)
 
 	// note: don't bother with g_VFS->TextRepresentation - directories
 	// haven't yet been populated and are empty.
 }
 
 
 static void InitPs(bool setup_gui, const CStrW& gui_page, CScriptVal initData)
 {
 	{
 		// console
 		TIMER(L"ps_console");
 
 		g_Console->UpdateScreenSize(g_xres, g_yres);
 
 		// Calculate and store the line spacing
 		CFontMetrics font(CStrIntern(CONSOLE_FONT));
 		g_Console->m_iFontHeight = font.GetLineSpacing();
 		g_Console->m_iFontWidth = font.GetCharacterWidth(L'C');
 		g_Console->m_charsPerPage = (size_t)(g_xres / g_Console->m_iFontWidth);
 		// Offset by an arbitrary amount, to make it fit more nicely
 		g_Console->m_iFontOffset = 7;
 
 		double blinkRate = 0.5;
 		CFG_GET_VAL("gui.cursorblinkrate", Double, blinkRate);
 		g_Console->SetCursorBlinkRate(blinkRate);
 	}
 
 	// hotkeys
 	{
 		TIMER(L"ps_lang_hotkeys");
 		LoadHotkeys();
 	}
 
 	if (!setup_gui)
 	{
 		// We do actually need *some* kind of GUI loaded, so use the
 		// (currently empty) Atlas one
 		g_GUI->SwitchPage(L"page_atlas.xml", initData);
 		return;
 	}
 
 	// GUI uses VFS, so this must come after VFS init.
 	g_GUI->SwitchPage(gui_page, initData);
 }
 
 
 static void InitInput()
 {
 #if !SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 #endif
 
 	g_Joystick.Initialise();
 
 	// register input handlers
 	// This stack is constructed so the first added, will be the last
 	//  one called. This is important, because each of the handlers
 	//  has the potential to block events to go further down
 	//  in the chain. I.e. the last one in the list added, is the
 	//  only handler that can block all messages before they are
 	//  processed.
 	in_add_handler(game_view_handler);
 
 	in_add_handler(CProfileViewer::InputThunk);
 
 	in_add_handler(conInputHandler);
 
 	in_add_handler(HotkeyInputHandler);
 
 	// gui_handler needs to be registered after (i.e. called before!) the
 	// hotkey handler so that input boxes can be typed in without
 	// setting off hotkeys.
 	in_add_handler(gui_handler);
 
 	in_add_handler(touch_input_handler);
 
 	// must be registered after (called before) the GUI which relies on these globals
 	in_add_handler(GlobalsInputHandler);
 }
 
 
 static void ShutdownPs()
 {
 	SAFE_DELETE(g_GUI);
 
 	SAFE_DELETE(g_Console);
 
 	// disable the special Windows cursor, or free textures for OGL cursors
 	cursor_draw(g_VFS, 0, g_mouse_x, g_yres-g_mouse_y, false);
 }
 
 
 static void InitRenderer()
 {
 	TIMER(L"InitRenderer");
 
 	if(g_NoGLS3TC)
 		ogl_tex_override(OGL_TEX_S3TC, OGL_TEX_DISABLE);
 	if(g_NoGLAutoMipmap)
 		ogl_tex_override(OGL_TEX_AUTO_MIPMAP_GEN, OGL_TEX_DISABLE);
 
 	// create renderer
 	new CRenderer;
 
 	// set renderer options from command line options - NOVBO must be set before opening the renderer
 	g_Renderer.SetOptionBool(CRenderer::OPT_NOVBO, g_NoGLVBO);
 	g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWS, g_Shadows);
 
 	g_Renderer.SetOptionBool(CRenderer::OPT_WATERNORMAL, g_WaterNormal);
 	g_Renderer.SetOptionBool(CRenderer::OPT_WATERREALDEPTH, g_WaterRealDepth);
 	g_Renderer.SetOptionBool(CRenderer::OPT_WATERFOAM, g_WaterFoam);
 	g_Renderer.SetOptionBool(CRenderer::OPT_WATERCOASTALWAVES, g_WaterCoastalWaves);
 	g_Renderer.SetOptionBool(CRenderer::OPT_WATERREFLECTION, g_WaterReflection);
 	g_Renderer.SetOptionBool(CRenderer::OPT_WATERREFRACTION, g_WaterRefraction);
 	g_Renderer.SetOptionBool(CRenderer::OPT_WATERSHADOW, g_WaterShadows);
 	
 	g_Renderer.SetRenderPath(CRenderer::GetRenderPathByName(g_RenderPath));
 	g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWPCF, g_ShadowPCF);
 	g_Renderer.SetOptionBool(CRenderer::OPT_PARTICLES, g_Particles);
 	g_Renderer.SetOptionBool(CRenderer::OPT_SILHOUETTES, g_Silhouettes);
 	g_Renderer.SetOptionBool(CRenderer::OPT_SHOWSKY, g_ShowSky);
 
 	// create terrain related stuff
 	new CTerrainTextureManager;
 
 	g_Renderer.Open(g_xres, g_yres);
 
 	// Setup lighting environment. Since the Renderer accesses the
 	// lighting environment through a pointer, this has to be done before
 	// the first Frame.
 	g_Renderer.SetLightEnv(&g_LightEnv);
 
 	// I haven't seen the camera affecting GUI rendering and such, but the
 	// viewport has to be updated according to the video mode
 	SViewPort vp;
 	vp.m_X = 0;
 	vp.m_Y = 0;
 	vp.m_Width = g_xres;
 	vp.m_Height = g_yres;
 	g_Renderer.SetViewport(vp);
 
 	ColorActivateFastImpl();
 	ModelRenderer::Init();
 }
 
 static void InitSDL()
 {
 #if OS_LINUX
 	// In fullscreen mode when SDL is compiled with DGA support, the mouse
 	// sensitivity often appears to be unusably wrong (typically too low).
 	// (This seems to be reported almost exclusively on Ubuntu, but can be
 	// reproduced on Gentoo after explicitly enabling DGA.)
 	// Disabling the DGA mouse appears to fix that problem, and doesn't
 	// have any obvious negative effects.
 	setenv("SDL_VIDEO_X11_DGAMOUSE", "0", 0);
 #endif
 
 	if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_NOPARACHUTE) < 0)
 	{
 		LOGERROR(L"SDL library initialization failed: %hs", SDL_GetError());
 		throw PSERROR_System_SDLInitFailed();
 	}
 	atexit(SDL_Quit);
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_StartTextInput();
 #else
 	SDL_EnableUNICODE(1);
 #endif
 }
 
 static void ShutdownSDL()
 {
 	SDL_Quit();
 	sys_cursor_reset();
 }
 
 
 void EndGame()
 {
 	SAFE_DELETE(g_NetServer);
 	SAFE_DELETE(g_NetClient);
 	SAFE_DELETE(g_Game);
 
 	ISoundManager::CloseGame();
 }
 
 
 void Shutdown(int UNUSED(flags))
 {
 	EndGame();
 
-	#if CONFIG2_LOBBY
-		SAFE_DELETE(g_XmppClient);
-	#endif
+	SAFE_DELETE(g_XmppClient);
 
 	ShutdownPs(); // Must delete g_GUI before g_ScriptingHost
 
 	in_reset_handlers();
 
 	TIMER_BEGIN(L"shutdown TexMan");
 	delete &g_TexMan;
 	TIMER_END(L"shutdown TexMan");
 
 	// destroy renderer
 	TIMER_BEGIN(L"shutdown Renderer");
 	delete &g_Renderer;
 	g_VBMan.Shutdown();
 	TIMER_END(L"shutdown Renderer");
 
 	tex_codec_unregister_all();
 
 	g_Profiler2.ShutdownGPU();
 
 	// Free cursors before shutting down SDL, as they may depend on SDL.
 	cursor_shutdown();
 
 	TIMER_BEGIN(L"shutdown SDL");
 	ShutdownSDL();
 	TIMER_END(L"shutdown SDL");
 
 	g_VideoMode.Shutdown();
 
 	TIMER_BEGIN(L"shutdown UserReporter");
 	g_UserReporter.Deinitialize();
 	TIMER_END(L"shutdown UserReporter");
 
 	TIMER_BEGIN(L"shutdown ScriptingHost");
 	delete &g_ScriptingHost;
 	delete g_DebuggingServer;
 	TIMER_END(L"shutdown ScriptingHost");
 
 	TIMER_BEGIN(L"shutdown ConfigDB");
 	delete &g_ConfigDB;
 	TIMER_END(L"shutdown ConfigDB");
 
 	// resource
 	// first shut down all resource owners, and then the handle manager.
 	TIMER_BEGIN(L"resource modules");
 
 		ISoundManager::SetEnabled(false);
 
 		g_VFS.reset();
 
 		// this forcibly frees all open handles (thus preventing real leaks),
 		// and makes further access to h_mgr impossible.
 		h_mgr_shutdown();
 
 		file_stats_dump();
 
 	TIMER_END(L"resource modules");
 
 	TIMER_BEGIN(L"shutdown misc");
 		timer_DisplayClientTotals();
 
 		CNetHost::Deinitialize();
 
 		SAFE_DELETE(g_ScriptStatsTable);
 
 		// should be last, since the above use them
 		SAFE_DELETE(g_Logger);
 		delete &g_Profiler;
 		delete &g_ProfileViewer;
 	TIMER_END(L"shutdown misc");
 
 #if OS_WIN
 	TIMER_BEGIN(L"shutdown wmi");
 	wmi_Shutdown();
 	TIMER_END(L"shutdown wmi");
 #endif
 }
 
 #if OS_UNIX
 static void FixLocales()
 {
 #if OS_MACOSX || OS_BSD
 	// OS X requires a UTF-8 locale in LC_CTYPE so that *wprintf can handle
 	// wide characters. Peculiarly the string "UTF-8" seems to be acceptable
 	// despite not being a real locale, and it's conveniently language-agnostic,
 	// so use that.
 	setlocale(LC_CTYPE, "UTF-8");
 #endif
 
 
 	// On misconfigured systems with incorrect locale settings, we'll die
 	// with a C++ exception when some code (e.g. Boost) tries to use locales.
 	// To avoid death, we'll detect the problem here and warn the user and
 	// reset to the default C locale.
 
 
 	// For informing the user of the problem, use the list of env vars that
 	// glibc setlocale looks at. (LC_ALL is checked first, and LANG last.)
 	const char* const LocaleEnvVars[] = {
 		"LC_ALL",
 		"LC_COLLATE",
 		"LC_CTYPE",
 		"LC_MONETARY",
 		"LC_NUMERIC",
 		"LC_TIME",
 		"LC_MESSAGES",
 		"LANG"
 	};
 
 	try
 	{
 		// this constructor is similar to setlocale(LC_ALL, ""),
 		// but instead of returning NULL, it throws runtime_error
 		// when the first locale env variable found contains an invalid value
 		std::locale("");
 	}
 	catch (std::runtime_error&)
 	{
 		LOGWARNING(L"Invalid locale settings");
 
 		for (size_t i = 0; i < ARRAY_SIZE(LocaleEnvVars); i++)
 		{
 			if (char* envval = getenv(LocaleEnvVars[i]))
 				LOGWARNING(L"  %hs=\"%hs\"", LocaleEnvVars[i], envval);
 			else
 				LOGWARNING(L"  %hs=\"(unset)\"", LocaleEnvVars[i]);
 		}
 
 		// We should set LC_ALL since it overrides LANG
 		if (setenv("LC_ALL", std::locale::classic().name().c_str(), 1))
 			debug_warn(L"Invalid locale settings, and unable to set LC_ALL env variable.");
 		else
 			LOGWARNING(L"Setting LC_ALL env variable to: %hs", getenv("LC_ALL"));
 	}
 }
 #else
 static void FixLocales()
 {
 	// Do nothing on Windows
 }
 #endif
 
 void EarlyInit()
 {
 	// If you ever want to catch a particular allocation:
 	//_CrtSetBreakAlloc(232647);
 
 	ThreadUtil::SetMainThread();
 
 	debug_SetThreadName("main");
 	// add all debug_printf "tags" that we are interested in:
 	debug_filter_add(L"TIMER");
 
 	timer_LatchStartTime();
 
 	// initialise profiler early so it can profile startup,
 	// but only after LatchStartTime
 	g_Profiler2.Initialise();
 
 	FixLocales();
 
 	// Because we do GL calls from a secondary thread, Xlib needs to
 	// be told to support multiple threads safely.
 	// This is needed for Atlas, but we have to call it before any other
 	// Xlib functions (e.g. the ones used when drawing the main menu
 	// before launching Atlas)
 #if MUST_INIT_X11
 	int status = XInitThreads();
 	if (status == 0)
 		debug_printf(L"Error enabling thread-safety via XInitThreads\n");
 #endif
 
 	// Initialise the low-quality rand function
 	srand(time(NULL));	// NOTE: this rand should *not* be used for simulation!
 }
 
 bool Autostart(const CmdLineArgs& args);
 
 void Init(const CmdLineArgs& args, int flags)
 {
 	h_mgr_init();
 
 	// Do this as soon as possible, because it chdirs
 	// and will mess up the error reporting if anything
 	// crashes before the working directory is set.
 	InitVfs(args, flags);
 
 	// This must come after VFS init, which sets the current directory
 	// (required for finding our output log files).
 	g_Logger = new CLogger;
 
 	// Special command-line mode to dump the entity schemas instead of running the game.
 	// (This must be done after loading VFS etc, but should be done before wasting time
 	// on anything else.)
 	if (args.Has("dumpSchema"))
 	{
 		CSimulation2 sim(NULL, NULL);
 		sim.LoadDefaultScripts();
 		std::ofstream f("entity.rng", std::ios_base::out | std::ios_base::trunc);
 		f << sim.GenerateSchema();
 		std::cout << "Generated entity.rng\n";
 		exit(0);
 	}
 
 	// override ah_translate with our i18n code.
 	AppHooks hooks = {0};
 	hooks.translate = psTranslate;
 	hooks.translate_free = psTranslateFree;
 	app_hooks_update(&hooks);
 
 	// Set up the console early, so that debugging
 	// messages can be logged to it. (The console's size
 	// and fonts are set later in InitPs())
 	g_Console = new CConsole();
 
 	CNetHost::Initialize();
 
 	new CProfileViewer;
 	new CProfileManager;	// before any script code
 
 	g_ScriptStatsTable = new CScriptStatsTable;
 	g_ProfileViewer.AddRootTable(g_ScriptStatsTable);
 
 
 #if CONFIG2_AUDIO
 	ISoundManager::CreateSoundManager();
 #endif
 
 	// g_ConfigDB, command line args, globals
 	CONFIG_Init(args);
 
 	// before scripting 
 	if (g_JSDebuggerEnabled)
 		g_DebuggingServer = new CDebuggingServer();
 
 	InitScripting();	// before GUI
 
 	// Optionally start profiler HTTP output automatically
 	// (By default it's only enabled by a hotkey, for security/performance)
 	bool profilerHTTPEnable = false;
 	CFG_GET_VAL("profiler2.http.autoenable", Bool, profilerHTTPEnable);
 	if (profilerHTTPEnable)
 		g_Profiler2.EnableHTTP();
 
 	if (!g_Quickstart)
 		g_UserReporter.Initialize(); // after config
 
 	PROFILE2_EVENT("Init finished");
 }
 
 void InitGraphics(const CmdLineArgs& args, int flags)
 {
 	const bool setup_vmode = (flags & INIT_HAVE_VMODE) == 0;
 
 	if(setup_vmode)
 	{
 		InitSDL();
 
 		if (!g_VideoMode.InitSDL())
 			throw PSERROR_System_VmodeFailed(); // abort startup
 
 #if !SDL_VERSION_ATLEAST(2, 0, 0)
 		SDL_WM_SetCaption("0 A.D.", "0 A.D.");
 #endif
 	}
 
 	RunHardwareDetection();
 
 	tex_codec_register_all();
 
 	const int quality = SANE_TEX_QUALITY_DEFAULT;	// TODO: set value from config file
 	SetTextureQuality(quality);
 
 	ogl_WarnIfError();
 
 	// Optionally start profiler GPU timings automatically
 	// (By default it's only enabled by a hotkey, for performance/compatibility)
 	bool profilerGPUEnable = false;
 	CFG_GET_VAL("profiler2.gpu.autoenable", Bool, profilerGPUEnable);
 	if (profilerGPUEnable)
 		g_Profiler2.EnableGPU();
 
 	if(!g_Quickstart)
 	{
 		WriteSystemInfo();
 		// note: no longer vfs_display here. it's dog-slow due to unbuffered
 		// file output and very rarely needed.
 	}
 
 	if(g_DisableAudio)
 		ISoundManager::SetEnabled(false);
 
 	g_GUI = new CGUIManager(g_ScriptingHost.GetScriptInterface());
 
 	// (must come after SetVideoMode, since it calls ogl_Init)
 	if (ogl_HaveExtensions(0, "GL_ARB_vertex_program", "GL_ARB_fragment_program", NULL) != 0 // ARB
 		&& ogl_HaveExtensions(0, "GL_ARB_vertex_shader", "GL_ARB_fragment_shader", NULL) != 0) // GLSL
 	{
 		DEBUG_DISPLAY_ERROR(
 			L"Your graphics card doesn't appear to be fully compatible with OpenGL shaders."
 			L" In the future, the game will not support pre-shader graphics cards."
 			L" You are advised to try installing newer drivers and/or upgrade your graphics card."
 			L" For more information, please see http://www.wildfiregames.com/forum/index.php?showtopic=16734"
 		);
 		// TODO: actually quit once fixed function support is dropped
 	}
 
 	const char* missing = ogl_HaveExtensions(0,
 		"GL_ARB_multitexture",
 		"GL_EXT_draw_range_elements",
 		"GL_ARB_texture_env_combine",
 		"GL_ARB_texture_env_dot3",
 		NULL);
 	if(missing)
 	{
 		wchar_t buf[500];
 		swprintf_s(buf, ARRAY_SIZE(buf),
 			L"The %hs extension doesn't appear to be available on your computer."
 			L" The game may still work, though - you are welcome to try at your own risk."
 			L" If not or it doesn't look right, upgrade your graphics card.",
 			missing
 		);
 		DEBUG_DISPLAY_ERROR(buf);
 		// TODO: i18n
 	}
 
 	if (!ogl_HaveExtension("GL_ARB_texture_env_crossbar"))
 	{
 		DEBUG_DISPLAY_ERROR(
 			L"The GL_ARB_texture_env_crossbar extension doesn't appear to be available on your computer."
 			L" Shadows are not available and overall graphics quality might suffer."
 			L" You are advised to try installing newer drivers and/or upgrade your graphics card.");
 		g_Shadows = false;
 	}
 
 	ogl_WarnIfError();
 	InitRenderer();
 
 	InitInput();
 
 	ogl_WarnIfError();
 
 	try
 	{
 		if (!Autostart(args))
 		{
 			const bool setup_gui = ((flags & INIT_NO_GUI) == 0);
 			// We only want to display the splash screen at startup
 			CScriptValRooted data;
 			if (g_GUI)
 			{
 				ScriptInterface& scriptInterface = g_GUI->GetScriptInterface();
 				scriptInterface.Eval("({})", data);
 				scriptInterface.SetProperty(data.get(), "isStartup", true);
 			}
 			InitPs(setup_gui, L"page_pregame.xml", data.get());
 		}
 	}
 	catch (PSERROR_Game_World_MapLoadFailed& e)
 	{
 		// Map Loading failed
 
 		// Start the engine so we have a GUI
 		InitPs(true, L"page_pregame.xml", JSVAL_VOID);
 
 		// Call script function to do the actual work
 		//	(delete game data, switch GUI page, show error, etc.)
 		CancelLoad(CStr(e.what()).FromUTF8());
 	}
 }
 
 void RenderGui(bool RenderingState)
 {
 	g_DoRenderGui = RenderingState;
 }
 
 void RenderLogger(bool RenderingState)
 {
 	g_DoRenderLogger = RenderingState;
 }
 
 void RenderCursor(bool RenderingState)
 {
 	g_DoRenderCursor = RenderingState;
 }
 
 bool Autostart(const CmdLineArgs& args)
 {
 	/*
 	 * Handle various command-line options, for quick testing of various features:
 	 * -autostart=name					-- map name for scenario, or rms name for random map
 	 * -autostart-ai=1:dummybot			-- adds the dummybot AI to player 1
 	 * -autostart-playername=name		-- multiplayer player name
 	 * -autostart-host					-- multiplayer host mode
 	 * -autostart-players=2				-- number of players
 	 * -autostart-client				-- multiplayer client mode
 	 * -autostart-ip=127.0.0.1			-- multiplayer connect to 127.0.0.1
 	 * -autostart-random=104			-- random map, optional seed value = 104 (default is 0, random is -1)
 	 * -autostart-size=192				-- random map size in tiles = 192 (default is 192)
 	 * -autostart-civ=1:hele			-- set player #1 civ to "hele"
 	 *
 	 * Examples:
 	 * -autostart=Acropolis -autostart-host -autostart-players=2		-- Host game on Acropolis map, 2 players
 	 * -autostart=latium -autostart-random=-1							-- Start single player game on latium random map, random rng seed
 	 */
 
 	CStr autoStartName = args.Get("autostart");
 
 #if OS_ANDROID
 	// HACK: currently the most convenient way to test maps on Android;
 	// should find a better solution
 	autoStartName = "Oasis";
 #endif
 
 	if (autoStartName.empty())
 	{
 		return false;
 	}
 
 	g_Game = new CGame();
 
 	ScriptInterface& scriptInterface = g_Game->GetSimulation2()->GetScriptInterface();
 
 	CScriptValRooted attrs;
 	scriptInterface.Eval("({})", attrs);
 	CScriptVal settings;
 	scriptInterface.Eval("({})", settings);
 	CScriptVal playerData;
 	scriptInterface.Eval("([])", playerData);
 
 	// Set different attributes for random or scenario game
 	if (args.Has("autostart-random"))
 	{
 		CStr seedArg = args.Get("autostart-random");
 
 		// Default seed is 0
 		uint32 seed = 0;
 		if (!seedArg.empty())
 		{
 			if (seedArg.compare("-1") == 0)
 			{	// Random seed value
 				seed = rand();
 			}
 			else
 			{
 				seed = seedArg.ToULong();
 			}
 		}
 		
 		// Random map definition will be loaded from JSON file, so we need to parse it
 		std::wstring scriptPath = L"maps/random/" + autoStartName.FromUTF8() + L".json";
 		CScriptValRooted scriptData = scriptInterface.ReadJSONFile(scriptPath);
 		if (!scriptData.undefined() && scriptInterface.GetProperty(scriptData.get(), "settings", settings))
 		{
 			// JSON loaded ok - copy script name over to game attributes
 			std::wstring scriptFile;
 			scriptInterface.GetProperty(settings.get(), "Script", scriptFile);
 			scriptInterface.SetProperty(attrs.get(), "script", scriptFile);				// RMS filename
 		}
 		else
 		{
 			// Problem with JSON file
 			LOGERROR(L"Error reading random map script '%ls'", scriptPath.c_str());
 			throw PSERROR_Game_World_MapLoadFailed("Error reading random map script.\nCheck application log for details.");
 		}
 
 		// Get optional map size argument (default 192)
 		uint mapSize = 192;
 		if (args.Has("autostart-size"))
 		{
 			CStr size = args.Get("autostart-size");
 			mapSize = size.ToUInt();
 		}
 
 		scriptInterface.SetProperty(attrs.get(), "map", std::string(autoStartName));
 		scriptInterface.SetProperty(attrs.get(), "mapType", std::string("random"));
 		scriptInterface.SetProperty(settings.get(), "Seed", seed);									// Random seed
 		scriptInterface.SetProperty(settings.get(), "Size", mapSize);								// Random map size (in patches)
 
 		// Get optional number of players (default 2)
 		size_t numPlayers = 2;
 		if (args.Has("autostart-players"))
 		{
 			CStr num = args.Get("autostart-players");
 			numPlayers = num.ToUInt();
 		}
 
 		// Set up player data
 		for (size_t i = 0; i < numPlayers; ++i)
 		{
 			CScriptVal player;
 			scriptInterface.Eval("({})", player);
 
 			// We could load player_defaults.json here, but that would complicate the logic
 			//	even more and autostart is only intended for developers anyway
 			scriptInterface.SetProperty(player.get(), "Civ", std::string("athen"));
 			scriptInterface.SetPropertyInt(playerData.get(), i, player);
 		}
 	}
 	else
 	{
 		// TODO: support akirmish maps
 		std::string mapFile = "maps/scenarios/" + autoStartName;
 		scriptInterface.SetProperty(attrs.get(), "map", mapFile);
 		scriptInterface.SetProperty(attrs.get(), "mapType", std::string("scenario"));
 	}
 
 	// Set player data for AIs
 	//		attrs.settings = { PlayerData: [ { AI: ... }, ... ] }:
 	if (args.Has("autostart-ai"))
 	{
 		std::vector<CStr> aiArgs = args.GetMultiple("autostart-ai");
 		for (size_t i = 0; i < aiArgs.size(); ++i)
 		{
 			// Instead of overwriting existing player data, modify the array
 			CScriptVal player;
 			if (!scriptInterface.GetPropertyInt(playerData.get(), i, player) || player.undefined())
 			{
 				scriptInterface.Eval("({})", player);
 			}
 
 			int playerID = aiArgs[i].BeforeFirst(":").ToInt();
 			CStr name = aiArgs[i].AfterFirst(":");
 
 			scriptInterface.SetProperty(player.get(), "AI", std::string(name));
 			scriptInterface.SetProperty(player.get(), "AIDiff", 2);
 			scriptInterface.SetPropertyInt(playerData.get(), playerID-1, player);
 		}
 	}
 	// Set AI difficulty
 	if (args.Has("autostart-aidiff"))
 	{
 		std::vector<CStr> civArgs = args.GetMultiple("autostart-aidiff");
 		for (size_t i = 0; i < civArgs.size(); ++i)
 		{
 			// Instead of overwriting existing player data, modify the array
 			CScriptVal player;
 			if (!scriptInterface.GetPropertyInt(playerData.get(), i, player) || player.undefined())
 			{
 				scriptInterface.Eval("({})", player);
 			}
 			
 			int playerID = civArgs[i].BeforeFirst(":").ToInt();
 			int difficulty = civArgs[i].AfterFirst(":").ToInt();
 			
 			scriptInterface.SetProperty(player.get(), "AIDiff", difficulty);
 			scriptInterface.SetPropertyInt(playerData.get(), playerID-1, player);
 		}
 	}
 	// Set player data for Civs
 	if (args.Has("autostart-civ"))
 	{
 		std::vector<CStr> civArgs = args.GetMultiple("autostart-civ");
 		for (size_t i = 0; i < civArgs.size(); ++i)
 		{
 			// Instead of overwriting existing player data, modify the array
 			CScriptVal player;
 			if (!scriptInterface.GetPropertyInt(playerData.get(), i, player) || player.undefined())
 			{
 				scriptInterface.Eval("({})", player);
 			}
 			
 			int playerID = civArgs[i].BeforeFirst(":").ToInt();
 			CStr name = civArgs[i].AfterFirst(":");
 			
 			scriptInterface.SetProperty(player.get(), "Civ", std::string(name));
 			scriptInterface.SetPropertyInt(playerData.get(), playerID-1, player);
 		}
 	}
 
 	// Add player data to map settings
 	scriptInterface.SetProperty(settings.get(), "PlayerData", playerData);
 
 	// Add map settings to game attributes
 	scriptInterface.SetProperty(attrs.get(), "settings", settings);
 
 	CScriptVal mpInitData;
 	g_GUI->GetScriptInterface().Eval("({isNetworked:true, playerAssignments:{}})", mpInitData);
 	g_GUI->GetScriptInterface().SetProperty(mpInitData.get(), "attribs",
 			CScriptVal(g_GUI->GetScriptInterface().CloneValueFromOtherContext(scriptInterface, attrs.get())));
 
 	// Get optional playername
 	CStrW userName = L"anonymous";
 	if (args.Has("autostart-playername"))
 	{
 		userName = args.Get("autostart-playername").FromUTF8();
 	}
 
 	if (args.Has("autostart-host"))
 	{
 		InitPs(true, L"page_loading.xml", mpInitData.get());
 
 		size_t maxPlayers = 2;
 		if (args.Has("autostart-players"))
 		{
 			maxPlayers = args.Get("autostart-players").ToUInt();
 		}
 
 		g_NetServer = new CNetServer(maxPlayers);
 
 		g_NetServer->UpdateGameAttributes(attrs.get(), scriptInterface);
 
 		bool ok = g_NetServer->SetupConnection();
 		ENSURE(ok);
 
 		g_NetClient = new CNetClient(g_Game);
 		g_NetClient->SetUserName(userName);
 		g_NetClient->SetupConnection("127.0.0.1");
 	}
 	else if (args.Has("autostart-client"))
 	{
 		InitPs(true, L"page_loading.xml", mpInitData.get());
 
 		g_NetClient = new CNetClient(g_Game);
 		g_NetClient->SetUserName(userName);
 
 		CStr ip = "127.0.0.1";
 		if (args.Has("autostart-ip"))
 		{
 			ip = args.Get("autostart-ip");
 		}
 
 		bool ok = g_NetClient->SetupConnection(ip);
 		ENSURE(ok);
 	}
 	else
 	{
 		g_Game->SetPlayerID(1);
 		g_Game->StartGame(attrs, "");
 
 		LDR_NonprogressiveLoad();
 
 		PSRETURN ret = g_Game->ReallyStartGame();
 		ENSURE(ret == PSRETURN_OK);
 
 		InitPs(true, L"page_session.xml", JSVAL_VOID);
 	}
 
 	return true;
 }
 
 void CancelLoad(const CStrW& message)
 {
 	// Cancel loader
 	LDR_Cancel();
 
 	// Call the cancelOnError GUI function, defined in ..gui/common/functions_utility_error.js
 	// So all GUI pages that load games should include this script
 	if (g_GUI && g_GUI->HasPages())
 	{
 		JSContext* cx = g_ScriptingHost.getContext();
 		jsval fval, rval;
 		JSBool ok = JS_GetProperty(cx, g_GUI->GetScriptObject(), "cancelOnError", &fval);
 		ENSURE(ok);
 
 		jsval msgval = ScriptInterface::ToJSVal(cx, message);
 
 		if (ok && !JSVAL_IS_VOID(fval))
 			JS_CallFunctionValue(cx, g_GUI->GetScriptObject(), fval, 1, &msgval, &rval);
 	}
 }