mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-20 03:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert 899714f667 to faciliate committing it again with credit in the commit message.

Browse Source 
Agreed with: wraitii and liked by vladislavbelov in
https://wildfiregames.com/forum/index.php?/topic/26104-leper-attribution-request-899714f667/
Refs D1504

This was SVN commit r22330.
This commit is contained in:
elexis
2019-05-31 21:56:13 +00:00
parent 7d25ab3a45
commit 2b5aaad399
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/helpers/Commands.js
+12 -12
View File
@@ -530,20 +530,20 @@ var g_Commands = {
"unload-template": function(player, cmd, data)
{
let entities = FilterEntityListWithAllies(cmd.garrisonHolders, player, data.controlAllUnits);
var entities = FilterEntityListWithAllies(cmd.garrisonHolders, player, data.controlAllUnits);
for (let garrisonHolder of entities)
{
let cmpGarrisonHolder = Engine.QueryInterface(garrisonHolder, IID_GarrisonHolder);
if (!cmpGarrisonHolder)
continue;
var cmpGarrisonHolder = Engine.QueryInterface(garrisonHolder, IID_GarrisonHolder);
if (cmpGarrisonHolder)
{
// Only the owner of the garrisonHolder may unload entities from any owners
if (!IsOwnedByPlayer(player, garrisonHolder) && !data.controlAllUnits
&& player != +cmd.owner)
continue;
// The owner of the garrison holder can unload entities from any players,
// other players can only ungarrison theirs.
if (!IsOwnedByPlayer(player, garrisonHolder) && !data.controlAllUnits && player != +cmd.owner)
continue;
if (!cmpGarrisonHolder.UnloadTemplate(cmd.template, cmd.owner, cmd.all))
notifyUnloadFailure(player, garrisonHolder);
if (!cmpGarrisonHolder.UnloadTemplate(cmd.template, cmd.owner, cmd.all))
notifyUnloadFailure(player, garrisonHolder);
}
}
},
@@ -1479,7 +1479,7 @@ function GetFormationUnitAIs(ents, player, formationTemplate)
var fid = formationIds[0];
var cmpFormation = Engine.QueryInterface(+fid, IID_Formation);
if (cmpFormation && cmpFormation.GetMemberCount() == formation.members[fid].length
&& cmpFormation.GetMemberCount() == formation.entities.length)
&& cmpFormation.GetMemberCount() == formation.entities.length)
{
cmpFormation.DeleteTwinFormations();
// The whole formation was selected, so reuse its controller for this command