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

Fix NRE

Browse Source
This commit is contained in:
Paul Chote
2010-04-04 14:29:03 +12:00
committed by Bob
parent 656ba93546
commit 2885b25ec7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -146,7 +146,7 @@ namespace OpenRA
ChromeProvider.Initialize(manifest.Chrome); ChromeProvider.Initialize(manifest.Chrome);
world = new World(); world = new World(mapName);
Timer.Time( "world: {0}" ); Timer.Time( "world: {0}" );

7
OpenRA.Game/World.cs
View File

@@ -75,11 +75,14 @@ namespace OpenRA
public readonly WorldRenderer WorldRenderer; public readonly WorldRenderer WorldRenderer;
internal readonly Minimap Minimap; internal readonly Minimap Minimap;
public World() public World(string mapUid)
{ {
Timer.Time( "----World.ctor" ); Timer.Time( "----World.ctor" );
Map = new Map( Game.AvailableMaps[Game.LobbyInfo.GlobalSettings.Map].Package ); if (!Game.AvailableMaps.ContainsKey(mapUid))
throw new InvalidDataException("Cannot find map with Uid {0}".F(mapUid));
Map = new Map( Game.AvailableMaps[mapUid].Package );
customTerrain = new ICustomTerrain[Map.MapSize.X, Map.MapSize.Y]; customTerrain = new ICustomTerrain[Map.MapSize.X, Map.MapSize.Y];
Timer.Time( "new Map: {0}" ); Timer.Time( "new Map: {0}" );