h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 15:03:13 +08:00
Code Issues Releases Wiki Activity

MultiplayerRoomStatus -> RoomStatus

Browse Source
This commit is contained in:
DrabWeb 2017-05-22 12:46:41 -03:00
parent 2c16d9c3a7
commit 65df2d2b70
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,14 +33,14 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Name = @"Great Room Right Here", Name = @"Great Room Right Here",
Host = new User { Username = @"Naeferith", Id = 9492835, Country = new Country { FlagName = @"FR" }}, Host = new User { Username = @"Naeferith", Id = 9492835, Country = new Country { FlagName = @"FR" }},
Status = MultiplayerRoomStatus.Open, Status = RoomStatus.Open,
Beatmap = new BeatmapMetadata { Title = @"Seiryu", Artist = @"Critical Crystal" }, Beatmap = new BeatmapMetadata { Title = @"Seiryu", Artist = @"Critical Crystal" },
}), }),
new DrawableRoom(new Room new DrawableRoom(new Room
{ {
Name = @"Relax It's The Weekend", Name = @"Relax It's The Weekend",
Host = new User{ Username = @"peppy", Id = 2, Country = new Country { FlagName = @"AU" }}, Host = new User{ Username = @"peppy", Id = 2, Country = new Country { FlagName = @"AU" }},
Status = MultiplayerRoomStatus.Playing, Status = RoomStatus.Playing,
Beatmap = new BeatmapMetadata { Title = @"ZAQ", Artist = @"Serendipity" }, Beatmap = new BeatmapMetadata { Title = @"ZAQ", Artist = @"Serendipity" },
}), }),
} }
@ -48,7 +48,7 @@ namespace osu.Desktop.VisualTests.Tests
AddStep(@"change state", () => AddStep(@"change state", () =>
{ {
p.Room.Value.Status = MultiplayerRoomStatus.Playing; p.Room.Value.Status = RoomStatus.Playing;
p.Room.TriggerChange(); p.Room.TriggerChange();
}); });
@ -72,7 +72,7 @@ namespace osu.Desktop.VisualTests.Tests
AddStep(@"change state", () => AddStep(@"change state", () =>
{ {
p.Room.Value.Status = MultiplayerRoomStatus.Open; p.Room.Value.Status = RoomStatus.Open;
p.Room.TriggerChange(); p.Room.TriggerChange();
}); });
} }

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

@ -11,11 +11,11 @@ namespace osu.Game.Online.Multiplayer
{ {
public string Name { get; set; } public string Name { get; set; }
public User Host { get; set; } public User Host { get; set; }
public MultiplayerRoomStatus Status { get; set; } public RoomStatus Status { get; set; }
public BeatmapMetadata Beatmap { get; set; } public BeatmapMetadata Beatmap { get; set; }
} }
public enum MultiplayerRoomStatus public enum RoomStatus
{ {
[Description(@"Welcoming Players")] [Description(@"Welcoming Players")]
Open, Open,

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

@ -231,7 +231,7 @@ namespace osu.Game.Screens.Multiplayer
} }
foreach (Drawable d in new Drawable[] { sideStrip, status }) foreach (Drawable d in new Drawable[] { sideStrip, status })
d.FadeColour(room.Status == MultiplayerRoomStatus.Playing? playingColour : openColour, 100); d.FadeColour(room.Status == RoomStatus.Playing? playingColour : openColour, 100);
} }
} }
} }