diff --git a/osu.Game.Tests/Visual/Multiplayer/QueueingModes/QueueModeTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/QueueingModes/QueueModeTestScene.cs
index 82ad9f3afe..cdab83e463 100644
--- a/osu.Game.Tests/Visual/Multiplayer/QueueingModes/QueueModeTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/QueueingModes/QueueModeTestScene.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Multiplayer.QueueingModes
{
public abstract class QueueModeTestScene : ScreenTestScene
{
- protected abstract QueueModes Mode { get; }
+ protected abstract QueueMode Mode { get; }
protected BeatmapInfo InitialBeatmap { get; private set; }
protected BeatmapInfo OtherBeatmap { get; private set; }
diff --git a/osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneFreeForAllQueueMode.cs b/osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneFreeForAllQueueMode.cs
index 0cf330bbbb..8217eabcdb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneFreeForAllQueueMode.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneFreeForAllQueueMode.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Multiplayer.QueueingModes
{
public class TestSceneFreeForAllQueueMode : QueueModeTestScene
{
- protected override QueueModes Mode => QueueModes.FreeForAll;
+ protected override QueueMode Mode => QueueMode.FreeForAll;
[Test]
public void TestFirstItemSelectedByDefault()
@@ -72,7 +72,7 @@ public void TestItemsClearedWhenSwitchToHostOnlyMode()
// Move to the "other" beatmap.
RunGameplay();
- AddStep("change queue mode", () => Client.ChangeSettings(queueMode: QueueModes.HostOnly));
+ AddStep("change queue mode", () => Client.ChangeSettings(queueMode: QueueMode.HostOnly));
AddAssert("playlist has 2 items", () => Client.APIRoom?.Playlist.Count == 2);
AddAssert("playlist item is the other beatmap", () => Client.CurrentMatchPlayingItem.Value?.BeatmapID == OtherBeatmap.OnlineID);
AddAssert("playlist item is not expired", () => Client.APIRoom?.Playlist[1].Expired == false);
diff --git a/osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneHostOnlyQueueMode.cs b/osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneHostOnlyQueueMode.cs
index fb11416140..d9e6ea878b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneHostOnlyQueueMode.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneHostOnlyQueueMode.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Multiplayer.QueueingModes
{
public class TestSceneHostOnlyQueueMode : QueueModeTestScene
{
- protected override QueueModes Mode => QueueModes.HostOnly;
+ protected override QueueMode Mode => QueueMode.HostOnly;
[Test]
public void TestFirstItemSelectedByDefault()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 66c639ed62..1cc770b670 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -589,7 +589,7 @@ public void TestRoomSettingsReQueriedWhenJoiningRoom()
roomManager.AddServerSideRoom(new Room
{
Name = { Value = "Test Room" },
- QueueMode = { Value = QueueModes.FreeForAll },
+ QueueMode = { Value = QueueMode.FreeForAll },
Playlist =
{
new PlaylistItem
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index b1ec16ee8d..788cc1f40b 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -222,7 +222,7 @@ public Task LeaveRoom()
/// The new password, if any.
/// The type of the match, if any.
/// The new queue mode, if any.
- public Task ChangeSettings(Optional name = default, Optional password = default, Optional matchType = default, Optional queueMode = default)
+ public Task ChangeSettings(Optional name = default, Optional password = default, Optional matchType = default, Optional queueMode = default)
{
if (Room == null)
throw new InvalidOperationException("Must be joined to a match to change settings.");
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 70e884dcce..0f7c61bbc6 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -27,7 +27,7 @@ public class MultiplayerRoomSettings : IEquatable
public MatchType MatchType { get; set; } = MatchType.HeadToHead;
[Key(4)]
- public QueueModes QueueMode { get; set; } = QueueModes.HostOnly;
+ public QueueMode QueueMode { get; set; } = QueueMode.HostOnly;
public bool Equals(MultiplayerRoomSettings other)
=> Password.Equals(other.Password, StringComparison.Ordinal)
diff --git a/osu.Game/Online/Multiplayer/Queueing/QueueModes.cs b/osu.Game/Online/Multiplayer/Queueing/QueueMode.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/Queueing/QueueModes.cs
rename to osu.Game/Online/Multiplayer/Queueing/QueueMode.cs
index 0ead8d2f06..169d238496 100644
--- a/osu.Game/Online/Multiplayer/Queueing/QueueModes.cs
+++ b/osu.Game/Online/Multiplayer/Queueing/QueueMode.cs
@@ -5,7 +5,7 @@
namespace osu.Game.Online.Multiplayer.Queueing
{
- public enum QueueModes
+ public enum QueueMode
{
// used for osu-web deserialization so names shouldn't be changed.
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index f3d591cde0..51f8bd7437 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -76,11 +76,11 @@ private MatchType type
[Cached]
[JsonIgnore]
- public readonly Bindable QueueMode = new Bindable();
+ public readonly Bindable QueueMode = new Bindable();
[JsonConverter(typeof(SnakeCaseStringEnumConverter))]
[JsonProperty("queue_mode")]
- private QueueModes queueMode
+ private QueueMode queueMode
{
get => QueueMode.Value;
set => QueueMode.Value = value;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 98a0cd3d37..6bb698cd67 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -61,7 +61,7 @@ protected class MatchSettings : OnlinePlayComposite
public OsuTextBox NameField, MaxParticipantsField;
public RoomAvailabilityPicker AvailabilityPicker;
public MatchTypePicker TypePicker;
- public OsuEnumDropdown QueueModeDropdown;
+ public OsuEnumDropdown QueueModeDropdown;
public OsuTextBox PasswordTextBox;
public TriangleButton ApplyButton;
@@ -208,7 +208,7 @@ private void load(OverlayColourProvider colourProvider, OsuColour colours)
{
RelativeSizeAxes = Axes.X,
Height = 40,
- Child = QueueModeDropdown = new OsuEnumDropdown
+ Child = QueueModeDropdown = new OsuEnumDropdown
{
RelativeSizeAxes = Axes.X
}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index c99367851a..09ebfbc13c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -388,13 +388,13 @@ private void onRoomUpdated()
switch (client.Room.Settings.QueueMode)
{
- case QueueModes.HostOnly:
+ case QueueMode.HostOnly:
AddOrEditPlaylistButton.Text = "Edit beatmap";
AddOrEditPlaylistButton.Alpha = client.IsHost ? 1 : 0;
break;
- case QueueModes.FreeForAll:
- case QueueModes.FairRotate:
+ case QueueMode.FreeForAll:
+ case QueueMode.FairRotate:
AddOrEditPlaylistButton.Text = "Add beatmap";
AddOrEditPlaylistButton.Alpha = 1;
break;
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index da82a77a13..b6f4abdbb6 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -67,7 +67,7 @@ public class OnlinePlayComposite : CompositeDrawable
protected Bindable Duration { get; private set; }
[Resolved(typeof(Room), nameof(Room.QueueMode))]
- protected Bindable QueueMode { get; private set; }
+ protected Bindable QueueMode { get; private set; }
[Resolved(CanBeNull = true)]
private IBindable subScreenSelectedItem { get; set; }
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 3f7ad4a710..7965bba8a1 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -298,12 +298,12 @@ public override async Task AddPlaylistItem(MultiplayerPlaylistItem item)
Debug.Assert(APIRoom != null);
Debug.Assert(currentItem != null);
- if (Room.Settings.QueueMode == QueueModes.HostOnly && Room.Host?.UserID != LocalUser?.UserID)
+ if (Room.Settings.QueueMode == QueueMode.HostOnly && Room.Host?.UserID != LocalUser?.UserID)
throw new InvalidOperationException("Local user is not the room host.");
switch (Room.Settings.QueueMode)
{
- case QueueModes.HostOnly:
+ case QueueMode.HostOnly:
// In host-only mode, the current item is re-used.
item.ID = currentItem.ID;
@@ -365,13 +365,13 @@ private async Task changeMatchType(MatchType type)
}
}
- private async Task changeQueueMode(QueueModes newMode)
+ private async Task changeQueueMode(QueueMode newMode)
{
Debug.Assert(Room != null);
Debug.Assert(APIRoom != null);
Debug.Assert(currentItem != null);
- if (newMode == QueueModes.HostOnly)
+ if (newMode == QueueMode.HostOnly)
{
// Remove all but the current and expired items. The current item may be re-used for host-only mode if it's non-expired.
for (int i = 0; i < Room.Playlist.Count; i++)
@@ -406,7 +406,7 @@ private async Task finishCurrentItem()
await ((IMultiplayerClient)this).PlaylistItemChanged(currentItem).ConfigureAwait(false);
// In host-only mode, a duplicate playlist item will be used for the next round.
- if (Room.Settings.QueueMode == QueueModes.HostOnly)
+ if (Room.Settings.QueueMode == QueueMode.HostOnly)
await duplicateCurrentItem().ConfigureAwait(false);
await updateCurrentItem(Room).ConfigureAwait(false);
@@ -443,7 +443,7 @@ private async Task updateCurrentItem(MultiplayerRoom room, bool notify = true)
newItem = room.Playlist.FirstOrDefault(i => !i.Expired) ?? room.Playlist.Last();
break;
- case QueueModes.FairRotate:
+ case QueueMode.FairRotate:
// Group playlist items by (user_id -> count_expired), and select the first available playlist item from a user that has available beatmaps where count_expired is the lowest.
throw new NotImplementedException();
}