RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-10 19:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nullref-fix

Browse Source
This commit is contained in:
Dan Balasescu 2017-09-11 12:13:43 +09:00 committed by GitHub
commit 24f7b6823e
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit a617245a4261d7d6e138c2fddbbeaa7940d24ca7 Subproject commit 0fe1e50b38ff9ce8aceba231eede3333cb73bb23

1
osu.Game.Rulesets.Osu/OsuDifficulty/Preprocessing/OsuDifficultyBeatmap.cs
View File

@ -51,6 +51,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
foreach (OsuDifficultyHitObject h in onScreen) foreach (OsuDifficultyHitObject h in onScreen)
{ {
// ReSharper disable once PossibleNullReferenceException (resharper not smart enough to understand IEnumerator.MoveNext())
h.TimeUntilHit -= latest.DeltaTime; h.TimeUntilHit -= latest.DeltaTime;
// Calculate reading strain here // Calculate reading strain here
} }

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

@ -28,6 +28,8 @@ namespace osu.Game.Screens.Play
public override void Add(KeyCounter key) public override void Add(KeyCounter key)
{ {
if (key == null) throw new ArgumentNullException(nameof(key));
base.Add(key); base.Add(key);
key.IsCounting = IsCounting; key.IsCounting = IsCounting;
key.FadeTime = FadeTime; key.FadeTime = FadeTime;