sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into legacy-sprite-text-fonts

Browse Source
This commit is contained in:
Salman Ahmed
2021-03-25 14:52:01 +03:00
parent 43c1e1d217 452e5c7cc3
commit 6aa0c9d8fd
169 changed files with 2222 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Skinning/LegacySkin.cs
View File

@ -99,13 +99,6 @@ namespace osu.Game.Skinning
true) != null);
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
Textures?.Dispose();
Samples?.Dispose();
}
public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
{
switch (lookup)
@ -433,7 +426,7 @@ namespace osu.Game.Skinning
return null;
}
public override Sample GetSample(ISampleInfo sampleInfo)
public override ISample GetSample(ISampleInfo sampleInfo)
{
IEnumerable<string> lookupNames;
@ -485,5 +478,12 @@ namespace osu.Game.Skinning
string lastPiece = componentName.Split('/').Last();
yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
Textures?.Dispose();
Samples?.Dispose();
}
}
}