Ticket #3222: t3222_handle_notifications_v3.patch

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

@@ -136 +136 @@
 };
 
 // Notifications
 function handleNotifications()
 {
-    var notification = Engine.GuiInterfaceCall("GetNextNotification");
+    var notifications = Engine.GuiInterfaceCall("GetNotifications");
 
-    if (!notification)
-        return;
-    if (!notification.type)
+    for(var i = 0; i < notifications.length; ++i)
     {
-        error("notification without type found.\n"+uneval(notification))
-        return;
+        let notification = notifications[i];
+        
+        if (!notification.type)
+        {
+            error("Notification without type found.\n"+uneval(notification))
+            continue;
+        }
+        
+        if (!notification.players)
+        {
+            error("Notification without players found.\n"+uneval(notification))
+            continue;
+        }
+        
+        var action = g_NotificationsTypes[notification.type];
+        if (!action)
+        {
+            error("Unknown notification type '" + notification.type + "' found.");
+            continue;
+        }
+        
+        for (var player of notification.players)
+            action(notification, player);
     }
-    if (!notification.players)
-    {
-        error("notification without players found.\n"+uneval(notification))
-        return;
-    }
-    var action = g_NotificationsTypes[notification.type];
-    if (!action)
-    {
-        error("unknown notification type '" + notification.type + "' found.");
-        return;
-    }
-
-    for (var player of notification.players)
-        action(notification, player);
 }
 
 function updateDiplomacy()
 {
     g_Players = getPlayerData(g_PlayerAssignments);

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

@@ -732 +732 @@
         this.AddTimeNotification(notification);
     else
         this.notifications.push(notification);
 };
 
-GuiInterface.prototype.GetNextNotification = function()
+GuiInterface.prototype.GetNotifications = function()
 {
-    if (this.notifications.length)
-        return this.notifications.pop();
-    else
-        return false;
+    var n = this.notifications;
+    this.notifications = [];
+    return n;
 };
 
 GuiInterface.prototype.GetAvailableFormations = function(player, wantedPlayer)
 {
     var cmpPlayerMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
@@ -1875 +1874 @@
     "CheckTechnologyRequirements": 1,
     "GetStartedResearch": 1,
     "GetBattleState": 1,
     "GetIncomingAttacks": 1,
     "GetNeededResources": 1,
-    "GetNextNotification": 1,
+    "GetNotifications": 1,
     "GetTimeNotifications": 1,
 
     "GetAvailableFormations": 1,
     "GetFormationRequirements": 1,
     "CanMoveEntsIntoFormation": 1,