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

Move IGameplaySettings override to compose screen to keep test mode unaffected

Browse Source
This commit is contained in:
Salman Ahmed
2022-11-17 01:32:54 +03:00
parent ee6fffec5f
commit 7a28a7f2a0
4 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Edit/GameplayTest/EditorPlayer.cs
View File

@ -2,16 +2,14 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Overlays;
using osu.Game.Screens.Play;
namespace osu.Game.Screens.Edit.GameplayTest
{
public class EditorPlayer : Player, IGameplaySettings
public class EditorPlayer : Player
{
private readonly Editor editor;
private readonly EditorState editorState;
@ -19,8 +17,6 @@ namespace osu.Game.Screens.Edit.GameplayTest
[Resolved]
private MusicController musicController { get; set; } = null!;
private OsuConfigManager config = null!;
public EditorPlayer(Editor editor)
: base(new PlayerConfiguration { ShowResults = false })
{
@ -28,14 +24,6 @@ namespace osu.Game.Screens.Edit.GameplayTest
editorState = editor.GetState();
}
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
// needs to be populated before BDL to work correctly.
config = parent.Get<OsuConfigManager>();
return base.CreateChildDependencies(parent);
}
protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
{
var masterGameplayClockContainer = new MasterGameplayClockContainer(beatmap, gameplayStart);
@ -84,9 +72,5 @@ namespace osu.Game.Screens.Edit.GameplayTest
editor.RestoreState(editorState);
return base.OnExiting(e);
}
// Editor overrides but we actually want to use game-wide settings here.
public IBindable<float> ComboColourNormalisationAmount => ((IGameplaySettings)config).ComboColourNormalisationAmount;
public IBindable<float> PositionalHitsoundsLevel => ((IGameplaySettings)config).PositionalHitsoundsLevel;
}
}