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

Fix renaming variables too eagerly

Browse Source
This commit is contained in:
Dean Herbert 2018-09-06 17:57:09 +09:00
parent 75c7f521ea
commit 4e012042ab
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Beatmaps
try try
{ {
return (textureStore ?? (textureStore = new LargeTextureStore(new TextureLoaderStore(store)))).Get(getPathForFile(Metadata.BackgroundFile)); return (textureStore ?? (textureStore = new LargeTextureStore(new RawTextureLoaderStore(store)))).Get(getPathForFile(Metadata.BackgroundFile));
} }
catch catch
{ {

2
osu.Game/OsuGameBase.cs
View File

@ -108,7 +108,7 @@ namespace osu.Game
dependencies.Cache(contextFactory = new DatabaseContextFactory(Host.Storage)); dependencies.Cache(contextFactory = new DatabaseContextFactory(Host.Storage));
dependencies.Cache(new LargeTextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures")))); dependencies.Cache(new LargeTextureStore(new RawTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures"))));
dependencies.CacheAs(this); dependencies.CacheAs(this);
dependencies.Cache(LocalConfig); dependencies.Cache(LocalConfig);

2
osu.Game/Screens/Tournament/Drawings.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Screens.Tournament
TextureStore flagStore = new TextureStore(); TextureStore flagStore = new TextureStore();
// Local flag store // Local flag store
flagStore.AddStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(new StorageBackedResourceStore(storage), "Drawings"))); flagStore.AddStore(new RawTextureLoaderStore(new NamespacedResourceStore<byte[]>(new StorageBackedResourceStore(storage), "Drawings")));
// Default texture store // Default texture store
flagStore.AddStore(textures); flagStore.AddStore(textures);

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

@ -37,7 +37,7 @@ namespace osu.Game.Skinning
Configuration = new SkinConfiguration(); Configuration = new SkinConfiguration();
Samples = audioManager.GetSampleManager(storage); Samples = audioManager.GetSampleManager(storage);
Textures = new TextureStore(new TextureLoaderStore(storage)); Textures = new TextureStore(new RawTextureLoaderStore(storage));
} }
public override Drawable GetDrawableComponent(string componentName) public override Drawable GetDrawableComponent(string componentName)

2
osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Storyboards.Drawables
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(FileStore fileStore) private void load(FileStore fileStore)
{ {
dependencies.Cache(new TextureStore(new TextureLoaderStore(fileStore.Store), false, scaleAdjust: 1)); dependencies.Cache(new TextureStore(new RawTextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
foreach (var layer in Storyboard.Layers) foreach (var layer in Storyboard.Layers)
Add(layer.CreateDrawable()); Add(layer.CreateDrawable());