h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 06:33:20 +08:00
Code Issues Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
smoogipoo 2019-06-04 11:25:18 +09:00
parent 474191fcec
commit 4763a41c7e
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
View File

@ -18,9 +18,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
public class TestSceneMatchSettingsOverlay : MultiplayerTestScene public class TestSceneMatchSettingsOverlay : MultiplayerTestScene
{ {
[Resolved]
private OsuGameBase game { get; set; }
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
typeof(MatchSettingsOverlay) typeof(MatchSettingsOverlay)

2
osu.Game/Beatmaps/BindableBeatmap.cs
View File

@ -24,8 +24,6 @@ namespace osu.Game.Beatmaps
{ {
var trackLoaded = lastBeatmap?.TrackLoaded ?? false; var trackLoaded = lastBeatmap?.TrackLoaded ?? false;
//beatmap.AudioManager = AudioManager;
// compare to last beatmap as sometimes the two may share a track representation (optimisation, see WorkingBeatmap.TransferTo) // compare to last beatmap as sometimes the two may share a track representation (optimisation, see WorkingBeatmap.TransferTo)
if (!trackLoaded || lastBeatmap?.Track != beatmap.Track) if (!trackLoaded || lastBeatmap?.Track != beatmap.Track)
{ {

2
osu.Game/Beatmaps/DummyWorkingBeatmap.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Beatmaps
protected override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4"); protected override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
protected override Track GetTrack() => GetVirtualTrack(Beatmap); protected override Track GetTrack() => GetVirtualTrack();
private class DummyRulesetInfo : RulesetInfo private class DummyRulesetInfo : RulesetInfo
{ {

6
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -51,18 +51,18 @@ namespace osu.Game.Beatmaps
return b; return b;
}); });
track = new RecyclableLazy<Track>(() => GetTrack() ?? GetVirtualTrack(Beatmap)); track = new RecyclableLazy<Track>(() => GetTrack() ?? GetVirtualTrack());
background = new RecyclableLazy<Texture>(GetBackground, BackgroundStillValid); background = new RecyclableLazy<Texture>(GetBackground, BackgroundStillValid);
waveform = new RecyclableLazy<Waveform>(GetWaveform); waveform = new RecyclableLazy<Waveform>(GetWaveform);
storyboard = new RecyclableLazy<Storyboard>(GetStoryboard); storyboard = new RecyclableLazy<Storyboard>(GetStoryboard);
skin = new RecyclableLazy<Skin>(GetSkin); skin = new RecyclableLazy<Skin>(GetSkin);
} }
protected virtual Track GetVirtualTrack(IBeatmap beatmap) protected virtual Track GetVirtualTrack()
{ {
const double excess_length = 1000; const double excess_length = 1000;
var lastObject = beatmap.HitObjects.LastOrDefault(); var lastObject = Beatmap.HitObjects.LastOrDefault();
double length; double length;