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

Use the same mechanism for loading ingame and shellmap ui.

Browse Source
This commit is contained in:
Paul Chote
2011-05-08 21:23:01 +12:00
parent 07d5f91325
commit d95138b600
6 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.RA/OpenWidgetAtGameStart.cs
View File

@@ -10,9 +10,11 @@
using OpenRA.Traits;
using OpenRA.Widgets;
using System.Collections.Generic;
namespace OpenRA.Mods.RA
{
// Legacy crap
public class OpenWidgetAtGameStartInfo : ITraitInfo
{
public readonly string Widget = "INGAME_ROOT";
@@ -40,4 +42,25 @@ namespace OpenRA.Mods.RA
Game.OpenWindow(world, Info.ObserverWidget);
}
}
// New version
public class LoadWidgetAtGameStartInfo : ITraitInfo
{
public readonly string Widget = null;
public object Create(ActorInitializer init) { return new LoadWidgetAtGameStart(this); }
}
public class LoadWidgetAtGameStart: IWorldLoaded
{
readonly LoadWidgetAtGameStartInfo Info;
public LoadWidgetAtGameStart(LoadWidgetAtGameStartInfo Info)
{
this.Info = Info;
}
public void WorldLoaded(World world)
{
Game.LoadWidget(world, Info.Widget, new Dictionary<string, object>());
}
}
}

8
OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs
View File

@@ -71,11 +71,11 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
if (FileSystem.Exists(Info.TestFile))
{
Game.LoadShellMap();
Widget.RootWidget.RemoveChildren();
if (Info.InstallMode == "cnc")
Widget.LoadWidget("MENU_BACKGROUND", new Dictionary<string, object>());
else
if (Info.InstallMode != "cnc")
{
Widget.RootWidget.RemoveChildren();
Widget.OpenWindow("MAINMENU_BG");
}
}
else
{