diff --git a/binaries/data/mods/public/gui/common/functions_global_object.js b/binaries/data/mods/public/gui/common/functions_global_object.js index a28a8d1ada..3124055dcc 100644 --- a/binaries/data/mods/public/gui/common/functions_global_object.js +++ b/binaries/data/mods/public/gui/common/functions_global_object.js @@ -115,10 +115,7 @@ function updateCounters() } } else if (!diplomacyCeasefireCounter.hidden) - { diplomacyCeasefireCounter.hidden = true; - updateDiplomacy(); - } g_ResearchListTop = 4; if (linesCount) diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js index 79ea3398eb..8a2282e28f 100644 --- a/binaries/data/mods/public/gui/session/menu.js +++ b/binaries/data/mods/public/gui/session/menu.js @@ -314,10 +314,10 @@ function openDiplomacy() g_IsDiplomacyOpen = true; - updateDiplomacyPanel(true); + updateDiplomacy(true); } -function updateDiplomacyPanel(opening = false) +function updateDiplomacy(opening = false) { if (g_ViewedPlayer < 1 || !g_IsDiplomacyOpen) return; diff --git a/binaries/data/mods/public/gui/session/messages.js b/binaries/data/mods/public/gui/session/messages.js index 1c7a4e9dae..541cdec220 100644 --- a/binaries/data/mods/public/gui/session/messages.js +++ b/binaries/data/mods/public/gui/session/messages.js @@ -331,7 +331,7 @@ var g_NotificationsTypes = "status": notification.status }); - updateDiplomacy(); + updatePlayerData(); }, "tribute": function(notification, player) { @@ -514,14 +514,6 @@ function handleNotifications() } } -/** - * Updates playerdata cache and refresh diplomacy panel. - */ -function updateDiplomacy() -{ - updatePlayerData(); -} - /** * Displays all active counters (messages showing the remaining time) for wonder-victory, ceasefire etc. */ diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js index f2679c646e..7254d50003 100644 --- a/binaries/data/mods/public/gui/session/session.js +++ b/binaries/data/mods/public/gui/session/session.js @@ -521,7 +521,7 @@ function playerFinished(player, won) if (player == Engine.GetPlayerID()) reportGame(); - updateDiplomacy(); + updatePlayerData(); updateChatAddressees(); if (player != g_ViewedPlayer) @@ -846,7 +846,7 @@ function updateGUIObjects() global.music.setState(global.music.states[battleState]); } - updateDiplomacyPanel(); + updateDiplomacy(); } function onReplayFinished()