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

fix radar (merge worked, but broken semantics)

Browse Source
This commit is contained in:
Chris Forbes
2010-01-06 15:51:37 +13:00
parent 5642d5f529
commit fe2320ac7c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRa.Game/Chrome.cs
View File

@@ -136,7 +136,7 @@ namespace OpenRa.Game
PerfHistory.Render(renderer, Game.worldRenderer.lineRenderer); PerfHistory.Render(renderer, Game.worldRenderer.lineRenderer);
Game.minimap.Draw(new float2(Game.viewport.Width - 256, 8)); DrawMinimap();
chromeRenderer.DrawSprite(specialBinSprite, float2.Zero, PaletteType.Chrome); chromeRenderer.DrawSprite(specialBinSprite, float2.Zero, PaletteType.Chrome);
chromeRenderer.DrawSprite(moneyBinSprite, new float2(Game.viewport.Width - 320, 0), PaletteType.Chrome); chromeRenderer.DrawSprite(moneyBinSprite, new float2(Game.viewport.Width - 320, 0), PaletteType.Chrome);
@@ -145,7 +145,7 @@ namespace OpenRa.Game
DrawPower(); DrawPower();
chromeRenderer.Flush(); chromeRenderer.Flush();
DrawButtons(); DrawButtons();
DrawMinimap();
int paletteHeight = DrawBuildPalette(currentTab); int paletteHeight = DrawBuildPalette(currentTab);
DrawBuildTabs(paletteHeight); DrawBuildTabs(paletteHeight);
DrawChat(); DrawChat();
@@ -153,9 +153,12 @@ namespace OpenRa.Game
void DrawMinimap() void DrawMinimap()
{ {
var hasRadar = Game.world.Actors.Any(a => a.Owner == Game.LocalPlayer && a.traits.Contains<ProvidesRadar>() && a.traits.Get<ProvidesRadar>().IsActive()); var hasRadar = Game.world.Actors.Any(a => a.Owner == Game.LocalPlayer
&& a.traits.Contains<ProvidesRadar>()
&& a.traits.Get<ProvidesRadar>().IsActive());
if (hasRadar) if (hasRadar)
Game.minimap.Draw(new float2(Game.viewport.Width - 128, 30)); Game.minimap.Draw(new float2(Game.viewport.Width - 256, 8));
} }
void AddButton(Rectangle r, Action<bool> b) { buttons.Add(Pair.New(r, b)); } void AddButton(Rectangle r, Action<bool> b) { buttons.Add(Pair.New(r, b)); }