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

Fix #845 (spawnpoint artwork leaks across mod change)

Browse Source
This commit is contained in:
Paul Chote
2011-05-30 18:19:05 +12:00
parent c07abc48b2
commit 6512db14cf
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Game/Widgets/MapPreviewWidget.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Widgets
{ {
public Func<Map> Map = () => null; public Func<Map> Map = () => null;
public Func<Dictionary<int2, Color>> SpawnColors = () => new Dictionary<int2, Color>(); public Func<Dictionary<int2, Color>> SpawnColors = () => new Dictionary<int2, Color>();
static Cache<Map,Bitmap> PreviewCache = new Cache<Map, Bitmap>(stub => Minimap.RenderMapPreview( new Map( stub.Path ))); Cache<Map,Bitmap> PreviewCache = new Cache<Map, Bitmap>(stub => Minimap.RenderMapPreview( new Map( stub.Path )));
public MapPreviewWidget() : base() { } public MapPreviewWidget() : base() { }
protected MapPreviewWidget(MapPreviewWidget other) protected MapPreviewWidget(MapPreviewWidget other)
@@ -42,16 +42,9 @@ namespace OpenRA.Widgets
Map lastMap; Map lastMap;
Rectangle MapRect; Rectangle MapRect;
float PreviewScale = 0; float PreviewScale = 0;
static Sprite UnownedSpawn = null;
static Sprite OwnedSpawn = null;
public override void DrawInner() public override void DrawInner()
{ {
if (UnownedSpawn == null)
UnownedSpawn = ChromeProvider.GetImage("spawnpoints", "unowned");
if (OwnedSpawn == null)
OwnedSpawn = ChromeProvider.GetImage("spawnpoints", "owned");
var map = Map(); var map = Map();
if( map == null ) return; if( map == null ) return;
@@ -83,16 +76,14 @@ namespace OpenRA.Widgets
var colors = SpawnColors(); var colors = SpawnColors();
foreach (var p in map.SpawnPoints) foreach (var p in map.SpawnPoints)
{ {
var owned = colors.ContainsKey(p);
var pos = ConvertToPreview(map, p); var pos = ConvertToPreview(map, p);
var sprite = UnownedSpawn; var sprite = ChromeProvider.GetImage("spawnpoints", owned ? "owned" : "unowned");
var offset = new int2(-UnownedSpawn.bounds.Width/2, -UnownedSpawn.bounds.Height/2); var offset = new int2(-sprite.bounds.Width/2, -sprite.bounds.Height/2);
if (colors.ContainsKey(p)) if (owned)
{
sprite = OwnedSpawn;
offset = new int2(-OwnedSpawn.bounds.Width/2, -OwnedSpawn.bounds.Height/2);
WidgetUtils.FillRectWithColor(new Rectangle(pos.X + offset.X + 2, pos.Y + offset.Y + 2, 12, 12), colors[p]); WidgetUtils.FillRectWithColor(new Rectangle(pos.X + offset.X + 2, pos.Y + offset.Y + 2, 12, 12), colors[p]);
}
Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos + offset); Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos + offset);
} }
} }