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

Merge pull request #9494 from abcdefg30/luabackground

Browse Source 
Add lua support for playing background music
This commit is contained in:
Paul Chote
2015-10-24 22:25:35 +01:00
parent c87c2270ca ce95ff074a
commit e0177d7798
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs
View File

@@ -20,7 +20,6 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Scripting
{
@@ -62,16 +61,8 @@ namespace OpenRA.Mods.Common.Scripting
if (!playlist.IsMusicAvailable)
return;
MusicInfo musicInfo;
if (string.IsNullOrEmpty(track))
musicInfo = playlist.GetNextSong();
else if (world.Map.Rules.Music.ContainsKey(track))
musicInfo = world.Map.Rules.Music[track];
else
{
Log.Write("lua", "Missing music track: " + track);
return;
}
var musicInfo = !string.IsNullOrEmpty(track) ? GetMusicTrack(track)
: playlist.GetNextSong();
if (func != null)
{
@@ -95,6 +86,28 @@ namespace OpenRA.Mods.Common.Scripting
playlist.Play(musicInfo);
}
[Desc("Play track defined in music.yaml or map.yaml as background music." +
" If music is already playing use Media.StopMusic() to stop it" +
" and the background music will start automatically." +
" Keep the track empty to disable background music.")]
public void SetBackgroundMusic(string track = null)
{
if (!playlist.IsMusicAvailable)
return;
playlist.SetBackgroundMusic(string.IsNullOrEmpty(track) ? null : GetMusicTrack(track));
}
MusicInfo GetMusicTrack(string track)
{
var music = world.Map.Rules.Music;
if (music.ContainsKey(track))
return music[track];
Log.Write("lua", "Missing music track: " + track);
return null;
}
[Desc("Stop the current song.")]
public void StopMusic()
{