From 3ab983f8a19cc9f3466c40197581a592cc1dfb18 Mon Sep 17 00:00:00 2001
From: Yves <yves.gwerder@wildfiregames.com>
Date: Fri, 15 Nov 2013 18:35:19 +0000
Subject: [PATCH] Some "varfare" again plus a call to initMusic because that
 will be needed for the Spidermonkey upgrade.

This was SVN commit r14188.
---
 .../data/mods/public/gui/gamesetup/gamesetup.js |  4 ++--
 .../data/mods/public/gui/loading/loading.js     |  4 ++--
 binaries/data/mods/public/gui/lobby/lobby.js    | 17 +++++++++--------
 binaries/data/mods/public/gui/lobby/lobby.xml   |  1 +
 .../data/mods/public/gui/summary/summary.js     |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 29a393c7cb..e08dd2a1ac 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -836,7 +836,7 @@ function launchGame()
 	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)];
+		var 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)];
@@ -1549,7 +1549,7 @@ function sendRegisterGameStanza()
 	var nbp = numberOfPlayers ? numberOfPlayers : 1;
 	var tnbp = g_GameAttributes.settings.PlayerData.length;
 
-	gameData = {
+	var gameData = {
 		"name":g_ServerName,
 		"mapName":g_GameAttributes.map,
 		"niceMapName":getMapDisplayName(g_GameAttributes.map),
diff --git a/binaries/data/mods/public/gui/loading/loading.js b/binaries/data/mods/public/gui/loading/loading.js
index 182d86cacf..095d963b99 100644
--- a/binaries/data/mods/public/gui/loading/loading.js
+++ b/binaries/data/mods/public/gui/loading/loading.js
@@ -20,8 +20,8 @@ function init(data)
 		if (tipText)
 		{
 			var index = tipText.indexOf("\n");
-			tipTextTitle = tipText.substring(0, index);
-			tipTextMessage = tipText.substring(index);
+			var tipTextTitle = tipText.substring(0, index);
+			var tipTextMessage = tipText.substring(index);
 			getGUIObjectByName("tipTitle").caption = tipTextTitle? tipTextTitle : "";
 			getGUIObjectByName("tipText").caption = tipTextMessage? tipTextMessage : "";
 		}
diff --git a/binaries/data/mods/public/gui/lobby/lobby.js b/binaries/data/mods/public/gui/lobby/lobby.js
index 1514554f3f..6a9bc3cf8d 100644
--- a/binaries/data/mods/public/gui/lobby/lobby.js
+++ b/binaries/data/mods/public/gui/lobby/lobby.js
@@ -12,6 +12,7 @@ var g_mapSizes = {};
 function init(attribs)
 {
 	// Play menu music
+	initMusic();
 	global.music.setState(global.music.states.MENU);
 
 	g_Name = Engine.LobbyGetNick();
@@ -38,8 +39,8 @@ function init(attribs)
 	updatePlayerList();
 
 	resetFilters();
-	var spamMonitorTimer = setTimeout(clearSpamMonitor, 5000);
-	var spammerTimer = setTimeout(clearSpammers, 30000);
+	setTimeout(clearSpamMonitor, 5000);
+	setTimeout(clearSpammers, 30000);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -609,18 +610,18 @@ function ircFormat(text, from, color, key)
 
 	// Generate and apply color to uncolored names,
 	if (!color && from)
-		coloredFrom = colorPlayerName(from);
+		var coloredFrom = colorPlayerName(from);
 	else if (from)
-		coloredFrom = "[color='" + color + "']" + from + "[/color]";
+		var coloredFrom = "[color='" + color + "']" + from + "[/color]";
 
 	// Time for optional time header
 	var time = new Date(Date.now());
 
 	// Build time header if enabled
 	if (g_timestamp)
-		formatted = '[font="serif-bold-13"]\x5B' + twoDigits(time.getHours() % 12) + ":" + twoDigits(time.getMinutes()) + '\x5D[/font] '
+		var formatted = '[font="serif-bold-13"]\x5B' + twoDigits(time.getHours() % 12) + ":" + twoDigits(time.getMinutes()) + '\x5D[/font] '
 	else
-		formatted = "";
+		var formatted = "";
 
 	// Handle commands
 	if (text[0] == '/')
@@ -671,13 +672,13 @@ function updateSpamandDetect(text, from)
 function clearSpamMonitor()
 {
 	g_spamMonitor = {};
-	spamTimer = setTimeout(clearSpamMonitor, 5000);
+	setTimeout(clearSpamMonitor, 5000);
 }
 
 function clearSpammers()
 {
 	g_spammers = {};
-	spammerTimer = setTimeout(clearSpammers, 30000);
+	setTimeout(clearSpammers, 30000);
 }
 
 /* Utilities */
diff --git a/binaries/data/mods/public/gui/lobby/lobby.xml b/binaries/data/mods/public/gui/lobby/lobby.xml
index c01700064b..5f409a4f14 100644
--- a/binaries/data/mods/public/gui/lobby/lobby.xml
+++ b/binaries/data/mods/public/gui/lobby/lobby.xml
@@ -4,6 +4,7 @@
 	<script file="gui/common/functions_global_object.js"/>
 	<script file="gui/common/functions_utility.js"/>
 	<script file="gui/common/timer.js"/>
+	<script file="gui/common/music.js"/>
 
 	<script file="gui/lobby/lobby.js"/>
 
diff --git a/binaries/data/mods/public/gui/summary/summary.js b/binaries/data/mods/public/gui/summary/summary.js
index 81129a3060..186d37182c 100644
--- a/binaries/data/mods/public/gui/summary/summary.js
+++ b/binaries/data/mods/public/gui/summary/summary.js
@@ -195,7 +195,7 @@ function init(data)
 			militaryScore.size = left + " 2 " + (left + width) + " 100%"; left += width;
 			explorationScore.size = left + " 2 " + (left + width) + " 100%"; left += width;
 			totalScore.size = left + " 2 " + (left + width) + " 100%"; left += width;
-			size = getGUIObjectByName("playerBox0["+i+"]").size;
+			var size = getGUIObjectByName("playerBox0["+i+"]").size;
 			size.right = left + 10;
 			getGUIObjectByName("playerBox0["+i+"]").size = size;