From ac71e60a4b52f89153c385a1109a26df9cb6d028 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 19 Jul 2011 20:37:48 +1200 Subject: [PATCH] remove SplitOreAndCash from MoneyBinWidget; noone uses it anymore --- OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs | 20 +------------------- mods/d2k/chrome/ingame.yaml | 3 +-- mods/ra/chrome/ingame.yaml | 1 - 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs b/OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs index 8291f10d2f..9a497256a6 100755 --- a/OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs @@ -17,8 +17,6 @@ namespace OpenRA.Mods.RA.Widgets { class MoneyBinWidget : Widget { - public bool SplitOreAndCash = false; - readonly World world; [ObjectCreator.UseCtor] public MoneyBinWidget( [ObjectCreator.Param] World world ) @@ -40,8 +38,7 @@ namespace OpenRA.Mods.RA.Widgets new float2(Bounds.Left, 0)); // Cash - var cashDigits = (SplitOreAndCash ? playerResources.DisplayCash - : (playerResources.DisplayCash + playerResources.DisplayOre)).ToString(); + var cashDigits = (playerResources.DisplayCash + playerResources.DisplayOre).ToString(); var x = Bounds.Right - 65; foreach (var d in cashDigits.Reverse()) @@ -51,21 +48,6 @@ namespace OpenRA.Mods.RA.Widgets new float2(x, 6)); x -= 14; } - - if (SplitOreAndCash) - { - x -= 14; - // Ore - var oreDigits = playerResources.DisplayOre.ToString(); - - foreach (var d in oreDigits.Reverse()) - { - Game.Renderer.RgbaSpriteRenderer.DrawSprite( - ChromeProvider.GetImage( digitCollection, (d - '0').ToString()), - new float2(x, 6)); - x -= 14; - } - } } } } diff --git a/mods/d2k/chrome/ingame.yaml b/mods/d2k/chrome/ingame.yaml index f0a4e45aac..efd3b058a3 100644 --- a/mods/d2k/chrome/ingame.yaml +++ b/mods/d2k/chrome/ingame.yaml @@ -81,7 +81,6 @@ Container@INGAME_ROOT: Y:0 Width:320 Height: 32 - SplitOreAndCash:No Children: OrderButton@SELL: Id:SELL @@ -283,4 +282,4 @@ Container@INGAME_ROOT: Y:260 Width:200 Height:20 - Text: Give Exploration \ No newline at end of file + Text: Give Exploration diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml index 838a8932a4..660e26fab2 100644 --- a/mods/ra/chrome/ingame.yaml +++ b/mods/ra/chrome/ingame.yaml @@ -90,7 +90,6 @@ Container@INGAME_ROOT: Y:0 Width:320 Height: 32 - SplitOreAndCash:No Children: OrderButton@SELL: Id:SELL