From 7508b3f6e353b5ccc0e59024d6204f384749066a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 20 Apr 2013 18:42:54 +0200 Subject: [PATCH 1/2] remove automagic behaivor for the fragile alliance button it is not working well and I can't debug with bots with it --- OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 7066f80c25..13798ceb3e 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -225,8 +225,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic if (fragileAlliance != null) { fragileAlliance.IsChecked = () => orderManager.LobbyInfo.GlobalSettings.FragileAlliances; - fragileAlliance.IsDisabled = () => !Game.IsHost || gameStarting || orderManager.LocalClient == null - || orderManager.LocalClient.IsReady || TeamGame; // only available in FFA + fragileAlliance.IsDisabled = () => !Game.IsHost || gameStarting + || orderManager.LocalClient == null || orderManager.LocalClient.IsReady; fragileAlliance.OnClick = () => orderManager.IssueOrder(Order.Command( "fragilealliance {0}".F(!orderManager.LobbyInfo.GlobalSettings.FragileAlliances))); }; @@ -597,9 +597,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic while (Players.Children.Count > idx) Players.RemoveChild(Players.Children[idx]); - - if (orderManager.LobbyInfo.GlobalSettings.FragileAlliances && TeamGame) - orderManager.IssueOrder(Order.Command("fragilealliance false")); // No back-stabbing in Team games. } void CycleReady() From f6908e45d34f39d97b4b488fd89d3120a7bb0306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 20 Apr 2013 19:09:10 +0200 Subject: [PATCH 2/2] update the shroud for the player setting diplomatic stances fixes #2942 --- OpenRA.Game/Network/UnitOrders.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs index 24583688aa..ef91bbf067 100755 --- a/OpenRA.Game/Network/UnitOrders.cs +++ b/OpenRA.Game/Network/UnitOrders.cs @@ -213,6 +213,7 @@ namespace OpenRA.Network var oldStance = p.Stances[target]; p.Stances[target] = s; target.Shroud.UpdatePlayerStance(w, p, oldStance, s); + p.Shroud.UpdatePlayerStance(w, target, oldStance, s); foreach (var nsc in w.ActorsWithTrait()) nsc.Trait.StanceChanged(nsc.Actor, p, target, oldStance, s);