wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

instead of removing members from formations as in e98478b68c, let the members stay in formation, but disable formation rearrangement in those cases.

Browse Source 
This fixes issues with queueing orders, and should also fix #2380

This was SVN commit r14584.
This commit is contained in:
sanderd17 2014-01-14 21:32:51 +00:00
parent 13105132a4
commit a6dbf6a268
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binaries/data/mods/public/simulation/components/UnitAI.js
View File

@ -1103,7 +1103,7 @@ var UnitFsmSpec = {
// Wait for individual members to finish
"enter": function(msg) {
var cmpFormation = Engine.QueryInterface(this.entity, IID_Formation);
cmpFormation.SetRearrange(true);
cmpFormation.SetRearrange(false);
this.StartTimer(1000, 1000);
},
@ -1334,14 +1334,6 @@ var UnitFsmSpec = {
// Sanity-checking
if (this.IsAnimal())
error("Animal got moved into INDIVIDUAL.* state");
// an entity in individual state shouldn't belong to a formation
if (this.IsFormationMember())
{
var cmpFormation = Engine.QueryInterface(this.formationController, IID_Formation);
if (cmpFormation)
cmpFormation.RemoveMembers([this.entity]);
}
},
"Attacked": function(msg) {