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

exchange if order otherwise we can't make a trade route with a damaged market

Browse Source 
This was SVN commit r14744.
This commit is contained in:
mimo 2014-02-09 18:42:06 +00:00
parent 44eb336dfe
commit d8152f1eda
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,12 +275,6 @@ function getActionInfo(action, target)
data.target = target;
cursor = "action-build";
}
else if (targetState.needsRepair && allyOwned)
{
data.command = "repair";
data.target = target;
cursor = "action-repair";
}
else if (hasClass(entState, "Market") && hasClass(targetState, "Market") && entState.id != targetState.id &&
(!hasClass(entState, "NavalMarket") || hasClass(targetState, "NavalMarket")) && !enemyOwned)
{
@ -306,6 +300,12 @@ function getActionInfo(action, target)
tooltip += "\nExpected gain: " + getTradingTooltip(gain);
}
}
else if (targetState.needsRepair && allyOwned)
{
data.command = "repair";
data.target = target;
cursor = "action-repair";
}
// Don't allow the rally point to be set on any of the currently selected entities (used for unset)
// except if the autorallypoint hotkey is pressed and the target can produce entities