mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 16:52:54 +08:00
CurrentBeatmap -> Beatmap
This commit is contained in:
parent
03f6cded84
commit
2c16d9c3a7
@ -34,14 +34,14 @@ namespace osu.Desktop.VisualTests.Tests
|
||||
Name = @"Great Room Right Here",
|
||||
Host = new User { Username = @"Naeferith", Id = 9492835, Country = new Country { FlagName = @"FR" }},
|
||||
Status = MultiplayerRoomStatus.Open,
|
||||
CurrentBeatmap = new BeatmapMetadata { Title = @"Seiryu", Artist = @"Critical Crystal" },
|
||||
Beatmap = new BeatmapMetadata { Title = @"Seiryu", Artist = @"Critical Crystal" },
|
||||
}),
|
||||
new DrawableRoom(new Room
|
||||
{
|
||||
Name = @"Relax It's The Weekend",
|
||||
Host = new User{ Username = @"peppy", Id = 2, Country = new Country { FlagName = @"AU" }},
|
||||
Status = MultiplayerRoomStatus.Playing,
|
||||
CurrentBeatmap = new BeatmapMetadata { Title = @"ZAQ", Artist = @"Serendipity" },
|
||||
Beatmap = new BeatmapMetadata { Title = @"ZAQ", Artist = @"Serendipity" },
|
||||
}),
|
||||
}
|
||||
});
|
||||
@ -66,7 +66,7 @@ namespace osu.Desktop.VisualTests.Tests
|
||||
|
||||
AddStep(@"change beatmap", () =>
|
||||
{
|
||||
p.Room.Value.CurrentBeatmap = null;
|
||||
p.Room.Value.Beatmap = null;
|
||||
p.Room.TriggerChange();
|
||||
});
|
||||
|
||||
|
@ -12,7 +12,7 @@ namespace osu.Game.Online.Multiplayer
|
||||
public string Name { get; set; }
|
||||
public User Host { get; set; }
|
||||
public MultiplayerRoomStatus Status { get; set; }
|
||||
public BeatmapMetadata CurrentBeatmap { get; set; }
|
||||
public BeatmapMetadata Beatmap { get; set; }
|
||||
}
|
||||
|
||||
public enum MultiplayerRoomStatus
|
||||
|
@ -214,11 +214,11 @@ namespace osu.Game.Screens.Multiplayer
|
||||
flagContainer.Children = new[] { new DrawableFlag(room.Host.Country?.FlagName ?? @"__") { RelativeSizeAxes = Axes.Both } };
|
||||
avatar.User = room.Host;
|
||||
|
||||
if (room.CurrentBeatmap != null)
|
||||
if (room.Beatmap != null)
|
||||
{
|
||||
beatmapTitle.Current = localisation.GetUnicodePreference(room.CurrentBeatmap.TitleUnicode, room.CurrentBeatmap.Title);
|
||||
beatmapTitle.Current = localisation.GetUnicodePreference(room.Beatmap.TitleUnicode, room.Beatmap.Title);
|
||||
beatmapDash.Text = @" - ";
|
||||
beatmapArtist.Current = localisation.GetUnicodePreference(room.CurrentBeatmap.ArtistUnicode, room.CurrentBeatmap.Artist);
|
||||
beatmapArtist.Current = localisation.GetUnicodePreference(room.Beatmap.ArtistUnicode, room.Beatmap.Artist);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user