h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 23:42:55 +08:00
Code Issues Releases Wiki Activity

Various CI adjustments

Browse Source
This commit is contained in:
FreezyLemon 2017-12-08 09:52:58 +01:00
parent 9d3d9bcdc8
commit 4b3cf0773d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -61,9 +61,8 @@ namespace osu.Game.Rulesets.Taiko.UI
private readonly Box overlayBackground; private readonly Box overlayBackground;
private readonly Box background; private readonly Box background;
private ControlPointInfo controlPointInfo; private readonly ControlPointInfo controlPointInfo;
private Dictionary<double, Tuple<SampleChannel, SampleChannel>> allSamples; private Dictionary<double, Tuple<SampleChannel, SampleChannel>> allSamples;
private AudioManager audio;
public TaikoPlayfield(ControlPointInfo controlPointInfo) public TaikoPlayfield(ControlPointInfo controlPointInfo)
: base(Axes.X) : base(Axes.X)
@ -208,8 +207,6 @@ namespace osu.Game.Rulesets.Taiko.UI
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio) private void load(OsuColour colours, AudioManager audio)
{ {
this.audio = audio;
allSamples = new Dictionary<double, Tuple<SampleChannel, SampleChannel>>(); allSamples = new Dictionary<double, Tuple<SampleChannel, SampleChannel>>();
foreach (var soundPoint in controlPointInfo.SoundPoints) foreach (var soundPoint in controlPointInfo.SoundPoints)
{ {

4
osu.Game/Audio/SampleInfo.cs
View File

@ -15,9 +15,9 @@ namespace osu.Game.Audio
public const string HIT_NORMAL = @"hitnormal"; public const string HIT_NORMAL = @"hitnormal";
public const string HIT_CLAP = @"hitclap"; public const string HIT_CLAP = @"hitclap";
public static SampleInfo FromSoundPoint(SoundControlPoint soundPoint, string sampleName = SampleInfo.HIT_NORMAL) public static SampleInfo FromSoundPoint(SoundControlPoint soundPoint, string sampleName = HIT_NORMAL)
{ {
return new SampleInfo() return new SampleInfo
{ {
Bank = soundPoint.SampleBank, Bank = soundPoint.SampleBank,
Name = sampleName, Name = sampleName,