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

Remove MapPreview.Map.

Browse Source
This commit is contained in:
Paul Chote
2016-02-05 22:04:06 +00:00
parent 3708a7649d
commit 7b00da04ca
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Map/MapCache.cs
View File

@@ -174,7 +174,8 @@ namespace OpenRA
if (bitmap == null) if (bitmap == null)
{ {
createdPreview = true; createdPreview = true;
bitmap = Minimap.RenderMapPreview(modData.DefaultRules.TileSets[p.Map.Tileset], p.Map, modData.DefaultRules, true); var map = new Map(p.Path);
bitmap = Minimap.RenderMapPreview(modData.DefaultRules.TileSets[map.Tileset], map, modData.DefaultRules, true);
} }
Game.RunAfterTick(() => Game.RunAfterTick(() =>

2
OpenRA.Game/Map/MapPreview.cs
View File

@@ -67,7 +67,6 @@ namespace OpenRA
public MapGridType GridType { get; private set; } public MapGridType GridType { get; private set; }
public Rectangle Bounds { get; private set; } public Rectangle Bounds { get; private set; }
public Bitmap CustomPreview { get; private set; } public Bitmap CustomPreview { get; private set; }
public Map Map { get; private set; }
public MapStatus Status { get; private set; } public MapStatus Status { get; private set; }
public MapClassification Class { get; private set; } public MapClassification Class { get; private set; }
public MapVisibility Visibility { get; private set; } public MapVisibility Visibility { get; private set; }
@@ -117,7 +116,6 @@ namespace OpenRA
public void UpdateFromMap(Map m, MapClassification classification) public void UpdateFromMap(Map m, MapClassification classification)
{ {
Map = m;
Path = m.Path; Path = m.Path;
Title = m.Title; Title = m.Title;
Type = m.Type; Type = m.Type;

2
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -926,7 +926,7 @@ namespace OpenRA.Mods.Common.Server
static void LoadMap(S server) static void LoadMap(S server)
{ {
server.Map = server.ModData.MapCache[server.LobbyInfo.GlobalSettings.Map].Map; server.Map = new Map(server.ModData.MapCache[server.LobbyInfo.GlobalSettings.Map].Path);
server.MapPlayers = new MapPlayers(server.Map.PlayerDefinitions); server.MapPlayers = new MapPlayers(server.Map.PlayerDefinitions);
server.LobbyInfo.Slots = server.MapPlayers.Players server.LobbyInfo.Slots = server.MapPlayers.Players

2
OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
Game.ModData.MapCache.LoadMaps(); Game.ModData.MapCache.LoadMaps();
maps.AddRange(Game.ModData.MapCache maps.AddRange(Game.ModData.MapCache
.Where(m => m.Status == MapStatus.Available) .Where(m => m.Status == MapStatus.Available)
.Select(m => m.Map)); .Select(m => new Map(m.Path)));
} }
else else
maps.Add(new Map(args[1])); maps.Add(new Map(args[1]));

2
OpenRA.Mods.Common/UtilityCommands/UpgradeModCommand.cs
View File

@@ -101,7 +101,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine("Processing Maps:"); Console.WriteLine("Processing Maps:");
var maps = Game.ModData.MapCache var maps = Game.ModData.MapCache
.Where(m => m.Status == MapStatus.Available) .Where(m => m.Status == MapStatus.Available)
.Select(m => m.Map); .Select(m => new Map(m.Path));
foreach (var map in maps) foreach (var map in maps)
{ {

6
OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
View File

@@ -105,7 +105,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var maps = modData.MapCache var maps = modData.MapCache
.Where(p => p.Status == MapStatus.Available && missionMapPaths.Contains(Path.GetFullPath(p.Path))) .Where(p => p.Status == MapStatus.Available && missionMapPaths.Contains(Path.GetFullPath(p.Path)))
.Select(p => p.Map) .Select(p => new Map(p.Path))
.OrderBy(m => missionMapPaths.IndexOf(Path.GetFullPath(m.Path))); .OrderBy(m => missionMapPaths.IndexOf(Path.GetFullPath(m.Path)));
CreateMissionGroup(kv.Key, maps); CreateMissionGroup(kv.Key, maps);
@@ -115,8 +115,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Add an additional group for loose missions // Add an additional group for loose missions
var looseMissions = modData.MapCache var looseMissions = modData.MapCache
.Where(p => p.Status == MapStatus.Available && p.Visibility.HasFlag(MapVisibility.MissionSelector) && !allMaps.Contains(p.Map)) .Where(p => p.Status == MapStatus.Available && p.Visibility.HasFlag(MapVisibility.MissionSelector) && !allMaps.Any(m => m.Uid == p.Uid))
.Select(p => p.Map); .Select(p => new Map(p.Path));
if (looseMissions.Any()) if (looseMissions.Any())
{ {