RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try applying minimal inspection fixes for latest Rider EAP

This commit is contained in:
Dean Herbert 2019-04-01 13:28:14 +09:00
parent afd01b12f5
commit 2060bad3bc
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
View File

@ -292,7 +292,6 @@ private void addHitObjectClickFrames(OsuHitObject h, Vector2 startPosition, floa
{
// 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 @@ private void addHitObjectClickFrames(OsuHitObject h, Vector2 startPosition, floa
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 @@ private void addHitObjectClickFrames(OsuHitObject h, Vector2 startPosition, floa
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!

3
osu.Game/Scoring/Legacy/LegacyScoreParser.cs
View File

@ -145,6 +145,7 @@ protected void CalculateAccuracy(ScoreInfo score)
score.Rank = ScoreRank.D;
break;
}
case 1:
{
int totalHits = count50 + count100 + count300 + countMiss;
@ -167,6 +168,7 @@ protected void CalculateAccuracy(ScoreInfo score)
score.Rank = ScoreRank.D;
break;
}
case 2:
{
int totalHits = count50 + count100 + count300 + countMiss + countKatu;
@ -186,6 +188,7 @@ protected void CalculateAccuracy(ScoreInfo score)
score.Rank = ScoreRank.D;
break;
}
case 3:
{
int totalHits = count50 + count100 + count300 + countMiss + countGeki + countKatu;

10
osu.Game/Skinning/LegacySkinDecoder.cs
View File

@ -16,12 +16,10 @@ protected override void ParseLine(SkinConfiguration skin, Section section, strin
{
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 @@ protected override void ParseLine(SkinConfiguration skin, Section section, strin
}
break;
}
case Section.Fonts:
{
var pair = SplitKeyVal(line);
case Section.Fonts:
switch (pair.Key)
{
case "HitCirclePrefix":
@ -52,7 +47,6 @@ protected override void ParseLine(SkinConfiguration skin, Section section, strin
}
break;
}
}
base.ParseLine(skin, section, line);