From 25bdad4ee522f044d1396913c3e48bb08852e149 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Wed, 3 Feb 2016 22:27:51 +0100 Subject: [PATCH] Ensure widget creation happens after traits are loaded This is to make sure that traits' `WorldLoaded` method runs before widgets are created. --- mods/cnc/rules/world.yaml | 5 +++-- mods/d2k/rules/world.yaml | 3 ++- mods/ra/rules/world.yaml | 3 ++- mods/ts/rules/world.yaml | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index f491d17c4e..5ff347d8eb 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -47,8 +47,6 @@ PipColor: Blue AllowedTerrainTypes: Clear,Road AllowUnderActors: true - LoadWidgetAtGameStart: - ShellmapRoot: MENU_BACKGROUND World: Inherits: ^BaseWorld @@ -149,9 +147,12 @@ World: ObjectivesPanel: PanelName: SKIRMISH_STATS RadarPings: + LoadWidgetAtGameStart: + ShellmapRoot: MENU_BACKGROUND EditorWorld: Inherits: ^BaseWorld + LoadWidgetAtGameStart: EditorActorLayer: EditorResourceLayer: EditorSelectionLayer: diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index c438bd6614..02bcc2ff29 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -54,7 +54,6 @@ PipColor: green AllowedTerrainTypes: SpiceSand AllowUnderActors: true - LoadWidgetAtGameStart: World: Inherits: ^BaseWorld @@ -151,9 +150,11 @@ World: RadarPings: ObjectivesPanel: PanelName: SKIRMISH_STATS + LoadWidgetAtGameStart: EditorWorld: Inherits: ^BaseWorld + LoadWidgetAtGameStart: EditorActorLayer: D2kEditorResourceLayer: EditorSelectionLayer: diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 146ce509d6..7a1be7743b 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -7,7 +7,6 @@ VictoryMusic: score DefeatMusic: map TerrainGeometryOverlay: - LoadWidgetAtGameStart: ShroudRenderer: FogVariants: shroud Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255 @@ -168,9 +167,11 @@ World: StartGameNotification: ObjectivesPanel: PanelName: SKIRMISH_STATS + LoadWidgetAtGameStart: EditorWorld: Inherits: ^BaseWorld + LoadWidgetAtGameStart: EditorActorLayer: EditorResourceLayer: EditorSelectionLayer: diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index 2a8b726194..0d1204d59e 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -6,7 +6,6 @@ MusicPlaylist: VictoryMusic: score DefeatMusic: maps - LoadWidgetAtGameStart: ShroudRenderer: Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255 UseExtendedIndex: true @@ -170,9 +169,11 @@ World: StartGameNotification: ObjectivesPanel: PanelName: SKIRMISH_STATS + LoadWidgetAtGameStart: EditorWorld: Inherits: ^BaseWorld + LoadWidgetAtGameStart: EditorActorLayer: EditorResourceLayer: EditorSelectionLayer: