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

#1284 fixed; don't show spawnpoints on serverbrowser thumbnails

Browse Source
This commit is contained in:
Chris Forbes
2011-12-31 11:32:59 +13:00
parent 809b716d0d
commit 965fe88755
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ namespace OpenRA.Widgets
public Func<Dictionary<int2, Color>> SpawnColors = () => new Dictionary<int2, Color>(); public Func<Dictionary<int2, Color>> SpawnColors = () => new Dictionary<int2, Color>();
public Action<MouseInput> OnMouseDown = _ => {}; public Action<MouseInput> OnMouseDown = _ => {};
public bool IgnoreMouseInput = false; public bool IgnoreMouseInput = false;
public bool ShowSpawnPoints = true;
static Cache<Map,Bitmap> PreviewCache = new Cache<Map, Bitmap>(stub => Minimap.RenderMapPreview( new Map( stub.Path ))); static Cache<Map,Bitmap> PreviewCache = new Cache<Map, Bitmap>(stub => Minimap.RenderMapPreview( new Map( stub.Path )));
@@ -33,6 +34,7 @@ namespace OpenRA.Widgets
lastMap = other.lastMap; lastMap = other.lastMap;
Map = other.Map; Map = other.Map;
SpawnColors = other.SpawnColors; SpawnColors = other.SpawnColors;
ShowSpawnPoints = other.ShowSpawnPoints;
} }
public override Widget Clone() { return new MapPreviewWidget(this); } public override Widget Clone() { return new MapPreviewWidget(this); }
@@ -90,19 +92,22 @@ namespace OpenRA.Widgets
new float2(MapRect.Location), new float2(MapRect.Location),
new float2( MapRect.Size ) ); new float2( MapRect.Size ) );
// Overlay spawnpoints if (ShowSpawnPoints)
var colors = SpawnColors();
foreach (var p in map.GetSpawnPoints())
{ {
var owned = colors.ContainsKey(p); var colors = SpawnColors();
var pos = ConvertToPreview(p);
var sprite = ChromeProvider.GetImage("spawnpoints", owned ? "owned" : "unowned");
var offset = new int2(-sprite.bounds.Width/2, -sprite.bounds.Height/2);
if (owned) foreach (var p in map.GetSpawnPoints())
WidgetUtils.FillRectWithColor(new Rectangle(pos.X + offset.X + 2, pos.Y + offset.Y + 2, 12, 12), colors[p]); {
var owned = colors.ContainsKey(p);
var pos = ConvertToPreview(p);
var sprite = ChromeProvider.GetImage("spawnpoints", owned ? "owned" : "unowned");
var offset = new int2(-sprite.bounds.Width/2, -sprite.bounds.Height/2);
Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos + offset); if (owned)
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);
}
} }
} }
} }

1
mods/cnc/chrome/serverbrowser.yaml
View File

@@ -38,6 +38,7 @@ Container@SERVERBROWSER_PANEL:
Y:2 Y:2
Width:64 Width:64
Height:64 Height:64
ShowSpawnPoints:no
Label@TITLE: Label@TITLE:
Id:TITLE Id:TITLE
X:70 X:70

1
mods/ra/chrome/serverbrowser.yaml
View File

@@ -35,6 +35,7 @@ Background@JOINSERVER_BG:
Y:2 Y:2
Width:64 Width:64
Height:64 Height:64
ShowSpawnPoints:no
Label@TITLE: Label@TITLE:
Id:TITLE Id:TITLE
X:70 X:70