h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 15:43:22 +08:00
Code Issues Releases Wiki Activity

SpecialColumn -> SpecialColumnPosition

Browse Source
This commit is contained in:
smoogipoo 2018-01-22 16:12:45 +09:00
parent 351be4308f
commit 8a8b3f25e7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.UI
for (int i = 0; i < stageDefinitions.Count; i++) for (int i = 0; i < stageDefinitions.Count; i++)
{ {
var newStage = new ManiaStage(firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction); var newStage = new ManiaStage(firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction);
newStage.SpecialColumn.BindTo(SpecialColumnPosition); newStage.SpecialColumnPosition.BindTo(SpecialColumnPosition);
newStage.VisibleTimeRange.BindTo(VisibleTimeRange); newStage.VisibleTimeRange.BindTo(VisibleTimeRange);
newStage.Inverted.BindTo(Inverted); newStage.Inverted.BindTo(Inverted);

10
osu.Game.Rulesets.Mania/UI/ManiaStage.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
/// </summary> /// </summary>
public readonly Bindable<bool> Inverted = new Bindable<bool>(true); public readonly Bindable<bool> Inverted = new Bindable<bool>(true);
public readonly Bindable<SpecialColumnPosition> SpecialColumn = new Bindable<SpecialColumnPosition>(); public readonly Bindable<SpecialColumnPosition> SpecialColumnPosition = new Bindable<SpecialColumnPosition>();
public IReadOnlyList<Column> Columns => columnFlow.Children; public IReadOnlyList<Column> Columns => columnFlow.Children;
private readonly FillFlowContainer<Column> columnFlow; private readonly FillFlowContainer<Column> columnFlow;
@ -169,14 +169,14 @@ namespace osu.Game.Rulesets.Mania.UI
/// <returns>Whether the column is a special column.</returns> /// <returns>Whether the column is a special column.</returns>
private bool isSpecialColumn(int column) private bool isSpecialColumn(int column)
{ {
switch (SpecialColumn.Value) switch (SpecialColumnPosition.Value)
{ {
default: default:
case SpecialColumnPosition.Normal: case UI.SpecialColumnPosition.Normal:
return definition.Columns % 2 == 1 && column == definition.Columns / 2; return definition.Columns % 2 == 1 && column == definition.Columns / 2;
case SpecialColumnPosition.Left: case UI.SpecialColumnPosition.Left:
return column == 0; return column == 0;
case SpecialColumnPosition.Right: case UI.SpecialColumnPosition.Right:
return column == definition.Columns - 1; return column == definition.Columns - 1;
} }
} }