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

Merge pull request #10492 from pchote/fix-mission-order

Browse Source 
Sort missions by their order in missions.yaml
This commit is contained in:
abcdefg30
2016-01-16 13:26:26 +01:00
parent aa23928e7b 260681d048
commit 2ccf142ce9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,11 +103,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var yaml = MiniYaml.ApplyRemovals(partial); var yaml = MiniYaml.ApplyRemovals(partial);
foreach (var kv in yaml) foreach (var kv in yaml)
{ {
var missionMapPaths = kv.Value.Nodes.Select(n => Path.GetFullPath(n.Key)); var missionMapPaths = kv.Value.Nodes.Select(n => Path.GetFullPath(n.Key)).ToList();
var maps = Game.ModData.MapCache var maps = Game.ModData.MapCache
.Where(p => p.Status == MapStatus.Available && missionMapPaths.Contains(Path.GetFullPath(p.Map.Path))) .Where(p => p.Status == MapStatus.Available && missionMapPaths.Contains(Path.GetFullPath(p.Map.Path)))
.Select(p => p.Map); .Select(p => p.Map)
.OrderBy(m => missionMapPaths.IndexOf(Path.GetFullPath(m.Path)));
CreateMissionGroup(kv.Key, maps); CreateMissionGroup(kv.Key, maps);
allMaps.AddRange(maps); allMaps.AddRange(maps);