mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 04:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

protect possible infinite loop when an order is issued on the same turn as garrisoning is effectively processed

Browse Source 
Reviewed By: O2 JS Simulation, elexis, s0600204, bb
Differential Revision: https://code.wildfiregames.com/D686
This was SVN commit r19900.
This commit is contained in:
mimo
2017-07-10 16:10:50 +00:00
parent 43137fef3f
commit 1196ececed
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/components/UnitAI.js
+6
View File
@@ -4975,7 +4975,13 @@ UnitAI.prototype.AddOrder = function(type, data, queued)
if (queued)
this.PushOrder(type, data);
else
{
// May happen only if an order arrives on the same turn the unit is garrisoned
// in that case, just forget the order as this will lead to a weird state
if (this.IsGarrisoned() && !this.IsTurret() && type != "Ungarrison")
return;
this.ReplaceOrder(type, data);
}
};
/**