Ticket #4010: wondervictorymessagesfix_v3.patch

binaries/data/mods/public/maps/scripts/WonderVictory.js

@@ -28 +28 @@
     // Add -1 to notify observers too
     let players = [-1];
     for (let i = 1; i < numPlayers; ++i)
+    {
+        let playerEntityId = cmpPlayerManager.GetPlayerByID(i);
+        let cmpPlayer = Engine.QueryInterface(playerEntityId, IID_Player);
+        if (cmpPlayer.GetState() == "won")
+            return;
         if (i != data.to)
             players.push(i);
+    }
 
     let cmpPlayer = QueryOwnerInterface(ent, IID_Player);
     let cmpEndGameManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_EndGameManager);
@@ -58 +64 @@
     this.wonderVictoryMessages[ent] = messages;
 };
 
+Trigger.prototype.DeleteMessages = function(ent)
+{
+    let timers = this.wonderVictoryTimers;
+    let messages = this.wonderVictoryMessages;
+    if (!messages || !timers)
+        return;
+
+    let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    let cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+
+    for (let message in messages)
+    {
+        cmpGuiInterface.DeleteTimeNotification(messages[message].ownMessage);
+        cmpGuiInterface.DeleteTimeNotification(messages[message].otherMessage);
+    }
+
+    for (let timer in timers)
+        cmpTimer.CancelTimer(timers[timer]);
+};
+
 var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
 cmpTrigger.RegisterTrigger("OnOwnershipChanged", "CheckWonderVictory", { "enabled": true });
 cmpTrigger.wonderVictoryTimers = {};

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

@@ -131 +131 @@
     this.AlliedVictoryCheck();
 };
 
+EndGameManager.prototype.OnGlobalPlayerWon = function(msg)
+{
+    if (this.gameType != "wonder")
+        return;
+
+    let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
+    cmpTrigger.DeleteMessages();
+};
+
 Engine.RegisterSystemComponentType(IID_EndGameManager, "EndGameManager", EndGameManager);