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

Move ChooseInitialMap to MapCache.

Browse Source
This commit is contained in:
Paul Chote
2015-07-04 13:02:10 +01:00
parent 728bad9565
commit 2150a5e865
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -402,7 +402,7 @@ namespace OpenRA
{
while (true)
{
Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
Settings.Server.Map = ModData.MapCache.ChooseInitialMap(Settings.Server.Map);
Settings.Save();
CreateServer(Settings.Server.Clone());

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

@@ -237,6 +237,18 @@ namespace OpenRA
});
}
public string ChooseInitialMap(string initialUid)
{
if (string.IsNullOrEmpty(initialUid) || previews[initialUid].Status != MapStatus.Available)
{
var selected = previews.Values.Where(x => x.SuitableForInitialMap).RandomOrDefault(Game.CosmeticRandom) ??
previews.Values.First(m => m.Status == MapStatus.Available && m.Visibility.HasFlag(MapVisibility.Lobby));
return selected.Uid;
}
return initialUid;
}
public MapPreview this[string key]
{
get { return previews[key]; }

12
OpenRA.Game/Widgets/WidgetUtils.cs
View File

@@ -248,18 +248,6 @@ namespace OpenRA.Widgets
return trimmed;
}
public static string ChooseInitialMap(string initialUid)
{
if (string.IsNullOrEmpty(initialUid) || Game.ModData.MapCache[initialUid].Status != MapStatus.Available)
{
var selected = Game.ModData.MapCache.Where(x => x.SuitableForInitialMap).RandomOrDefault(Game.CosmeticRandom) ??
Game.ModData.MapCache.First(m => m.Status == MapStatus.Available && m.Visibility.HasFlag(MapVisibility.Lobby));
return selected.Uid;
}
return initialUid;
}
}
public class CachedTransform<T, U>