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

Allow Player to load from BeatmapInfo.

Browse Source
This commit is contained in:
Dean Herbert 2016-10-27 17:53:37 +09:00
parent d664c97279
commit 9074bc3396
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ namespace osu.Game.GameModes.Play
Width = 100, Width = 100,
Text = "Play", Text = "Play",
Colour = new Color4(238, 51, 153, 255), Colour = new Color4(238, 51, 153, 255),
Action = () => Push(new Player { Beatmap = this.database.GetBeatmap(selectedBeatmap) }), Action = () => Push(new Player { BeatmapInfo = selectedBeatmap }),
}, },
} }
} }

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

@ -11,6 +11,7 @@ using osu.Game.GameModes.Play.Mania;
using osu.Game.GameModes.Play.Osu; using osu.Game.GameModes.Play.Osu;
using osu.Game.GameModes.Play.Taiko; using osu.Game.GameModes.Play.Taiko;
using osu.Framework; using osu.Framework;
using osu.Game.Database;
namespace osu.Game.GameModes.Play namespace osu.Game.GameModes.Play
{ {
@ -18,6 +19,7 @@ namespace osu.Game.GameModes.Play
{ {
protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4"); protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4");
public BeatmapInfo BeatmapInfo;
public Beatmap Beatmap; public Beatmap Beatmap;
public PlayMode PlayMode; public PlayMode PlayMode;
@ -26,10 +28,8 @@ namespace osu.Game.GameModes.Play
{ {
base.Load(game); base.Load(game);
Beatmap beatmap = new Beatmap if (Beatmap == null)
{ Beatmap = ((OsuGame)game).Beatmaps.GetBeatmap(BeatmapInfo);
HitObjects = Beatmap?.HitObjects ?? new List<HitObject>()
};
HitRenderer hitRenderer; HitRenderer hitRenderer;
ScoreOverlay scoreOverlay; ScoreOverlay scoreOverlay;
@ -41,7 +41,7 @@ namespace osu.Game.GameModes.Play
hitRenderer = new OsuHitRenderer hitRenderer = new OsuHitRenderer
{ {
Objects = beatmap.HitObjects, Objects = Beatmap.HitObjects,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre Origin = Anchor.Centre
}; };
@ -51,7 +51,7 @@ namespace osu.Game.GameModes.Play
hitRenderer = new TaikoHitRenderer hitRenderer = new TaikoHitRenderer
{ {
Objects = beatmap.HitObjects, Objects = Beatmap.HitObjects,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre Origin = Anchor.Centre
}; };
@ -61,7 +61,7 @@ namespace osu.Game.GameModes.Play
hitRenderer = new CatchHitRenderer hitRenderer = new CatchHitRenderer
{ {
Objects = beatmap.HitObjects, Objects = Beatmap.HitObjects,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre Origin = Anchor.Centre
}; };
@ -71,7 +71,7 @@ namespace osu.Game.GameModes.Play
hitRenderer = new ManiaHitRenderer hitRenderer = new ManiaHitRenderer
{ {
Objects = beatmap.HitObjects, Objects = Beatmap.HitObjects,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre Origin = Anchor.Centre
}; };