don't merge yaml in chrome; just load sequentially

This commit is contained in:
Bob
2010-07-31 14:21:09 +12:00
parent f49ec8d6b9
commit 74155812d0

View File

@@ -53,11 +53,10 @@ namespace OpenRA.Widgets
{ {
if (rootWidget == null) if (rootWidget == null)
{ {
var widgetYaml = Game.Manifest.ChromeLayout.Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge);
rootWidget = new ContainerWidget(); rootWidget = new ContainerWidget();
foreach( var w in widgetYaml ) foreach( var file in Game.Manifest.ChromeLayout.Select( a => MiniYaml.FromFile( a ) ) )
rootWidget.AddChild( WidgetLoader.LoadWidget( w ) ); foreach( var w in file )
rootWidget.AddChild( WidgetLoader.LoadWidget( w ) );
rootWidget.Initialize(); rootWidget.Initialize();
rootWidget.InitDelegates(); rootWidget.InitDelegates();