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

General cleanup.

Browse Source
This commit is contained in:
smoogipooo 2017-04-06 11:54:11 +09:00
parent 2a16eafe8f
commit c65ab5b6f1
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Audio/BeatmapSampleStore.cs
View File

@ -1,21 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Audio.Sample;
using osu.Framework.IO.Stores;
namespace osu.Game.Audio
{
public class BeatmapSampleStore : NamespacedResourceStore<SampleChannel>
{
public BeatmapSampleStore(IResourceStore<SampleChannel> store, string ns)
: base(store, ns)
{
}
public SampleChannel Get(SampleInfo sampleInfo)
{
return Get($@"{sampleInfo.Bank}-{sampleInfo.Name}");
}
}
}

8
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -32,7 +32,6 @@ namespace osu.Game.Beatmaps.Formats
private LegacySampleBank defaultSampleBank; private LegacySampleBank defaultSampleBank;
private int defaultSampleVolume = 100; private int defaultSampleVolume = 100;
private bool samplesMatchPlaybackRate;
private readonly int beatmapVersion; private readonly int beatmapVersion;
@ -81,9 +80,6 @@ namespace osu.Game.Beatmaps.Formats
case @"SampleVolume": case @"SampleVolume":
defaultSampleVolume = int.Parse(val); defaultSampleVolume = int.Parse(val);
break; break;
case "SamplesMatchPlaybackRate":
samplesMatchPlaybackRate = val[0] == '1';
break;
case @"StackLeniency": case @"StackLeniency":
beatmap.BeatmapInfo.StackLeniency = float.Parse(val, NumberFormatInfo.InvariantInfo); beatmap.BeatmapInfo.StackLeniency = float.Parse(val, NumberFormatInfo.InvariantInfo);
break; break;
@ -247,8 +243,8 @@ namespace osu.Game.Beatmaps.Formats
} }
string stringSampleSet = sampleSet.ToString().ToLower(); string stringSampleSet = sampleSet.ToString().ToLower();
if (stringSampleSet == "none") if (stringSampleSet == @"none")
stringSampleSet = "normal"; stringSampleSet = @"normal";
beatmap.TimingInfo.ControlPoints.Add(new ControlPoint beatmap.TimingInfo.ControlPoints.Add(new ControlPoint
{ {

1
osu.Game/osu.Game.csproj
View File

@ -71,7 +71,6 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Audio\BeatmapSampleStore.cs" />
<Compile Include="Audio\SampleInfo.cs" /> <Compile Include="Audio\SampleInfo.cs" />
<Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" /> <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
<Compile Include="Beatmaps\DifficultyCalculator.cs" /> <Compile Include="Beatmaps\DifficultyCalculator.cs" />