h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Code Issues Releases Wiki Activity

Apply review feedback (unroll inner loop / xml fixes)

Browse Source
This commit is contained in:
Dean Herbert 2020-04-15 12:35:43 +09:00
parent 7f95418262
commit d47e414fb1
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs
View File

@ -74,22 +74,20 @@ namespace osu.Game.Rulesets.Mania.Replays
// the index in lazer, which doesn't include special keys.
int nonSpecialKeyIndex = action - ManiaAction.Key1;
// the index inclusive of special keys.
int overallIndex = 0;
// iterate to find the index including special keys.
while (true)
for (; overallIndex < maniaBeatmap.TotalColumns; overallIndex++)
{
if (!isColumnAtIndexSpecial(maniaBeatmap, overallIndex))
{
// found a non-special column we could use.
if (nonSpecialKeyIndex == 0)
break;
// found a non-special column but not ours.
nonSpecialKeyIndex--;
}
overallIndex++;
// skip over special columns.
if (isColumnAtIndexSpecial(maniaBeatmap, overallIndex))
continue;
// found a non-special column to use.
if (nonSpecialKeyIndex == 0)
break;
// found a non-special column but not ours.
nonSpecialKeyIndex--;
}
keys |= 1 << overallIndex;
@ -127,21 +125,20 @@ namespace osu.Game.Rulesets.Mania.Replays
/// </summary>
/// <param name="beatmap">The beatmap.</param>
/// <param name="index">The overall index to check.</param>
/// <returns></returns>
private bool isColumnAtIndexSpecial(ManiaBeatmap beatmap, int index)
{
foreach (var stage in beatmap.Stages)
{
for (int stageIndex = 0; stageIndex < stage.Columns; stageIndex++)
if (index >= stage.Columns)
{
if (index == 0)
return stage.IsSpecialColumn(stageIndex);
index--;
index -= stage.Columns;
continue;
}
return stage.IsSpecialColumn(index);
}
return false;
throw new ArgumentException("Column index is too high.", nameof(index));
}
}
}