Map chooser
This commit is contained in:
@@ -74,32 +74,12 @@ namespace OpenRA
|
||||
|
||||
public readonly WorldRenderer WorldRenderer;
|
||||
internal readonly Minimap Minimap;
|
||||
|
||||
|
||||
public World()
|
||||
{
|
||||
Timer.Time( "----World.ctor" );
|
||||
|
||||
// TODO: Do this properly
|
||||
string mapPath = null;
|
||||
foreach (var mod in Game.LobbyInfo.GlobalSettings.Mods)
|
||||
{
|
||||
var path = "mods/"+mod+"/maps/"+Game.LobbyInfo.GlobalSettings.Map+"/";
|
||||
if (Directory.Exists(path))
|
||||
{
|
||||
mapPath = path;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (mapPath == null)
|
||||
{
|
||||
var path = "maps/"+Game.LobbyInfo.GlobalSettings.Map+"/";
|
||||
if (!Directory.Exists(path))
|
||||
throw new InvalidDataException("Unknown map `{0}`".F(Game.LobbyInfo.GlobalSettings.Map));
|
||||
mapPath = path;
|
||||
}
|
||||
Map = new Map( new Folder(mapPath) );
|
||||
|
||||
|
||||
Map = new Map( Game.AvailableMaps[Game.LobbyInfo.GlobalSettings.Map].Package );
|
||||
customTerrain = new ICustomTerrain[Map.MapSize.X, Map.MapSize.Y];
|
||||
Timer.Time( "new Map: {0}" );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user