Index: ps/trunk/binaries/data/mods/public/gui/session/menu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/menu.js	(revision 14480)
+++ ps/trunk/binaries/data/mods/public/gui/session/menu.js	(revision 14481)
@@ -1,594 +1,596 @@
 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;
 
 // Trade menu: available resources and step for probability changes
 const RESOURCES = ["food", "wood", "stone", "metal"];
 const STEP = 5;
 
 var isMenuOpen = false;
 var menu;
 
 var isDiplomacyOpen = false;
 var isTradeOpen = 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);
+	openSettings();
 }
 
 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)
+function openSettings()
 {
 	getGUIObjectByName("settingsDialogPanel").hidden = false;
-	if (pause)
-		pauseGame();
+	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()
 {
 	if (isTradeOpen)
 		closeTrade();
 	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 openTrade()
 {
 	if (isDiplomacyOpen)
 		closeDiplomacy();
 	isTradeOpen = true;
 
 	var updateButtons = function()
 	{
 		for (var res in button)
 		{
 			button[res].label.caption = proba[res] + "%";
 			if (res == selec)
 			{
 				button[res].res.enabled = false;
 				button[res].sel.hidden = false;
 				button[res].up.hidden = true;
 				button[res].dn.hidden = true;
 			}
 			else
 			{
 				button[res].res.enabled = true;
 				button[res].sel.hidden = true;
 				button[res].up.hidden = (proba[res] == 100 || proba[selec] == 0);
 				button[res].dn.hidden = (proba[res] == 0 || proba[selec] == 100);
 			}
 		}
 	}
 
 	var proba = Engine.GuiInterfaceCall("GetTradingGoods");
 	var button = {};
 	var selec = RESOURCES[0];
 	for (var i = 0; i < RESOURCES.length; ++i)
 	{
 		var buttonResource = getGUIObjectByName("tradeResource["+i+"]");
 		if (i > 0)
 		{
 			var size = getGUIObjectByName("tradeResource["+(i-1)+"]").size;
 			var width = size.right - size.left;
 			size.left += width;
 			size.right += width;
 			getGUIObjectByName("tradeResource["+i+"]").size = size;
 		}
 		var resource = RESOURCES[i];
 		proba[resource] = (proba[resource] ? proba[resource] : 0);
 		var buttonResource = getGUIObjectByName("tradeResourceButton["+i+"]");
 		var icon = getGUIObjectByName("tradeResourceIcon["+i+"]");
 		icon.sprite = "stretched:session/icons/resources/" + resource + ".png";
 		var label = getGUIObjectByName("tradeResourceText["+i+"]");
 		var buttonUp = getGUIObjectByName("tradeArrowUp["+i+"]");
 		var buttonDn = getGUIObjectByName("tradeArrowDn["+i+"]");
 		var iconSel = getGUIObjectByName("tradeResourceSelection["+i+"]");
 		button[resource] = { "res": buttonResource, "up": buttonUp, "dn": buttonDn, "label": label, "sel": iconSel };
 
 		buttonResource.onpress = (function(resource){
 			return function() {
 				if (selec == resource)
 					return;
 				selec = resource;
 				updateButtons();
 			}
 		})(resource);
 
 		buttonUp.onpress = (function(resource){
 			return function() {
 				proba[resource] += Math.min(STEP, proba[selec]);
 				proba[selec]    -= Math.min(STEP, proba[selec]);
 				Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
 				updateButtons();
 			}
 		})(resource);
 
 		buttonDn.onpress = (function(resource){
 			return function() {
 				proba[selec]    += Math.min(STEP, proba[resource]);
 				proba[resource] -= Math.min(STEP, proba[resource]);
 				Engine.PostNetworkCommand({"type": "set-trading-goods", "tradingGoods": proba});
 				updateButtons();
 			}
 		})(resource);
 	}
 	updateButtons();
 
 	var traderNumber = Engine.GuiInterfaceCall("GetTraderNumber");
 	var caption = "";
 	var comma = "";
 	if (traderNumber.landTrader.total == 0)
 		caption += "0";
 	else
 	{
 		if (traderNumber.landTrader.trading > 0)
 		{
 			caption += traderNumber.landTrader.trading + " trading"
 			comma = ", ";
 		}
 		if (traderNumber.landTrader.garrisoned > 0)
 		{
 			caption += comma + traderNumber.landTrader.garrisoned + " garrisoned inside ships";
 			comma = ", ";
 		}
 		var inactive = traderNumber.landTrader.total - traderNumber.landTrader.trading - traderNumber.landTrader.garrisoned;
 		if (inactive > 0)
 			caption += comma + "[color=\"orange\"]" + inactive + " inactive[/color]";
 	}
 	getGUIObjectByName("landTraders").caption = caption;
 
 	caption = "";
 	comma = "";
 	if (traderNumber.shipTrader.total == 0)
 		caption += "0";
 	else
 	{
 		if (traderNumber.shipTrader.trading > 0)
 		{
 			caption += traderNumber.shipTrader.trading + " trading"
 			comma = ", ";
 		}
 		var inactive = traderNumber.shipTrader.total - traderNumber.shipTrader.trading;
 		if (inactive > 0)
 			caption += comma + "[color=\"orange\"]" + inactive + " inactive[/color]";
 	}
 	getGUIObjectByName("shipTraders").caption = caption;
 
 	getGUIObjectByName("tradeDialogPanel").hidden = false;
 }
 
 function closeTrade()
 {
 	isTradeOpen = false;
 	getGUIObjectByName("tradeDialogPanel").hidden = true;
 }
 
 function toggleTrade()
 {
 	if (isTradeOpen)
 		closeTrade();
 	else
 		openTrade();
 };
 
 function toggleGameSpeed()
 {
 	var gameSpeed = getGUIObjectByName("gameSpeed");
 	gameSpeed.hidden = !gameSpeed.hidden;
 }
 
+/**
+ * Pause the game in single player mode.
+ */
 function pauseGame()
 {
+	if (g_IsNetworked)
+		return;
+
 	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();
 	closeTrade();
 	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) + ".";
 }