From 899714f6676412de4df90dc9509a5815b868146e Mon Sep 17 00:00:00 2001 From: wraitii Date: Tue, 28 May 2019 10:00:19 +0000 Subject: [PATCH] Small commands.js cleanup Differential Revision: https://code.wildfiregames.com/D1504 This was SVN commit r22311. --- .../public/simulation/helpers/Commands.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/binaries/data/mods/public/simulation/helpers/Commands.js b/binaries/data/mods/public/simulation/helpers/Commands.js index ed55c10586..a2b4298482 100644 --- a/binaries/data/mods/public/simulation/helpers/Commands.js +++ b/binaries/data/mods/public/simulation/helpers/Commands.js @@ -530,20 +530,20 @@ var g_Commands = { "unload-template": function(player, cmd, data) { - var entities = FilterEntityListWithAllies(cmd.garrisonHolders, player, data.controlAllUnits); + let entities = FilterEntityListWithAllies(cmd.garrisonHolders, player, data.controlAllUnits); for (let garrisonHolder of entities) { - 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; + let cmpGarrisonHolder = Engine.QueryInterface(garrisonHolder, IID_GarrisonHolder); + if (!cmpGarrisonHolder) + continue; - if (!cmpGarrisonHolder.UnloadTemplate(cmd.template, cmd.owner, cmd.all)) - notifyUnloadFailure(player, garrisonHolder); - } + // 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); } }, @@ -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