Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Allow selecting multiple non-owned entities when control all is on.

Browse Source 
(Not with dragging, since that would be hard to use, UX-wise.)
It allows easier debugging; less switching between players.

Differential revision: https://code.wildfiregames.com/D4477
Comments by: @asterix, @Silier, @Stan
This was SVN commit r26327.
This commit is contained in:
Freagarach 2022-02-09 07:02:14 +00:00
parent d0549d7994
commit 9417a345d1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,6 +295,7 @@ EntitySelection.prototype.checkRenamedEntities = function()
*/
EntitySelection.prototype.addList = function(ents, quiet, force = false, addFormationMembers = true)
{
force = force || g_SimState.players[g_ViewedPlayer]?.controlsAll;
// If someone else's player is the sole selected unit, don't allow adding to the selection.
const firstEntState = this.selected.size == 1 && GetEntityState(this.getFirstSelected());
if (firstEntState && firstEntState.player != g_ViewedPlayer && !force)
@ -317,7 +318,6 @@ EntitySelection.prototype.addList = function(ents, quiet, force = false, addForm
let isUnowned = g_ViewedPlayer != -1 && entState.player != g_ViewedPlayer ||
g_ViewedPlayer == -1 && entState.player == 0;
// Don't add unowned entities to the list, unless a single entity was selected
if (isUnowned && (ents.length > 1 || this.selected.size) && !force)
continue;