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

General fixes/cleanup in Player.

Browse Source
This commit is contained in:
Dan Balasescu
2017-04-26 20:22:03 +09:00
committed by smoogipooo
parent 08b1d5beb9
commit f261a077d2
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Play/Player.cs
View File

@ -92,9 +92,6 @@ namespace osu.Game.Screens.Play
if (Beatmap?.Beatmap == null) if (Beatmap?.Beatmap == null)
throw new Exception("Beatmap was not loaded"); throw new Exception("Beatmap was not loaded");
if (Beatmap?.Beatmap?.HitObjects.Count == 0)
throw new Exception("No valid objects were found!");
ruleset = osu?.Ruleset.Value ?? Beatmap.BeatmapInfo.Ruleset; ruleset = osu?.Ruleset.Value ?? Beatmap.BeatmapInfo.Ruleset;
rulesetInstance = ruleset.CreateInstance(); rulesetInstance = ruleset.CreateInstance();
@ -110,6 +107,9 @@ namespace osu.Game.Screens.Play
rulesetInstance = ruleset.CreateInstance(); rulesetInstance = ruleset.CreateInstance();
HitRenderer = rulesetInstance.CreateHitRendererWith(Beatmap); HitRenderer = rulesetInstance.CreateHitRendererWith(Beatmap);
} }
if (!HitRenderer.Objects.Any())
throw new Exception("Beatmap contains no hit objects!");
} }
catch (Exception e) catch (Exception e)
{ {
@ -167,10 +167,7 @@ namespace osu.Game.Screens.Play
hudOverlay.Progress.Objects = HitRenderer.Objects; hudOverlay.Progress.Objects = HitRenderer.Objects;
hudOverlay.Progress.AudioClock = decoupledClock; hudOverlay.Progress.AudioClock = decoupledClock;
hudOverlay.Progress.AllowSeeking = HitRenderer.HasReplayLoaded; hudOverlay.Progress.AllowSeeking = HitRenderer.HasReplayLoaded;
hudOverlay.Progress.OnSeek = pos => hudOverlay.Progress.OnSeek = pos => decoupledClock.Seek(pos);
{
decoupledClock.Seek(pos);
};
//bind HitRenderer to ScoreProcessor and ourselves (for a pass situation) //bind HitRenderer to ScoreProcessor and ourselves (for a pass situation)
HitRenderer.OnAllJudged += onCompletion; HitRenderer.OnAllJudged += onCompletion;
@ -355,7 +352,6 @@ namespace osu.Game.Screens.Play
initializeSkipButton(); initializeSkipButton();
}); });
//keep in mind this is using the interpolatedSourceClock so won't be run as early as we may expect.
hitRendererContainer.Alpha = 0; hitRendererContainer.Alpha = 0;
hitRendererContainer.FadeIn(750, EasingTypes.OutQuint); hitRendererContainer.FadeIn(750, EasingTypes.OutQuint);
} }