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

Allow ejecting single entities from non-owned garrisonHolder when allowed to control all.

Browse Source 
Found by @wraitii in D1960.

Differential revision: D3065
This was SVN commit r24505.
This commit is contained in:
Freagarach 2021-01-04 06:31:29 +00:00
parent d06ff05fc4
commit 8de6d85127
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
binaries/data/mods/public/gui/session/selection_panels.js
View File

@ -329,13 +329,11 @@ g_SelectionPanels.Garrison = {
data.countDisplay.caption = data.item.ents.length || "";
let canUngarrison =
g_ViewedPlayer == data.player ||
g_ViewedPlayer == entState.player;
let canUngarrison = controlsPlayer(data.player) || controlsPlayer(entState.player);
data.button.enabled = canUngarrison && controlsPlayer(g_ViewedPlayer);
data.button.enabled = canUngarrison;
data.button.tooltip = (canUngarrison || g_IsObserver ?
data.button.tooltip = (canUngarrison ?
sprintf(translate("Unload %(name)s"), { "name": getEntityNames(template) }) + "\n" +
translate("Single-click to unload 1. Shift-click to unload all of this type.") :
getEntityNames(template)) + "\n" +