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

Remove bindable-disabling logic and don't tie immediately to CreateRuleset()

Browse Source
This commit is contained in:
Salman Ahmed 2020-06-04 00:44:28 +03:00
parent bbad70c3f0
commit c72592c52c
No known key found for this signature in database
GPG Key ID: ED81FD33FD9B58BC
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -72,22 +72,7 @@ namespace osu.Game.Tests.Visual
Beatmap.SetDefault(); Beatmap.SetDefault();
Ruleset = Dependencies.Ruleset; Ruleset = Dependencies.Ruleset;
Ruleset.SetDefault();
var definedRuleset = CreateRuleset()?.RulesetInfo;
if (definedRuleset != null)
{
// re-enable the bindable in case it was disabled.
// happens when restarting current test scene.
Ruleset.Disabled = false;
// Set global ruleset bindable to the ruleset defined
// for this test scene and disallow changing it.
Ruleset.Value = definedRuleset;
Ruleset.Disabled = true;
}
else
Ruleset.SetDefault();
SelectedMods = Dependencies.Mods; SelectedMods = Dependencies.Mods;
SelectedMods.SetDefault(); SelectedMods.SetDefault();
@ -145,7 +130,7 @@ namespace osu.Game.Tests.Visual
/// Creates the ruleset to be used for this test scene. /// Creates the ruleset to be used for this test scene.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// When testing against ruleset-specific components, this method must be overriden to their ruleset. /// When testing against ruleset-specific components, this method must be overriden to their corresponding ruleset.
/// </remarks> /// </remarks>
[CanBeNull] [CanBeNull]
protected virtual Ruleset CreateRuleset() => null; protected virtual Ruleset CreateRuleset() => null;