Merge pull request #6880 from Mailaender/lua-music

Added Media.PlayMusic to the Lua API
2015-01-25 15:05:47 +01:00
parent 554f3ae8de 1f048b64ac
commit 4cbfa31053
16 changed files with 106 additions and 61 deletions
--- a/mods/ra/chrome/musicplayer.yaml
+++ b/mods/ra/chrome/musicplayer.yaml
@@ -5,6 +5,7 @@ Background@MUSIC_PANEL:
 	Width: 360
 	Height: 450
 	Children:
+		LogicTicker@SONG_WATCHER:
 		ScrollPanel@MUSIC_LIST:
 			X: 15
 			Y: 45
--- a/mods/ra/maps/desert-shellmap/desert-shellmap.lua
+++ b/mods/ra/maps/desert-shellmap/desert-shellmap.lua
@@ -162,4 +162,6 @@ WorldLoaded = function()
 	SendSovietUnits(Entry5.Location, UnitTypes, 50)
 	SendSovietUnits(Entry6.Location, UnitTypes, 50)
 	SendSovietUnits(Entry7.Location, BeachUnitTypes, 15)
+
+	Media.PlayMusic()
 end