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

Not sure how these CI issues were missed.

This commit is contained in:
smoogipooo 2017-06-07 19:27:22 +09:00
parent 1932b58663
commit 8641379424
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableManiaTimingChange.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
{
public abstract class DrawableManiaTimingChange : DrawableTimingChange
{
public DrawableManiaTimingChange(TimingChange timingChange)
protected DrawableManiaTimingChange(TimingChange timingChange)
: base(timingChange, Axes.Y)
{
}

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

@ -65,10 +65,10 @@ private void generateDefaultTimingChanges()
if (HitObjectTimingChanges != null || BarlineTimingChanges != null)
return;
HitObjectTimingChanges = new List<DrawableTimingChange>[Columns.Value];
HitObjectTimingChanges = new List<DrawableTimingChange>[PreferredColumns];
BarlineTimingChanges = new List<DrawableTimingChange>();
for (int i = 0; i < Columns.Value; i++)
for (int i = 0; i < PreferredColumns; i++)
HitObjectTimingChanges[i] = new List<DrawableTimingChange>();
double lastSpeedMultiplier = 1;
@ -113,7 +113,7 @@ private void generateDefaultTimingChanges()
timingChanges.ForEach(t =>
{
for (int i = 0; i < Columns.Value; i++)
for (int i = 0; i < PreferredColumns; i++)
HitObjectTimingChanges[i].Add(new DrawableManiaScrollingTimingChange(t));
BarlineTimingChanges.Add(new DrawableManiaScrollingTimingChange(t));
@ -128,7 +128,7 @@ protected override void ApplyBeatmap()
protected override Playfield<ManiaHitObject, ManiaJudgement> CreatePlayfield()
{
var playfield = new ManiaPlayfield(Columns.Value)
var playfield = new ManiaPlayfield(PreferredColumns)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -136,7 +136,7 @@ protected override Playfield<ManiaHitObject, ManiaJudgement> CreatePlayfield()
Scale = new Vector2(1, -1)
};
for (int i = 0; i < Columns; i++)
for (int i = 0; i < PreferredColumns; i++)
{
foreach (var change in HitObjectTimingChanges[i])
playfield.Columns.ElementAt(i).Add(change);

1
osu.Game/Rulesets/Timing/IHasTimeSpan.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics.Containers;
using OpenTK;
namespace osu.Game.Rulesets.Timing
{

1
osu.Game/Rulesets/Timing/TimingChangeContainer.cs
View File

@ -8,7 +8,6 @@
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Timing.Drawables;
using OpenTK;
namespace osu.Game.Rulesets.Timing
{