h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Code Issues Releases Wiki Activity

Remove need for PlaySongSelect ctor to take a db

Browse Source
This commit is contained in:
Drew DeVault 2016-11-23 06:38:33 -05:00
parent 69cb9cf4de
commit 89effca12e
4 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 09c18c415d280448c44cb73f2c4e60e0092b974c
Subproject commit d9bd79c4c15f7e5eb4e69fa7898b7d358e4516e4

3
osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs
View File

@ -26,6 +26,7 @@ namespace osu.Desktop.VisualTests.Tests
{
storage = new TestStorage(@"TestCasePlaySongSelect");
db = new BeatmapDatabase(storage);
Dependencies.Cache(db, true);
var sets = new List<BeatmapSetInfo>();
@ -35,7 +36,7 @@ namespace osu.Desktop.VisualTests.Tests
db.Import(sets);
}
Add(new PlaySongSelect(db));
Add(new PlaySongSelect());
}
private BeatmapSetInfo createTestBeatmapSet(int i)

2
osu.Game/OsuGameBase.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game
Dependencies.Cache(new BeatmapDatabase(Host.Storage, Host));
//this completely overrides the framework default. will need to change once we make a proper FontStore.
Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 0.01f });
Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 0.01f }, true);
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));

5
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -73,11 +73,8 @@ namespace osu.Game.Screens.Select
}
}
/// <param name="database">Optionally provide a database to use instead of the OsuGame one.</param>
public PlaySongSelect(BeatmapDatabase database = null)
public PlaySongSelect()
{
this.database = database;
const float carouselWidth = 640;
const float bottomToolHeight = 50;
Children = new Drawable[]