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

Fix unload-all hotkey for allied buildings

Browse Source 
Reviewed by: causative
Differential Revision: https://code.wildfiregames.com/D648
This was SVN commit r19878.
This commit is contained in:
Imarok 2017-07-06 20:51:22 +00:00
parent 9aad0137ba
commit f876eb86fa
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
binaries/data/mods/public/gui/session/input.js
View File

@ -1755,24 +1755,17 @@ function unloadSelection()
Engine.PostNetworkCommand({ "type": "unload", "entities": ents, "garrisonHolder": parent });
}
function unloadAllByOwner()
{
var garrisonHolders = g_Selection.toList().filter(e => {
var state = GetEntityState(e);
return state && state.garrisonHolder;
});
Engine.PostNetworkCommand({ "type": "unload-all-by-owner", "garrisonHolders": garrisonHolders });
}
function unloadAll()
{
// Filter out all entities that aren't garrisonable.
var garrisonHolders = g_Selection.toList().filter(e => {
var state = GetEntityState(e);
let garrisonHolders = g_Selection.toList().filter(e => {
let state = GetEntityState(e);
return state && state.garrisonHolder;
});
Engine.PostNetworkCommand({ "type": "unload-all", "garrisonHolders": garrisonHolders });
Engine.PostNetworkCommand({
"type": controlsPlayer(GetEntityState(garrisonHolders[0]).player) ? "unload-all" : "unload-all-by-owner",
"garrisonHolders": garrisonHolders
});
}
function backToWork()

2
binaries/data/mods/public/gui/session/unit_actions.js
View File

@ -1372,7 +1372,7 @@ var g_AllyEntityCommands =
},
"execute": function(entState)
{
unloadAllByOwner();
unloadAll();
},
},