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

remove useless 'map' arg on ConvertToPreview

Browse Source
This commit is contained in:
Chris Forbes
2011-10-18 20:55:49 +13:00
parent eddc4cc4b1
commit 7161b8062e
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,9 @@ namespace OpenRA.Widgets
return true; return true;
} }
public int2 ConvertToPreview(Map map, int2 point) public int2 ConvertToPreview(int2 point)
{ {
var map = Map();
return new int2(MapRect.X + (int)(PreviewScale*(point.X - map.Bounds.Left)) , MapRect.Y + (int)(PreviewScale*(point.Y - map.Bounds.Top))); return new int2(MapRect.X + (int)(PreviewScale*(point.X - map.Bounds.Left)) , MapRect.Y + (int)(PreviewScale*(point.Y - map.Bounds.Top)));
} }
@@ -94,7 +95,7 @@ namespace OpenRA.Widgets
foreach (var p in map.GetSpawnPoints()) foreach (var p in map.GetSpawnPoints())
{ {
var owned = colors.ContainsKey(p); var owned = colors.ContainsKey(p);
var pos = ConvertToPreview(map, p); var pos = ConvertToPreview(p);
var sprite = ChromeProvider.GetImage("spawnpoints", owned ? "owned" : "unowned"); var sprite = ChromeProvider.GetImage("spawnpoints", owned ? "owned" : "unowned");
var offset = new int2(-sprite.bounds.Width/2, -sprite.bounds.Height/2); var offset = new int2(-sprite.bounds.Width/2, -sprite.bounds.Height/2);

2
OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
View File

@@ -123,7 +123,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
return; return;
var p = Map.GetSpawnPoints() var p = Map.GetSpawnPoints()
.Select((sp, i) => Pair.New(mapPreview.ConvertToPreview(Map, sp), i)) .Select((sp, i) => Pair.New(mapPreview.ConvertToPreview(sp), i))
.Where(a => (a.First - mi.Location).LengthSquared < 64) .Where(a => (a.First - mi.Location).LengthSquared < 64)
.Select(a => a.Second + 1) .Select(a => a.Second + 1)
.FirstOrDefault(); .FirstOrDefault();

2
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
return; return;
var selectedSpawn = Map.GetSpawnPoints() var selectedSpawn = Map.GetSpawnPoints()
.Select((sp, i) => Pair.New(mapPreview.ConvertToPreview(Map, sp), i)) .Select((sp, i) => Pair.New(mapPreview.ConvertToPreview(sp), i))
.Where(a => (a.First - mi.Location).LengthSquared < 64) .Where(a => (a.First - mi.Location).LengthSquared < 64)
.Select(a => a.Second + 1) .Select(a => a.Second + 1)
.FirstOrDefault(); .FirstOrDefault();