Ticket #3168: t3168_preparative_cleanup_v1.patch

binaries/data/mods/public/gui/session/menu.js

@@ -31 +31 @@
 
 // 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;
+var g_IsMenuOpen = false;
+var g_IsDiplomacyOpen = false;
+var g_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 = Engine.GetGUIObjectByName("menu");
-    menu.size = INITIAL_MENU_POSITION;
+    Engine.GetGUIObjectByName("menu").size = INITIAL_MENU_POSITION;
 }
 
 
 // =============================================================================
 // Overall Menu
 // =============================================================================
 //
 // Slide menu
 function updateMenuPosition(dt)
 {
-    if (isMenuOpen)
+    var menu = Engine.GetGUIObjectByName("menu");
+    if (g_IsMenuOpen)
     {
         var maxOffset = END_MENU_POSITION - menu.size.bottom;
         if (maxOffset > 0)
         {
             var offset = Math.min(MENU_SPEED * dt, maxOffset);
@@ -84 +82 @@
 }
 
 // Opens the menu by revealing the screen which contains the menu
 function openMenu()
 {
-    isMenuOpen = true;
+    g_IsMenuOpen = true;
 }
 
 // Closes the menu and resets position
 function closeMenu()
 {
-    isMenuOpen = false;
+    g_IsMenuOpen = false;
 }
 
 function toggleMenu()
 {
-    if (isMenuOpen == true)
+    if (g_IsMenuOpen)
         closeMenu();
     else
         openMenu();
 }
 
@@ -261 +259 @@
     Engine.PostNetworkCommand({"type": "tribute", "player": data.player, "amounts":  data.amounts});
 }
 
 function openDiplomacy()
 {
-    if (isTradeOpen)
+    if (g_IsTradeOpen)
         closeTrade();
-    isDiplomacyOpen = true;
+    g_IsDiplomacyOpen = true;
 
     let we = Engine.GetPlayerID();
 
     // Get offset for one line
     let onesize = Engine.GetGUIObjectByName("diplomacyPlayer[0]").size;
@@ -370 +368 @@
     Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false;
 }
 
 function closeDiplomacy()
 {
-    isDiplomacyOpen = false;
+    g_IsDiplomacyOpen = false;
     Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = true;
 }
 
 function toggleDiplomacy()
 {
-    if (isDiplomacyOpen)
+    if (g_IsDiplomacyOpen)
         closeDiplomacy();
     else
         openDiplomacy();
 }
 
 function openTrade()
 {
-    if (isDiplomacyOpen)
+    if (g_IsDiplomacyOpen)
         closeDiplomacy();
-    isTradeOpen = true;
+    g_IsTradeOpen = true;
 
     var updateButtons = function()
     {
         for (var res in button)
         {
@@ -597 +595 @@
     Engine.GetGUIObjectByName("tradeDialogPanel").hidden = false;
 }
 
 function closeTrade()
 {
-    isTradeOpen = false;
+    g_IsTradeOpen = false;
     Engine.GetGUIObjectByName("tradeDialogPanel").hidden = true;
 }
 
 function toggleTrade()
 {
-    if (isTradeOpen)
+    if (g_IsTradeOpen)
         closeTrade();
     else
         openTrade();
 }
 

binaries/data/mods/public/gui/session/messages.js

@@ -196 +196 @@
 function updateDiplomacy()
 {
     g_Players = getPlayerData(g_PlayerAssignments);
 
     // If the diplomacy panel is open refresh it.
-    if (isDiplomacyOpen)
+    if (g_IsDiplomacyOpen)
         openDiplomacy();
 }
 
 function updateTimeNotifications()
 {

binaries/data/mods/public/gui/session/session.js

@@ -408 +408 @@
 
     var now = new Date();
     var tickLength = new Date() - lastTickTime;
     lastTickTime = now;
 
-    checkPlayerState();
+    checkGameEnded();
     while (true)
     {
         var message = Engine.PollNetworkClient();
         if (!message)
             break;
@@ -448 +448 @@
 
     // Clear renamed entities list
     Engine.GuiInterfaceCall("ClearRenamedEntities");
 }
 
-function checkPlayerState()
+function checkGameEnded()
 {
     // Once the game ends, we're done here.
     if (g_GameEnded || g_IsObserver)
         return;