h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-20 06:39:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4571 from peppy/less-inspection-fixes

Browse Source 
Try applying minimal inspection fixes for latest Rider EAP
This commit is contained in:
Dean Herbert
2019-04-01 13:35:53 +09:00
committed by GitHub
Unverified
parent afd01b12f5 2060bad3bc
commit c4157504d5
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
-4
View File
@@ -292,7 +292,6 @@ namespace osu.Game.Rulesets.Osu.Replays
{
// We add intermediate frames for spinning / following a slider here.
case Spinner spinner:
{
Vector2 difference = startPosition - SPINNER_CENTRE;
float radius = difference.Length;
@@ -315,9 +314,7 @@ namespace osu.Game.Rulesets.Osu.Replays
endFrame.Position = endPosition;
break;
}
case Slider slider:
{
for (double j = FrameDelay; j < slider.Duration; j += FrameDelay)
{
Vector2 pos = slider.StackedPositionAt(j / slider.Duration);
@@ -326,7 +323,6 @@ namespace osu.Game.Rulesets.Osu.Replays
AddFrameToReplay(new OsuReplayFrame(slider.EndTime, new Vector2(slider.StackedEndPosition.X, slider.StackedEndPosition.Y), action));
break;
}
}
// We only want to let go of our button if we are at the end of the current replay. Otherwise something is still going on after us so we need to keep the button pressed!
osu.Game/Scoring/Legacy/LegacyScoreParser.cs
+3
View File
@@ -145,6 +145,7 @@ namespace osu.Game.Scoring.Legacy
score.Rank = ScoreRank.D;
break;
}
case 1:
{
int totalHits = count50 + count100 + count300 + countMiss;
@@ -167,6 +168,7 @@ namespace osu.Game.Scoring.Legacy
score.Rank = ScoreRank.D;
break;
}
case 2:
{
int totalHits = count50 + count100 + count300 + countMiss + countKatu;
@@ -186,6 +188,7 @@ namespace osu.Game.Scoring.Legacy
score.Rank = ScoreRank.D;
break;
}
case 3:
{
int totalHits = count50 + count100 + count300 + countMiss + countGeki + countKatu;
osu.Game/Skinning/LegacySkinDecoder.cs
+2 -8
View File
@@ -16,12 +16,10 @@ namespace osu.Game.Skinning
{
line = StripComments(line);
var pair = SplitKeyVal(line);
switch (section)
{
case Section.General:
{
var pair = SplitKeyVal(line);
switch (pair.Key)
{
case @"Name":
@@ -36,11 +34,8 @@ namespace osu.Game.Skinning
}
break;
}
case Section.Fonts:
{
var pair = SplitKeyVal(line);
case Section.Fonts:
switch (pair.Key)
{
case "HitCirclePrefix":
@@ -52,7 +47,6 @@ namespace osu.Game.Skinning
}
break;
}
}
base.ParseLine(skin, section, line);