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

Always create ResumeOverlay, with UseResumeOverlay flag only affecting whether it is displayed or not

Browse Source
This commit is contained in:
Dean Herbert
2023-02-16 15:47:20 +09:00
parent 7afdcb9383
commit ce9ef3bc3c
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Rulesets/UI/DrawableRuleset.cs
View File

@ -194,16 +194,11 @@ namespace osu.Game.Rulesets.UI
Audio = audioContainer; Audio = audioContainer;
if (UseResumeOverlay) if ((ResumeOverlay = CreateResumeOverlay()) != null)
{ {
if ((ResumeOverlay = CreateResumeOverlay()) == null) AddInternal(CreateInputManager()
UseResumeOverlay = false; .WithChild(CreatePlayfieldAdjustmentContainer()
else .WithChild(ResumeOverlay)));
{
AddInternal(CreateInputManager()
.WithChild(CreatePlayfieldAdjustmentContainer()
.WithChild(ResumeOverlay)));
}
} }
applyRulesetMods(Mods, config); applyRulesetMods(Mods, config);
@ -515,7 +510,10 @@ namespace osu.Game.Rulesets.UI
/// <summary> /// <summary>
/// Whether the <see cref="ResumeOverlay"/> should be used to return the user's cursor position to its previous location after a pause. /// Whether the <see cref="ResumeOverlay"/> should be used to return the user's cursor position to its previous location after a pause.
/// </summary> /// </summary>
/// <remarks>Defaults to <c>true</c>, but will become <c>false</c> if the ruleset fails to return a non-null overlay via <see cref="CreateResumeOverlay"/>.</remarks> /// <remarks>
/// Defaults to <c>true</c>.
/// Even if <c>true</c>, will not have any effect if the ruleset does not have a resume overlay (see <see cref="CreateResumeOverlay"/>).
/// </remarks>
public bool UseResumeOverlay { get; set; } = true; public bool UseResumeOverlay { get; set; } = true;
/// <summary> /// <summary>
@ -542,6 +540,11 @@ namespace osu.Game.Rulesets.UI
} }
} }
/// <summary>
/// Create an optional resume overlay, which is displayed when a player requests to resume gameplay during non-break time.
/// This can be used to force the player to return their hands / cursor to the position they left off, to avoid players
/// using pauses as a means of adjusting their inputs (aka "pause buffering").
/// </summary>
protected virtual ResumeOverlay CreateResumeOverlay() => null; protected virtual ResumeOverlay CreateResumeOverlay() => null;
/// <summary> /// <summary>