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

Revert dbbc600dc3, refs #3745, refs #3823

Browse Source 
This was SVN commit r17885.
This commit is contained in:
Nicolas Auvray 2016-03-13 22:18:31 +00:00
parent f7ea533ab9
commit a7b31398b0
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ g_SelectionPanels.Command = {
{
return 6;
},
"getItems": function(unitEntState, selection)
"getItems": function(unitEntState)
{
let commands = [];
@ -205,25 +205,6 @@ g_SelectionPanels.Command = {
info.name = c;
commands.push(info);
}
// if the given unit state has no back-to-work entry, we need to check the other units as well
// otherwise the command back-to-work is not shown
if (!commands["back-to-work"])
{
for (let id of selection)
{
let uEntState = GetEntityState(id);
let info = g_EntityCommands["back-to-work"].getInfo(uEntState);
if (!info)
continue;
info.name = "back-to-work";
commands.push(info);
break;
}
}
return commands;
},
"setTooltip": function(data)

11
binaries/data/mods/public/gui/session/unit_commands.js
View File

@ -30,15 +30,16 @@ function setPanelObjectPosition(object, index, rowLength, vMargin = 1, hMargin =
* @param guiName Short identifier string of this panel. See g_SelectionPanels.
* @param unitEntState Entity state of the selected unit with the lowest id.
* @param payerState Player state
* @param selectedEntries All selected units
*/
function setupUnitPanel(guiName, unitEntState, playerState, selection)
function setupUnitPanel(guiName, unitEntState, playerState)
{
if (!g_SelectionPanels[guiName])
{
error("unknown guiName used '" + guiName + "'");
return;
}
let selection = g_Selection.toList();
var items = g_SelectionPanels[guiName].getItems(unitEntState, selection);
if (!items || !items.length)
@ -173,7 +174,7 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
)
continue;
setupUnitPanel(guiName, entState, playerStates[entState.player], selection);
setupUnitPanel(guiName, entState, playerStates[entState.player]);
}
supplementalDetailsPanel.hidden = false;
@ -183,8 +184,8 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
{
// TODO if there's a second panel needed for a different player
// we should consider adding the players list to g_SelectionPanels
setupUnitPanel("Garrison", entState, playerState, selection);
setupUnitPanel("AllyCommand", entState, playerState, selection);
setupUnitPanel("Garrison", entState, playerState);
setupUnitPanel("AllyCommand", entState, playerState);
supplementalDetailsPanel.hidden = !g_SelectionPanels.Garrison.used;