sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly construct local beatmaps rather than using GetBoundCopy

Browse Source
This commit is contained in:
smoogipoo
2018-06-06 20:19:30 +09:00
parent 72cc53aded
commit ff60f69f47
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Menu/Intro.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Screens.Menu
/// </summary>
public bool DidLoadMenu;
private BindableBeatmap beatmapBacking;
private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
private MainMenu mainMenu;
private SampleChannel welcome;
@ -43,12 +43,12 @@ namespace osu.Game.Screens.Menu
private Bindable<bool> menuVoice;
private Bindable<bool> menuMusic;
private Track track;
private WorkingBeatmap beatmap;
private WorkingBeatmap introBeatmap;
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game, BindableBeatmap beatmap)
{
beatmapBacking = beatmap.GetBoundCopy();
this.beatmap.BindTo(beatmap);
menuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
menuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
@ -76,8 +76,8 @@ namespace osu.Game.Screens.Menu
}
}
this.beatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
track = this.beatmap.Track;
introBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
track = introBeatmap.Track;
welcome = audio.Sample.Get(@"welcome");
seeya = audio.Sample.Get(@"seeya");
@ -94,7 +94,7 @@ namespace osu.Game.Screens.Menu
if (!resuming)
{
beatmapBacking.Value = beatmap;
beatmap.Value = introBeatmap;
if (menuVoice)
welcome.Play();