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

Backend changes for new music player

Browse Source
This commit is contained in:
Paul Chote
2010-08-13 19:46:13 +12:00
parent de12233edc
commit 3f3ac377b2
6 changed files with 254 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenRA.Game/GameRules/MusicInfo.cs
View File

@@ -13,38 +13,16 @@ using OpenRA.FileFormats;
namespace OpenRA.GameRules
{
public class MusicInfo
{
public readonly MusicPool Pool;
public readonly string[] Music = { };
{
public readonly string Filename = null;
public readonly string Title = null;
public readonly float Length = 0; // seconds
public MusicInfo( MiniYaml y )
public MusicInfo( string key, MiniYaml value )
{
FieldLoader.Load(this, y);
Pool = new MusicPool(Music);
FieldLoader.Load(this, value);
if (Filename == null)
Filename = key+".aud";
}
}
public class MusicPool
{
readonly string[] clips;
int playing = 0;
public MusicPool(params string[] clips)
{
this.clips = clips;
}
public string GetNext()
{
playing = (playing + 1) % clips.Length;
return clips[playing];
}
public string GetPrev()
{
playing = (playing + clips.Length - 1) % clips.Length;
return clips[playing];
}
public string GetCurrent(){ return clips[playing];}
}
}

2
OpenRA.Game/GameRules/Rules.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA
Info = LoadYamlRules(m.Rules, map.Rules, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
Weapons = LoadYamlRules(m.Weapons, map.Weapons, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
Voices = LoadYamlRules(m.Voices, map.Voices, (k, _) => new VoiceInfo(k.Value));
Music = LoadYamlRules(m.Music, map.Music, (k, _) => new MusicInfo(k.Value));
Music = LoadYamlRules(m.Music, map.Music, (k, _) => new MusicInfo(k.Key, k.Value));
Movies = LoadYamlRules(m.Movies, new Dictionary<string,MiniYaml>(), (k, v) => k.Value.Value);
TileSets = new Dictionary<string, TileSet>();