Ticket #4010: wondervictorymessagesfix_v2.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)
+    {
+        var 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, OnPlayerWon = true)
+{
+    let timers = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger).wonderVictoryTimers;
+    let messages = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger).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.RegisterTrigger("OnPlayerWon", "DeleteMessages", { "enabled": true });
 cmpTrigger.wonderVictoryTimers = {};
 cmpTrigger.wonderVictoryMessages = {};

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

@@ -59 +59 @@
             continue;
 
         if (playerID == cmpPlayer.GetPlayerID() || this.alliedVictory && cmpPlayer.IsMutualAlly(playerID))
+        {
             cmpPlayer.SetState("won");
+            Engine.BroadcastMessage(MT_PlayerWon);
+        }
         else
             Engine.PostMessage(playerEntityId, MT_PlayerDefeated, {
                 "playerId": i,
@@ -106 +109 @@
         {
             let cmpPlayer = QueryPlayerIDInterface(playerID);
             if (cmpPlayer)
+            {
                 cmpPlayer.SetState("won");
+                Engine.BroadcastMessage(MT_PlayerWon);
+            }
         }
 
         let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);

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

@@ -1 +1 @@
 Engine.RegisterInterface("EndGameManager");
 Engine.RegisterMessageType("PlayerDefeated");
 Engine.RegisterMessageType("GameTypeChanged");
+Engine.RegisterMessageType("PlayerWon");

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

@@ -14 +14 @@
     "Interval",
     "OwnershipChanged",
     "PlayerCommand",
+    "PlayerWon",
     "Range",
     "ResearchFinished",
     "ResearchQueued",
@@ -253 +254 @@
     // data is {"entity": ent, "from": playerId, "to": playerId}
 };
 
+Trigger.prototype.OnPlayerWon = function(msg)
+{
+    this.CallEvent("PlayerWon", msg);
+};
+
 /**
  * Execute a function after a certain delay.
  *