gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Handle orderone hotkey also for the minimap

Browse Source 
refs D308, 62f07098ea
Patch By: luiko
Comments By: Angen, Stan
Differential Revision: https://code.wildfiregames.com/D1822
This was SVN commit r22187.
This commit is contained in:
bb
2019-04-14 19:29:02 +00:00
parent 9621009360
commit 53bb9fa367
2 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/credits/texts/programming.json
+1
View File
@@ -135,6 +135,7 @@
{"nick": "Louhike"},
{"nick": "lsdh"},
{"nick": "Ludovic", "name": "Ludovic Rousseau"},
{"nick": "luiko", "name": "Luis Carlos Garcia Barajas"},
{"nick": "madmax", "name": "Abhijit Nandy"},
{"nick": "madpilot", "name": "Guido Falsi"},
{"nick": "m0l0t0ph", "name": "Christoph Gielisch"},
binaries/data/mods/public/gui/session/input.js
+32 -36
View File
@@ -1130,36 +1130,10 @@ function doAction(action, ev)
if (!controlsPlayer(g_ViewedPlayer))
return false;
// If shift is down, add the order to the unit's order queue instead
// of running it immediately
var orderone = Engine.HotkeyIsPressed("session.orderone");
var queued = Engine.HotkeyIsPressed("session.queue");
var target = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
if (g_UnitActions[action.type] && g_UnitActions[action.type].execute)
{
let selection = g_Selection.toList();
if (orderone)
{
// pick the first unit that can do this order.
let unit = selection.find(entity =>
["preSelectedActionCheck", "hotkeyActionCheck", "actionCheck"].some(method =>
g_UnitActions[action.type][method] &&
g_UnitActions[action.type][method](action.target || undefined, [entity])
));
if (unit)
{
selection = [unit];
g_Selection.removeList(selection);
}
}
return g_UnitActions[action.type].execute(target, action, selection, queued);
}
error("Invalid action.type " + action.type);
return false;
return handleUnitAction(Engine.GetTerrainAtScreenPoint(ev.x, ev.y), action);
}
function positionUnitsFreehandSelectionMouseMove(ev)
{
// Converting the input line into a List of points.
@@ -1251,18 +1225,40 @@ function handleMinimapEvent(target)
if (inputState != INPUT_NORMAL)
return false;
var fromMinimap = true;
var action = determineAction(undefined, undefined, fromMinimap);
let action = determineAction(undefined, undefined, true);
if (!action)
return false;
var selection = g_Selection.toList();
return handleUnitAction(target, action);
}
var queued = Engine.HotkeyIsPressed("session.queue");
if (g_UnitActions[action.type] && g_UnitActions[action.type].execute)
return g_UnitActions[action.type].execute(target, action, selection, queued);
error("Invalid action.type " + action.type);
return false;
function handleUnitAction(target, action)
{
if (!g_UnitActions[action.type] || !g_UnitActions[action.type].execute)
{
error("Invalid action.type " + action.type);
return false;
}
let selection = g_Selection.toList();
if (Engine.HotkeyIsPressed("session.orderone"))
{
// Pick the first unit that can do this order.
let unit = selection.find(entity =>
["preSelectedActionCheck", "hotkeyActionCheck", "actionCheck"].some(method =>
g_UnitActions[action.type][method] &&
g_UnitActions[action.type][method](action.target || undefined, [entity])
));
if (unit)
{
selection = [unit];
g_Selection.removeList(selection);
}
}
// If the session.queue hotkey is down, add the order to the unit's order queue instead
// of running it immediately
return g_UnitActions[action.type].execute(target, action, selection, Engine.HotkeyIsPressed("session.queue"));
}
function getEntityLimitAndCount(playerState, entType)