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

Change low-hanging references of "room" to "playlist"

Browse Source
This commit is contained in:
Dean Herbert 2020-12-24 21:59:10 +09:00
parent aec25e2d73
commit 3a46e210d4
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ namespace osu.Game.Screens.Multi
private OsuGameBase game { get; set; } private OsuGameBase game { get; set; }
[Resolved] [Resolved]
private IAPIProvider api { get; set; } protected IAPIProvider API { get; private set; }
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private OsuLogo logo { get; set; } private OsuLogo logo { get; set; }
@ -155,7 +155,7 @@ namespace osu.Game.Screens.Multi
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(IdleTracker idleTracker) private void load(IdleTracker idleTracker)
{ {
apiState.BindTo(api.State); apiState.BindTo(API.State);
apiState.BindValueChanged(onlineStateChanged, true); apiState.BindValueChanged(onlineStateChanged, true);
if (idleTracker != null) if (idleTracker != null)
@ -269,7 +269,7 @@ namespace osu.Game.Screens.Multi
/// Creates a new room. /// Creates a new room.
/// </summary> /// </summary>
/// <returns>The created <see cref="Room"/>.</returns> /// <returns>The created <see cref="Room"/>.</returns>
protected virtual Room CreateNewRoom() => new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } }; protected abstract Room CreateNewRoom();
private void screenPushed(IScreen lastScreen, IScreen newScreen) private void screenPushed(IScreen lastScreen, IScreen newScreen)
{ {

2
osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
protected override Room CreateNewRoom() protected override Room CreateNewRoom()
{ {
var room = base.CreateNewRoom(); var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } };
room.Category.Value = RoomCategory.Realtime; room.Category.Value = RoomCategory.Realtime;
return room; return room;
} }

2
osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Screens.Multi.Timeshift
{ {
Triangles.TriangleScale = 1.5f; Triangles.TriangleScale = 1.5f;
Text = "Create room"; Text = "Create playlist";
} }
} }
} }

6
osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
View File

@ -4,6 +4,7 @@
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Components; using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Lounge; using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Match; using osu.Game.Screens.Multi.Match;
@ -45,6 +46,11 @@ namespace osu.Game.Screens.Multi.Timeshift
Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})"); Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
} }
protected override Room CreateNewRoom()
{
return new Room { Name = { Value = $"{API.LocalUser}'s awesome playlist" } };
}
protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager(); protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen(); protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();