From 1f92286b51483ca19db04d23ca92ac7385abfba7 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 2 Jul 2011 03:53:13 +1200 Subject: [PATCH] Wire up cash display --- OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs | 11 +++++++++-- mods/cnc/chrome/ingame.yaml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs index 9e0a22ed69..124d46d08b 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs @@ -10,6 +10,7 @@ using System.Drawing; using System.Linq; +using OpenRA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.Cnc.Widgets.Logic @@ -39,15 +40,21 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic world.WorldActor.Trait() .Fade(CncMenuPaletteEffect.EffectType.None); - Game.AddChatLine += AddChatLine; Game.BeforeGameStart += UnregisterEvents; ingameRoot = widget.GetWidget("INGAME_ROOT"); if (world.LocalPlayer != null) - widget.GetWidget("PLAYER_WIDGETS").IsVisible = () => true; + { + var playerWidgets = widget.GetWidget("PLAYER_WIDGETS"); + playerWidgets.IsVisible = () => true; + var sidebarRoot = playerWidgets.GetWidget("SIDEBAR_BACKGROUND"); + var playerResources = world.LocalPlayer.PlayerActor.Trait(); + sidebarRoot.GetWidget("CASH_DISPLAY").GetText = () => + "${0}".F(playerResources.DisplayCash + playerResources.DisplayOre); + } ingameRoot.GetWidget("OPTIONS_BUTTON").OnClick = () => { if (menu != MenuType.None) diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 3991268c50..4adc3abd07 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -155,12 +155,12 @@ Container@INGAME_ROOT: Text:T Font:Bold Label@CASH: + Id:CASH_DISPLAY Y:160 Width:PARENT_RIGHT Height:25 Align:Center Font:Bold - Text:$5000 Container@PRODUCTION: X:10 Y:190