From 2a90634a7b983d3b7307335e1f1332705b5be2ed Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 23 Apr 2010 19:09:33 +1200 Subject: [PATCH] widgetized radar/power bin --- OpenRA.Game/Widgets/RadarBinWidget.cs | 4 ++-- mods/cnc/menus.yaml | 4 ++++ mods/ra/menus.yaml | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Widgets/RadarBinWidget.cs b/OpenRA.Game/Widgets/RadarBinWidget.cs index 10910698c9..9fb3b61fe4 100644 --- a/OpenRA.Game/Widgets/RadarBinWidget.cs +++ b/OpenRA.Game/Widgets/RadarBinWidget.cs @@ -37,8 +37,6 @@ namespace OpenRA.Widgets public override void Tick(World world) { - radarCollection = "radar-" + world.LocalPlayer.Country.Race; - if (!radarAnimating) return; @@ -76,6 +74,8 @@ namespace OpenRA.Widgets void DrawRadar(World world) { + radarCollection = "radar-" + world.LocalPlayer.Country.Race; + var hasNewRadar = world.Queries.OwnedBy[world.LocalPlayer] .WithTrait() .Any(a => a.Trait.IsActive); diff --git a/mods/cnc/menus.yaml b/mods/cnc/menus.yaml index 6001a2628f..98ba320107 100644 --- a/mods/cnc/menus.yaml +++ b/mods/cnc/menus.yaml @@ -343,6 +343,10 @@ Container: Width:160 Height:25 Text:Diplomacy + RadarBin@INGAME_RADAR_BIN: + Id:INGAME_RADAR_BIN + X:WINDOW_RIGHT - WIDTH + Y:0 MoneyBin@INGAME_MONEY_BIN: Id:INGAME_MONEY_BIN X:WINDOW_RIGHT - WIDTH diff --git a/mods/ra/menus.yaml b/mods/ra/menus.yaml index 6001a2628f..98ba320107 100644 --- a/mods/ra/menus.yaml +++ b/mods/ra/menus.yaml @@ -343,6 +343,10 @@ Container: Width:160 Height:25 Text:Diplomacy + RadarBin@INGAME_RADAR_BIN: + Id:INGAME_RADAR_BIN + X:WINDOW_RIGHT - WIDTH + Y:0 MoneyBin@INGAME_MONEY_BIN: Id:INGAME_MONEY_BIN X:WINDOW_RIGHT - WIDTH