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

Fix grouping of garrisoned units. Patch by mimo. Fixes #1918.

Browse Source 
This was SVN commit r13360.
This commit is contained in:
leper 2013-04-18 18:18:24 +00:00
parent 503b481468
commit a362b41029
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
binaries/data/mods/public/gui/session/selection.js
View File

@ -59,11 +59,12 @@ EntityGroups.prototype.add = function(ents)
continue;
var templateName = entState.template;
// Special handling for garrisoned units
if (templateName && templateName.indexOf("&") != -1)
var key = templateName;
else
var key = GetTemplateData(templateName).selectionGroupName || templateName;
var key = GetTemplateData(templateName).selectionGroupName || templateName;
// Prefix garrisoned unit's selection name with the player they belong to
var index = templateName.indexOf("&");
if (index != -1 && key.indexOf("&") == -1)
key = templateName.slice(0, index+1) + key;
if (this.groups[key])
this.groups[key] += 1;