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

Fix music install crash.

Browse Source
This commit is contained in:
Paul Chote
2011-05-21 17:06:25 +12:00
parent bafd12b88e
commit 13ceafb658
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs
View File

@@ -27,13 +27,19 @@ namespace OpenRA.Mods.Cnc.Widgets
Widget panel; Widget panel;
MusicInfo[] music; MusicInfo[] music;
MusicInfo[] random; MusicInfo[] random;
ScrollItemWidget itemTemplate;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public CncMusicPlayerLogic([ObjectCreator.Param] Widget widget, public CncMusicPlayerLogic([ObjectCreator.Param] Widget widget,
[ObjectCreator.Param] Action onExit) [ObjectCreator.Param] Action onExit)
{ {
panel = widget.GetWidget("MUSIC_PANEL"); panel = widget.GetWidget("MUSIC_PANEL");
BuildMusicTable(panel);
var ml = panel.GetWidget<ScrollPanelWidget>("MUSIC_LIST");
itemTemplate = ml.GetWidget<ScrollItemWidget>("MUSIC_TEMPLATE");
BuildMusicTable(ml);
currentSong = Sound.CurrentMusic ?? GetNextSong(); currentSong = Sound.CurrentMusic ?? GetNextSong();
installed = Rules.Music.Where(m => m.Value.Exists).Any(); installed = Rules.Music.Where(m => m.Value.Exists).Any();
@@ -52,7 +58,7 @@ namespace OpenRA.Mods.Cnc.Widgets
catch (Exception) { } catch (Exception) { }
installed = Rules.Music.Where(m => m.Value.Exists).Any(); installed = Rules.Music.Where(m => m.Value.Exists).Any();
BuildMusicTable(panel); BuildMusicTable(ml);
}; };
var installButton = panel.GetWidget<ButtonWidget>("INSTALL_BUTTON"); var installButton = panel.GetWidget<ButtonWidget>("INSTALL_BUTTON");
@@ -101,15 +107,12 @@ namespace OpenRA.Mods.Cnc.Widgets
musicSlider.SetOffset(Sound.MusicVolume); musicSlider.SetOffset(Sound.MusicVolume);
} }
void BuildMusicTable(Widget panel) void BuildMusicTable(Widget list)
{ {
music = Rules.Music.Where(a => a.Value.Exists).Select(a => a.Value).ToArray(); music = Rules.Music.Where(a => a.Value.Exists).Select(a => a.Value).ToArray();
random = music.Shuffle(Game.CosmeticRandom).ToArray(); random = music.Shuffle(Game.CosmeticRandom).ToArray();
var ml = panel.GetWidget<ScrollPanelWidget>("MUSIC_LIST"); list.RemoveChildren();
var itemTemplate = ml.GetWidget<ScrollItemWidget>("MUSIC_TEMPLATE");
ml.RemoveChildren();
foreach (var s in music) foreach (var s in music)
{ {
var song = s; var song = s;
@@ -119,7 +122,7 @@ namespace OpenRA.Mods.Cnc.Widgets
var item = ScrollItemWidget.Setup(itemTemplate, () => currentSong == song, () => { currentSong = song; Play(); }); var item = ScrollItemWidget.Setup(itemTemplate, () => currentSong == song, () => { currentSong = song; Play(); });
item.GetWidget<LabelWidget>("TITLE").GetText = () => song.Title; item.GetWidget<LabelWidget>("TITLE").GetText = () => song.Title;
item.GetWidget<LabelWidget>("LENGTH").GetText = () => SongLengthLabel(song); item.GetWidget<LabelWidget>("LENGTH").GetText = () => SongLengthLabel(song);
ml.AddChild(item); list.AddChild(item);
} }
} }