dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only cancel (un)packing when in the correct state.

Browse source 
Differential revision: D3285
This was SVN commit r24955.
This commit is contained in:
Freagarach 2021-02-28 05:51:55 +00:00
parent c33d1192bc
commit e5ee028313
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
binaries/data/mods/public/simulation/components/UnitAI.js
View file

@ -683,20 +683,6 @@ UnitAI.prototype.UnitFsmSpec = {
this.SetNextState("INDIVIDUAL.UNPACKING");
},
"Order.CancelPack": function(msg) {
var cmpPack = Engine.QueryInterface(this.entity, IID_Pack);
if (cmpPack && cmpPack.IsPacking() && !cmpPack.IsPacked())
cmpPack.CancelPack();
this.FinishOrder();
},
"Order.CancelUnpack": function(msg) {
var cmpPack = Engine.QueryInterface(this.entity, IID_Pack);
if (cmpPack && cmpPack.IsPacking() && cmpPack.IsPacked())
cmpPack.CancelPack();
this.FinishOrder();
},
"Order.MoveToChasingPoint": function(msg) {
// Overriden by the CHASING state.
// Can however happen outside of it when renaming...
@ -3317,6 +3303,10 @@ UnitAI.prototype.UnitFsmSpec = {
return false;
},
"Order.CancelPack": function(msg) {
this.FinishOrder();
},
"PackFinished": function(msg) {
this.FinishOrder();
},
@ -3338,6 +3328,10 @@ UnitAI.prototype.UnitFsmSpec = {
return false;
},
"Order.CancelUnpack": function(msg) {
this.FinishOrder();
},
"PackFinished": function(msg) {
this.FinishOrder();
},