Skip to content

Commit 45ddb9e

Browse files
fix: resolve CI build errors (RendererType.OpenGLLegacy, naming, IDE0032)
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/e8cdcda3-c212-4191-a5f5-02a45f160c92 Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
1 parent 50319bb commit 45ddb9e

3 files changed

Lines changed: 7 additions & 12 deletions

File tree

osu.Game/IO/Stores/OptimisedMediaResourceStore.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace osu.Game.IO.Stores
1818
/// </remarks>
1919
public class OptimisedMediaResourceStore : ResourceStore<byte[]>
2020
{
21-
private static readonly Dictionary<string, string[]> extensionPreferences = new Dictionary<string, string[]>
21+
private static readonly Dictionary<string, string[]> extension_preferences = new Dictionary<string, string[]>
2222
{
2323
// Keep in sync with OptimizedResourceStore.ImageFallbackRules in osu-framework.
2424
// avif first (better compression), webp second (broad compat), original last.
@@ -43,7 +43,7 @@ protected override IEnumerable<string> GetFilenames(string name)
4343
string extension = Path.GetExtension(name);
4444
string normalisedExtension = extension.ToLowerInvariant();
4545

46-
if (!string.IsNullOrEmpty(extension) && extensionPreferences.TryGetValue(normalisedExtension, out string[]? alternatives))
46+
if (!string.IsNullOrEmpty(extension) && extension_preferences.TryGetValue(normalisedExtension, out string[]? alternatives))
4747
{
4848
foreach (string alternative in alternatives)
4949
yield return Path.ChangeExtension(name, alternative);

osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ private void load(FrameworkConfigManager config, OsuConfigManager osuConfig, IDi
8989
{
9090
Caption = GraphicsSettingsStrings.Renderer,
9191
Current = renderer,
92-
Items = rendererItems.Order()
93-
#pragma warning disable CS0612, CS0618
94-
.Where(t => t != RendererType.OpenGLLegacy),
95-
#pragma warning restore CS0612, CS0618
92+
Items = rendererItems.Order(),
9693
})
9794
{
9895
Keywords = new[] { @"compatibility", @"directx" },

osu.Game/Screens/OnlinePlay/Matchmaking/Queue/CloudVisualisation.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,23 @@ public partial class CloudVisualisation : CompositeDrawable
2727

2828
private readonly Bindable<double?> lastSamplePlayback = new Bindable<double?>();
2929

30-
private APIUser[] users = [];
31-
3230
public APIUser[] Users
3331
{
34-
get => users;
32+
get;
3533
set
3634
{
37-
users = value;
35+
field = value;
3836
if (IsLoaded)
3937
refresh();
4038
}
41-
}
39+
} = [];
4240

4341
private void refresh()
4442
{
4543
foreach (var u in usersContainer)
4644
u.Delay(RNG.Next(0, 1000)).FadeOut(500).Expire();
4745

48-
LoadComponentsAsync(users.Select(u => new MovingAvatar(u, lastSamplePlayback)), avatars =>
46+
LoadComponentsAsync(Users.Select(u => new MovingAvatar(u, lastSamplePlayback)), avatars =>
4947
{
5048
if (usersContainer.Count == 0)
5149
{

0 commit comments

Comments
 (0)