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

Merge branch 'master' into hp-rewind

Browse Source
This commit is contained in:
Dean Herbert
2019-04-22 19:02:41 +09:00
committed by GitHub
parent aeae759fcd 63fd3034ca
commit 5313ba2938
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,12 @@ namespace osu.Game.Rulesets.UI
{ {
Cursor = CreateCursor(); Cursor = CreateCursor();
if (Cursor != null) if (Cursor != null)
{
// initial showing of the cursor will be handed by MenuCursorContainer (via DrawableRuleset's IProvideCursor implementation).
Cursor.Hide();
AddInternal(Cursor); AddInternal(Cursor);
}
} }
/// <summary> /// <summary>

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

@ -110,11 +110,8 @@ namespace osu.Game.Screens.Play
adjustableClock.ChangeSource(sourceClock); adjustableClock.ChangeSource(sourceClock);
updateRate(); updateRate();
this.Delay(750).Schedule(() => if (!IsPaused.Value)
{ Start();
if (!IsPaused.Value)
Start();
});
}); });
}); });
} }
@ -123,7 +120,7 @@ namespace osu.Game.Screens.Play
{ {
// Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
// This accounts for the audio clock source potentially taking time to enter a completely stopped state // This accounts for the audio clock source potentially taking time to enter a completely stopped state
adjustableClock.Seek(adjustableClock.CurrentTime); Seek(GameplayClock.CurrentTime);
adjustableClock.Start(); adjustableClock.Start();
IsPaused.Value = false; IsPaused.Value = false;
} }