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

Fixed bug introduced by recent change to input.js: diplomacy is properly read to determine enemy players for attacking

Browse Source 
This was SVN commit r8593.
This commit is contained in:
historic_bruno 2010-11-13 20:49:58 +00:00
parent 58b33af168
commit f4b0b72aa8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binaries/data/mods/public/gui/session_new/input.js
View File

@ -117,14 +117,19 @@ function determineAction(x, y, fromMinimap)
// Check if the target entity is a resource, dropsite, foundation, or enemy unit.
// Check if any entities in the selection can gather the requested resource,
// can return to the dropsite, can build the foundation, or can attack the enemy
var simState = Engine.GuiInterfaceCall("GetSimulationState");
for each (var entityID in selection)
{
var entState = GetEntityState(entityID);
if (!entState)
continue;
// Get entity owner diplomacy array
var diplomacy = simState.players[entState.player].diplomacy;
var playerOwned = ((targetState.player == entState.player)? true : false);
var enemyOwned = ((targetState.player != entState.player && entState.diplomacy && entState.diplomacy[targetState.player - 1] < 0)? true : false);
var enemyOwned = ((targetState.player != entState.player && (!diplomacy || diplomacy[targetState.player - 1] < 0))? true : false);
var gaiaOwned = ((targetState.player == 0)? true : false);
// Find the resource type we're carrying, if any