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

Change IngameChatLogic & MusicPlayerLogic to use the mod's rules, not the map's

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-05-11 03:27:03 +03:00
parent 6f3d9e9c97
commit e0628b5f24
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
public class MusicPlayerLogic
{
readonly World world;
readonly Ruleset modRules;
bool installed;
MusicInfo currentSong = null;
@@ -29,9 +29,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
ScrollItemWidget itemTemplate;
[ObjectCreator.UseCtor]
public MusicPlayerLogic(Widget widget, World world, Action onExit)
public MusicPlayerLogic(Widget widget, Ruleset modRules, Action onExit)
{
this.world = world;
this.modRules = modRules;
var panel = widget.Get("MUSIC_PANEL");
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
public void BuildMusicTable()
{
music = world.Map.Rules.InstalledMusic.Select(a => a.Value).ToArray();
music = modRules.InstalledMusic.Select(a => a.Value).ToArray();
random = music.Shuffle(Game.CosmeticRandom).ToArray();
currentSong = Sound.CurrentMusic;
if (currentSong == null && music.Any())
@@ -109,7 +109,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
if (currentSong != null)
musicList.ScrollToItem(currentSong.Filename);
installed = world.Map.Rules.InstalledMusic.Any();
installed = modRules.InstalledMusic.Any();
}
void Play()