Merge pull request #7217 from Mailaender/chrome-init-cleanup

Cleaned up the ingame widget initialization
2015-01-08 07:40:36 +01:00
parent 88922b056e d4d55bb6dc
commit 89b2f4d5d3
24 changed files with 100 additions and 161 deletions
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -34,12 +34,14 @@ Container@PLAYER_WIDGETS:
 			Font: Bold
 			Key: escape Shift
 		SlidingContainer@INGAME_RADAR_BIN:
+			Logic: SlidingRadarBinLogic
 			X: WINDOW_RIGHT-215
 			Y: 0
 			OpenOffset: 0,29
 			ClosedOffset: 0,-166
 			AnimationLength: 15
 			Children:
+				LogicTicker@RADAR_TICKER:
 				Image@RADAR_BIN_BG:
 					ImageName: radar
 				Radar@RADAR_MINIMAP:
@@ -48,6 +50,7 @@ Container@PLAYER_WIDGETS:
 					Width: 192
 					Height: 192
 				ResourceBar@POWERBAR:
+					Logic: IngamePowerBarLogic
 					X: 42
 					Y: 205
 					Width: 138
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -1,5 +1,5 @@
 Container@INGAME_ROOT:
-	Logic: IngameChromeLogic
+	Logic: LoadIngamePlayerOrObserverUILogic
 	Children:
 		Container@WORLD_ROOT:
 			Children: