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

Merge pull request #3020 from pchote/shroud-sanity

Browse Source 
Refactor per-player shrouds.
This commit is contained in:
Chris Forbes
2013-04-12 01:53:31 -07:00
parent 4e33f26859 400ad49de0
commit b649b4b7bb
45 changed files with 364 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
private bool teamChat = false;
internal bool TeamChat
{
get { return World.Observer ? false : teamChat; }
get { return World.LocalPlayer == null ? false : teamChat; }
set { teamChat = value; }
}

10
OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
View File

@@ -40,16 +40,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
var views = world.Players.Where(p => !p.NonCombatant).ToDictionary(p => p.PlayerName,
p => new CameraOption("{0}'s view".F(p.PlayerName),
() => world.RenderedPlayer == p,
() => { world.RenderedPlayer = p; world.RenderedShroud.Dirty(); }
() => world.RenderPlayer == p,
() => world.RenderPlayer = p
));
views.Add("", new CameraOption("World view",
() => world.RenderedPlayer == null,
() => { world.RenderedPlayer = null; world.RenderedShroud.Dirty(); }
() => world.RenderPlayer == null,
() => world.RenderPlayer = null
));
var shroudSelector = widget.Get<DropDownButtonWidget>("SHROUD_SELECTOR");
shroudSelector.GetText = () => views[world.RenderedPlayer == null ? "" : world.RenderedPlayer.PlayerName].Label;
shroudSelector.GetText = () => views[world.RenderPlayer == null ? "" : world.RenderPlayer.PlayerName].Label;
shroudSelector.OnMouseDown = _ =>
{
Func<CameraOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>