RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-07 06:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up song select based on upstream changes

Browse Source
This commit is contained in:
Drew DeVault 2016-10-13 13:49:44 -04:00
parent 22fdb3e49a
commit d21b7f0050
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Formats/BeatmapDecoder.cs
View File

@ -23,4 +23,4 @@ namespace osu.Game.Beatmaps.Formats
public abstract Beatmap Decode(TextReader stream);
}
}
}

1
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -21,6 +21,7 @@ namespace osu.Game.Beatmaps.Formats
AddDecoder<OsuLegacyDecoder>(@"osu file format v12");
AddDecoder<OsuLegacyDecoder>(@"osu file format v11");
AddDecoder<OsuLegacyDecoder>(@"osu file format v10");
AddDecoder<OsuLegacyDecoder>(@"osu file format v9");
// TODO: Not sure how far back to go, or differences between versions
}

16
osu.Game/GameModes/Play/PlaySongSelect.cs
View File

@ -10,16 +10,20 @@ using osu.Framework.Graphics.Sprites;
using osu.Game.Beatmaps;
using osu.Game.GameModes.Backgrounds;
using osu.Framework;
using osu.Game.Database;
using osu.Framework.Graphics.Primitives;
namespace osu.Game.GameModes.Play
{
class PlaySongSelect : OsuGameMode
{
private Bindable<PlayMode> playMode;
private BeatmapDatabase beatmaps;
// TODO: use currently selected track as bg
protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4");
private ScrollContainer scrollContainer;
private FlowContainer setList;
private Drawable createSetUI(BeatmapSet bset)
@ -29,7 +33,7 @@ namespace osu.Game.GameModes.Play
private void addBeatmapSets()
{
var sets = (Game as OsuGame).Beatmaps.GetBeatmapSets();
var sets = beatmaps.GetBeatmapSets();
foreach (var beatmapSet in sets)
setList.Add(createSetUI(beatmapSet));
}
@ -38,15 +42,14 @@ namespace osu.Game.GameModes.Play
{
Children = new[]
{
new ScrollContainer
scrollContainer = new ScrollContainer
{
OriginPosition = new OpenTK.Vector2(0, -(Game as OsuGame).Toolbar.Height),
Children = new[]
{
setList = new FlowContainer
{
Direction = FlowDirection.VerticalOnly,
Padding = new OpenTK.Vector2(25, 25)
Padding = new MarginPadding(25),
}
}
}
@ -61,10 +64,13 @@ namespace osu.Game.GameModes.Play
playMode = osu.PlayMode;
playMode.ValueChanged += PlayMode_ValueChanged;
beatmaps = osu.Beatmaps;
scrollContainer.Padding = new MarginPadding { Top = osu.Toolbar.Height };
addBeatmapSets();
(Game as OsuGame).Beatmaps.BeatmapSetAdded += bset => setList.Add(createSetUI(bset));
beatmaps.BeatmapSetAdded += bset => setList.Add(createSetUI(bset));
}
protected override void Dispose(bool isDisposing)