h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 10:07:36 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4534 from peppy/gameplay-paused-no-update

Browse Source 
Don't update gameplay loop while paused
This commit is contained in:
Dan Balasescu 2019-03-29 11:00:59 +09:00 committed by GitHub
commit bf61f35870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/UI/FrameStabilityContainer.cs
View File

@ -36,7 +36,10 @@ namespace osu.Game.Rulesets.UI
private void load(GameplayClock clock) private void load(GameplayClock clock)
{ {
if (clock != null) if (clock != null)
{
parentGameplayClock = clock; parentGameplayClock = clock;
gameplayClock.IsPaused.BindTo(clock.IsPaused);
}
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -68,7 +71,7 @@ namespace osu.Game.Rulesets.UI
public override bool UpdateSubTree() public override bool UpdateSubTree()
{ {
requireMoreUpdateLoops = true; requireMoreUpdateLoops = true;
validState = true; validState = !gameplayClock.IsPaused.Value;
int loops = 0; int loops = 0;

3
osu.Game/Screens/Play/GameplayClock.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables;
using osu.Framework.Timing; using osu.Framework.Timing;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
@ -17,6 +18,8 @@ namespace osu.Game.Screens.Play
{ {
private readonly IFrameBasedClock underlyingClock; private readonly IFrameBasedClock underlyingClock;
public readonly BindableBool IsPaused = new BindableBool();
public GameplayClock(IFrameBasedClock underlyingClock) public GameplayClock(IFrameBasedClock underlyingClock)
{ {
this.underlyingClock = underlyingClock; this.underlyingClock = underlyingClock;

2
osu.Game/Screens/Play/GameplayClockContainer.cs
View File

@ -79,6 +79,8 @@ namespace osu.Game.Screens.Play
// the clock to be exposed via DI to children. // the clock to be exposed via DI to children.
GameplayClock = new GameplayClock(offsetClock); GameplayClock = new GameplayClock(offsetClock);
GameplayClock.IsPaused.BindTo(IsPaused);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]