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

Fix beat playing while paused

Browse Source
This commit is contained in:
Dean Herbert
2019-12-16 18:51:22 +09:00
parent c883c97bab
commit 0f9ff32cdc
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Graphics/Containers/BeatSyncedContainer.cs
View File

@ -42,6 +42,8 @@ namespace osu.Game.Graphics.Containers
private EffectControlPoint defaultEffect; private EffectControlPoint defaultEffect;
private TrackAmplitudes defaultAmplitudes; private TrackAmplitudes defaultAmplitudes;
protected bool IsBeatSyncedWithTrack { get; private set; }
protected override void Update() protected override void Update()
{ {
Track track = null; Track track = null;
@ -65,10 +67,16 @@ namespace osu.Game.Graphics.Containers
effectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTrackTime); effectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTrackTime);
if (timingPoint.BeatLength == 0) if (timingPoint.BeatLength == 0)
{
IsBeatSyncedWithTrack = false;
return; return;
}
IsBeatSyncedWithTrack = true;
} }
else else
{ {
IsBeatSyncedWithTrack = false;
currentTrackTime = Clock.CurrentTime; currentTrackTime = Clock.CurrentTime;
timingPoint = defaultTiming; timingPoint = defaultTiming;
effectPoint = defaultEffect; effectPoint = defaultEffect;

8
osu.Game/Rulesets/Mods/ModNightcore.cs
View File

@ -75,7 +75,13 @@ namespace osu.Game.Rulesets.Mods
{ {
base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes); base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
if (beatIndex < firstBeat || !firstBeat.HasValue) if (!IsBeatSyncedWithTrack)
{
firstBeat = null;
return;
}
if (!firstBeat.HasValue || beatIndex < firstBeat)
firstBeat = Math.Max(0, (beatIndex / 16 + 1) * 16); firstBeat = Math.Max(0, (beatIndex / 16 + 1) * 16);
if (beatIndex > firstBeat) if (beatIndex > firstBeat)