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

Load the main menu without loading mixes or creating a shellmap world. A giant hack.

Browse Source
This commit is contained in:
Paul Chote
2011-01-19 22:25:04 +13:00
parent 8d2a78abc6
commit 6776d6f906
7 changed files with 148 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Game.cs
View File

@@ -109,7 +109,7 @@ namespace OpenRA
}
Tick( orderManager );
if( orderManager.world != worldRenderer.world )
if( worldRenderer != null && orderManager.world != worldRenderer.world )
Tick( worldRenderer.world.orderManager );
using (new PerfSample("render"))
@@ -244,13 +244,16 @@ namespace OpenRA
Console.WriteLine("Loading mods: {0}",string.Join(",",mods));
modData = new ModData( mods );
modData.Sucks();
Sound.Initialize();
PerfHistory.items["render"].hasNormalTick = false;
PerfHistory.items["batches"].hasNormalTick = false;
JoinLocal();
viewport = new Viewport(new int2(Renderer.Resolution), Rectangle.Empty, Renderer);
StartGame(ChooseShellmap());
//StartGame(ChooseShellmap());
// TODO: unhardcode this
modData.WidgetLoader.LoadWidget( new Dictionary<string,object>(), Widget.RootWidget, "PERF_BG" );