Revert async changes

This commit is contained in:
Dean Herbert
2018-08-31 07:04:40 +09:00
parent 247e1ee714
commit 03084aa04b
46 changed files with 120 additions and 157 deletions

View File

@ -20,7 +20,6 @@ using OpenTK.Input;
using osu.Framework.Graphics.Shapes;
using System;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Input.States;
using osu.Framework.MathUtils;
@ -144,10 +143,10 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private async Task load(OsuColour colours, TextureStore textures, AudioManager audio)
private void load(OsuColour colours, TextureStore textures, AudioManager audio)
{
getSample = await audio.Sample.GetAsync(@"MedalSplash/medal-get");
innerSpin.Texture = outerSpin.Texture = await textures.GetAsync(@"MedalSplash/disc-spin");
getSample = audio.Sample.Get(@"MedalSplash/medal-get");
innerSpin.Texture = outerSpin.Texture = textures.Get(@"MedalSplash/disc-spin");
disc.EdgeEffect = leftStrip.EdgeEffect = rightStrip.EdgeEffect = new EdgeEffectParameters
{