RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CurrentBeatmap -> Beatmap

This commit is contained in:
DrabWeb 2017-05-22 12:45:40 -03:00
parent 03f6cded84
commit 2c16d9c3a7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs
View File

@ -34,14 +34,14 @@ public override void Reset()
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 @@ public override void Reset()
AddStep(@"change beatmap", () =>
{
p.Room.Value.CurrentBeatmap = null;
p.Room.Value.Beatmap = null;
p.Room.TriggerChange();
});

2
osu.Game/Online/Multiplayer/Room.cs
View File

@ -12,7 +12,7 @@ public class Room
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

6
osu.Game/Screens/Multiplayer/DrawableRoom.cs
View File

@ -214,11 +214,11 @@ private void displayRoom(Room room)
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
{