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

Fixed bug where gaia was not treated as attackable (fences could not be destroyed)

Browse Source 
This was SVN commit r8651.
This commit is contained in:
historic_bruno 2010-11-18 23:25:42 +00:00
parent 21acf61d69
commit f236fb7bd1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ function determineAction(x, y, fromMinimap)
var diplomacy = simState.players[entState.player].diplomacy;
var playerOwned = ((targetState.player == entState.player)? true : false);
var enemyOwned = ((targetState.player != entState.player && (!diplomacy || diplomacy[targetState.player - 1] < 0))? true : false);
var enemyOwned = ((targetState.player != entState.player && targetState.player && diplomacy[targetState.player - 1] < 0)? true : false);
var gaiaOwned = ((targetState.player == 0)? true : false);
// Find the resource type we're carrying, if any
@ -163,8 +163,8 @@ function determineAction(x, y, fromMinimap)
{
return {"type": "build", "cursor": "action-repair", "target": targets[0]};
}
else if (entState.attack && enemyOwned)
{
else if (entState.attack && (enemyOwned || gaiaOwned))
{ // TODO: Decide how we want to treat gaia
return {"type": "attack", "cursor": "action-attack", "target": targets[0]};
}
}