From 2c1f3de47a2551a3f4a92d8860dc883a56c16af0 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 13 Jul 2017 10:27:39 +0900 Subject: [PATCH] Rename 2X resources to be defaults --- osu.Desktop.VisualTests/Tests/TestCaseDirect.cs | 8 ++++---- .../Tests/TestCaseRoomInspector.cs | 4 ++-- osu.Game/Database/BeatmapSetOnlineInfo.cs | 12 ++++++------ osu.Game/Screens/Multiplayer/RoomInspector.cs | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs b/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs index fb1dbf01ee..2a20bca836 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseDirect.cs @@ -53,7 +53,7 @@ namespace osu.Desktop.VisualTests.Tests Covers = new BeatmapSetOnlineCovers { Card = @"https://assets.ppy.sh/beatmaps/578332/covers/card.jpg?1494591390", - Card2X = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390", + Cover = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390", }, Preview = @"https://b.ppy.sh/preview/578332.mp3", PlayCount = 97, @@ -83,7 +83,7 @@ namespace osu.Desktop.VisualTests.Tests Covers = new BeatmapSetOnlineCovers { Card = @"https://assets.ppy.sh/beatmaps/599627/covers/card.jpg?1494539318", - Card2X = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318", + Cover = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318", }, Preview = @"https//b.ppy.sh/preview/599627.mp3", PlayCount = 3082, @@ -113,7 +113,7 @@ namespace osu.Desktop.VisualTests.Tests Covers = new BeatmapSetOnlineCovers { Card = @"https://assets.ppy.sh/beatmaps/513268/covers/card.jpg?1494502863", - Card2X = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863", + Cover = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863", }, Preview = @"https//b.ppy.sh/preview/513268.mp3", PlayCount = 2762, @@ -158,7 +158,7 @@ namespace osu.Desktop.VisualTests.Tests Covers = new BeatmapSetOnlineCovers { Card = @"https://assets.ppy.sh/beatmaps/586841/covers/card.jpg?1494052741", - Card2X = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741", + Cover = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741", }, Preview = @"https//b.ppy.sh/preview/586841.mp3", PlayCount = 62317, diff --git a/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs b/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs index 0b5fa2384b..4d650afed5 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs @@ -45,7 +45,7 @@ namespace osu.Desktop.VisualTests.Tests { Covers = new BeatmapSetOnlineCovers { - Cover2X = @"https://assets.ppy.sh/beatmaps/560573/covers/cover.jpg?1492722343", + Cover = @"https://assets.ppy.sh/beatmaps/560573/covers/cover.jpg?1492722343", }, }, }, @@ -112,7 +112,7 @@ namespace osu.Desktop.VisualTests.Tests { Covers = new BeatmapSetOnlineCovers { - Cover2X = @"https://assets.ppy.sh/beatmaps/39804/covers/cover.jpg?1456506845", + Cover = @"https://assets.ppy.sh/beatmaps/39804/covers/cover.jpg?1456506845", }, }, }, diff --git a/osu.Game/Database/BeatmapSetOnlineInfo.cs b/osu.Game/Database/BeatmapSetOnlineInfo.cs index d581137a97..61d408c94a 100644 --- a/osu.Game/Database/BeatmapSetOnlineInfo.cs +++ b/osu.Game/Database/BeatmapSetOnlineInfo.cs @@ -37,19 +37,19 @@ namespace osu.Game.Database public class BeatmapSetOnlineCovers { - public string Cover { get; set; } + public string CoverLowRes { get; set; } [JsonProperty(@"cover@2x")] - public string Cover2X { get; set; } + public string Cover { get; set; } - public string Card { get; set; } + public string CardLowRes { get; set; } [JsonProperty(@"card@2x")] - public string Card2X { get; set; } + public string Card { get; set; } - public string List { get; set; } + public string ListLowRes { get; set; } [JsonProperty(@"list@2x")] - public string List2X { get; set; } + public string List { get; set; } } } diff --git a/osu.Game/Screens/Multiplayer/RoomInspector.cs b/osu.Game/Screens/Multiplayer/RoomInspector.cs index d488b1f5a1..73783bab12 100644 --- a/osu.Game/Screens/Multiplayer/RoomInspector.cs +++ b/osu.Game/Screens/Multiplayer/RoomInspector.cs @@ -539,8 +539,8 @@ namespace osu.Game.Screens.Multiplayer [BackgroundDependencyLoader] private void load(TextureStore textures) { - if (set.OnlineInfo?.Covers?.Cover2X != null) - Texture = textures.Get(set.OnlineInfo.Covers.Cover2X); + if (set.OnlineInfo?.Covers?.Cover != null) + Texture = textures.Get(set.OnlineInfo.Covers.Cover); } } }