Ticket #3413: 3413.2.diff

binaries/data/mods/public/gui/common/functions_global_object.js

@@ -110 +110 @@
             caption += "\n";
             ++linesCount;
         }
-        if (Engine.ConfigDB_GetValue("user", "gui.session.ceasefirecounter") === "true" && g_SimState.ceasefireActive)
+        if (g_SimState.ceasefireActive)
         {
             var remainingTimeString = timeToString(g_SimState.ceasefireTimeRemaining);
             caption += remainingTimeString + "\n";

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

@@ -1054 +1054 @@
     reportObject.teams = teams;
     reportObject.teamsLocked = String(teamsLocked);
     reportObject.ceasefireActive = String(extendedSimState.ceasefireActive);
-    reportObject.ceasefireTimeRemaining = String(extendedSimState.ceasefireTimeRemaining);
+    if(extendedSimState.ceasefireTimeRemaining > 1)
+        reportObject.ceasefireTimeRemaining = String(extendedSimState.ceasefireTimeRemaining);
     reportObject.mapName = mapName;
     reportObject.economyScore = playerStatistics.economyScore;
     reportObject.militaryScore = playerStatistics.militaryScore;

binaries/data/mods/public/simulation/components/CeasefireManager.js

@@ -123 +123 @@
     var playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
     for (var i = 1; i < playerEntities.length; ++i)
         Engine.QueryInterface(playerEntities[i], IID_Player).SetDiplomacy(this.diplomacyBeforeCeasefire[i-1]);
-
-    // Send chat notifications and update the diplomacy screen
-    for (var i = 1; i < playerEntities.length; ++i)
-        for (var j = 1; j < playerEntities.length; ++j)
-            if (i != j && this.diplomacyBeforeCeasefire[i-1][j] == -1)
-                cmpGuiInterface.PushNotification({"type": "diplomacy", "players": [j], "player1": [i], "status": "enemy"});
     
     // Reset values
     this.ceasefireIsActive = false;