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

Dispose of the old world before creating a new one

Browse Source
This commit is contained in:
penev92
2015-06-30 14:49:47 +03:00
parent 9ed9d746a1
commit d2058fbcbc
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Game.cs
View File

@@ -135,6 +135,10 @@ namespace OpenRA
public static event Action BeforeGameStart = () => { }; public static event Action BeforeGameStart = () => { };
internal static void StartGame(string mapUID, WorldType type) internal static void StartGame(string mapUID, WorldType type)
{ {
// Dispose of the old world before creating a new one.
if (worldRenderer != null)
worldRenderer.Dispose();
Cursor.SetCursor(null); Cursor.SetCursor(null);
BeforeGameStart(); BeforeGameStart();
@@ -143,13 +147,7 @@ namespace OpenRA
using (new PerfTimer("PrepareMap")) using (new PerfTimer("PrepareMap"))
map = ModData.PrepareMap(mapUID); map = ModData.PrepareMap(mapUID);
using (new PerfTimer("NewWorld")) using (new PerfTimer("NewWorld"))
{ OrderManager.World = new World(map, OrderManager, type) { Timestep = Timestep };
OrderManager.World = new World(map, OrderManager, type);
OrderManager.World.Timestep = Timestep;
}
if (worldRenderer != null)
worldRenderer.Dispose();
worldRenderer = new WorldRenderer(OrderManager.World); worldRenderer = new WorldRenderer(OrderManager.World);