epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#240 declaring war should set the reciprocal state too

Browse Source
This commit is contained in:
Chris Forbes
2010-10-12 17:13:13 +13:00
parent 7c31f72db6
commit 10f8364b99
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -93,13 +93,16 @@ namespace OpenRA.Network
{ {
var targetPlayer = order.Player.World.players[order.TargetLocation.X]; var targetPlayer = order.Player.World.players[order.TargetLocation.X];
var oldStance = order.Player.Stances[targetPlayer]; var oldStance = order.Player.Stances[targetPlayer];
order.Player.Stances[targetPlayer] = (Stance)order.TargetLocation.Y; var newStance = (Stance)order.TargetLocation.Y;
if (targetPlayer == world.LocalPlayer) SetPlayerStance(world, order.Player, targetPlayer, newStance);
world.WorldActor.Trait<Shroud>().UpdatePlayerStance(world, order.Player, oldStance, order.Player.Stances[targetPlayer]);
// automatically declare war reciprocally
if (newStance == Stance.Enemy)
SetPlayerStance(world, targetPlayer, order.Player, newStance);
Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F( Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F(
order.Player.PlayerName, targetPlayer.PlayerName, order.Player.Stances[targetPlayer])); order.Player.PlayerName, targetPlayer.PlayerName, newStance));
break; break;
} }
default: default:
@@ -111,5 +114,13 @@ namespace OpenRA.Network
} }
} }
} }
static void SetPlayerStance(World w, Player a, Player b, Stance s)
{
var oldStance = a.Stances[b];
a.Stances[b] = s;
if (b == w.LocalPlayer)
w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, b, oldStance, s);
}
} }
} }