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

Merge pull request #3128 from Mailaender/diplomacy-shroud

Browse Source 
Fix Fragile Alliance button usability and Diplomacy Shroud problems
This commit is contained in:
Chris Forbes
2013-04-20 16:53:08 -07:00
parent c86a17c170 f6908e45d3
commit 40f73a9289
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,6 +213,7 @@ namespace OpenRA.Network
var oldStance = p.Stances[target]; var oldStance = p.Stances[target];
p.Stances[target] = s; p.Stances[target] = s;
target.Shroud.UpdatePlayerStance(w, p, oldStance, s); target.Shroud.UpdatePlayerStance(w, p, oldStance, s);
p.Shroud.UpdatePlayerStance(w, target, oldStance, s);
foreach (var nsc in w.ActorsWithTrait<INotifyStanceChanged>()) foreach (var nsc in w.ActorsWithTrait<INotifyStanceChanged>())
nsc.Trait.StanceChanged(nsc.Actor, p, target, oldStance, s); nsc.Trait.StanceChanged(nsc.Actor, p, target, oldStance, s);

7
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -225,8 +225,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
if (fragileAlliance != null) if (fragileAlliance != null)
{ {
fragileAlliance.IsChecked = () => orderManager.LobbyInfo.GlobalSettings.FragileAlliances; fragileAlliance.IsChecked = () => orderManager.LobbyInfo.GlobalSettings.FragileAlliances;
fragileAlliance.IsDisabled = () => !Game.IsHost || gameStarting || orderManager.LocalClient == null fragileAlliance.IsDisabled = () => !Game.IsHost || gameStarting
|| orderManager.LocalClient.IsReady || TeamGame; // only available in FFA || orderManager.LocalClient == null || orderManager.LocalClient.IsReady;
fragileAlliance.OnClick = () => orderManager.IssueOrder(Order.Command( fragileAlliance.OnClick = () => orderManager.IssueOrder(Order.Command(
"fragilealliance {0}".F(!orderManager.LobbyInfo.GlobalSettings.FragileAlliances))); "fragilealliance {0}".F(!orderManager.LobbyInfo.GlobalSettings.FragileAlliances)));
}; };
@@ -597,9 +597,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
while (Players.Children.Count > idx) while (Players.Children.Count > idx)
Players.RemoveChild(Players.Children[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() void CycleReady()