Ticket #2353: fix.2.patch

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

@@ -37 +37 @@
     PlaySound(alertString, this.entity);
 };
 
-AlertRaiser.prototype.UpdateUnits = function()
+AlertRaiser.prototype.UpdateUnits = function(units)
 {
-    // Find units owned by this unit's player
-    var players = [];
-    var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
-    if (cmpOwnership)
-        players = [cmpOwnership.GetOwner()];
-
-    // Select units to put under alert, ignoring domestic animals (NB : war dogs are not domestic)
-    var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-    var level = this.GetLevel();
-    var units = rangeMan.ExecuteQuery(this.entity, 0, this.template.Range, players, IID_UnitAI).filter( function(e){
-        var cmpUnitAI = Engine.QueryInterface(e, IID_UnitAI);
-        return (!cmpUnitAI.IsUnderAlert() && cmpUnitAI.ReactsToAlert(level) && !cmpUnitAI.IsDomestic());
-        });
-    
     for each (var unit in units)
     {
         var cmpUnitAI = Engine.QueryInterface(unit, IID_UnitAI);
+        if(!cmpUnitAI)
+            continue;
+        
         cmpUnitAI.ReplaceOrder("Alert", {"raiser": this.entity, "force": true});
         this.walkingUnits.push(unit);
     }
@@ -69 +58 @@
     this.level++;
     this.SoundAlert();
 
-    // Find buildings owned by this unit's player
+    // Find buildings / units owned by this unit's player
     var players = [];
     var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
     if (cmpOwnership)
@@ -89 +78 @@
         cmpProductionQueue.PutUnderAlert(this.entity);
         this.prodBuildings.push(building);
     }
+
+    // Select units to put under alert, ignoring domestic animals (NB : war dogs are not domestic)
+    var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var level = this.GetLevel();
+    var units = rangeMan.ExecuteQuery(this.entity, 0, this.template.Range, players, IID_UnitAI).filter( function(e){
+        var cmpUnitAI = Engine.QueryInterface(e, IID_UnitAI);
+        return (!cmpUnitAI.IsUnderAlert() && cmpUnitAI.ReactsToAlert(level) && !cmpUnitAI.IsDomestic());
+        });
     
-    // Put units under alert
-    this.UpdateUnits();
+    for each (var unit in units)
+    {
+        var cmpUnitAI = Engine.QueryInterface(unit, IID_UnitAI);
+        cmpUnitAI.ReplaceOrder("Alert", {"raiser": this.entity, "force": true});
+        this.walkingUnits.push(unit);
+    }
     
     return true;
 };
@@ -131 +132 @@
     {
         var cmpGarrisonHolder = Engine.QueryInterface(slot.holder, IID_GarrisonHolder);
         var cmpUnitAI = Engine.QueryInterface(slot.unit, IID_UnitAI);
-        if (!cmpUnitAI || !cmpGarrisonHolder)
+        if (!cmpUnitAI)
             continue;
         
-        if(cmpGarrisonHolder && cmpGarrisonHolder.PerformEject([slot.unit], true))
+        // If the garrison building was destroyed, the unit is already ejected
+        if (!cmpGarrisonHolder || cmpGarrisonHolder.PerformEject([slot.unit], true))
         {
             cmpUnitAI.ResetAlert();             
             if (cmpUnitAI.HasWorkOrders())

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

@@ -609 +609 @@
         {
             var cmpAlertRaiser = Engine.QueryInterface(this.alertRaiser, IID_AlertRaiser);
             if(cmpAlertRaiser)
-                cmpAlertRaiser.UpdateUnits();
+                cmpAlertRaiser.UpdateUnits(createdEnts);
         }
     }