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

Rename to AbortGameplay() and handle additional states

Browse Source
This commit is contained in:
Dan Balasescu 2021-12-14 16:52:57 +09:00
parent 750bfae909
commit 9ade8069a1
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ namespace osu.Game.Online.Multiplayer
/// <summary> /// <summary>
/// Aborts an ongoing gameplay load. /// Aborts an ongoing gameplay load.
/// </summary> /// </summary>
Task AbortLoad(); Task AbortGameplay();
/// <summary> /// <summary>
/// Adds an item to the playlist. /// Adds an item to the playlist.

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

@ -333,7 +333,7 @@ namespace osu.Game.Online.Multiplayer
public abstract Task StartMatch(); public abstract Task StartMatch();
public abstract Task AbortLoad(); public abstract Task AbortGameplay();
public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item); public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item);

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

@ -154,12 +154,12 @@ namespace osu.Game.Online.Multiplayer
return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch)); return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
} }
public override Task AbortLoad() public override Task AbortGameplay()
{ {
if (!IsConnected.Value) if (!IsConnected.Value)
return Task.CompletedTask; return Task.CompletedTask;
return connection.InvokeAsync(nameof(IMultiplayerServer.AbortLoad)); return connection.InvokeAsync(nameof(IMultiplayerServer.AbortGameplay));
} }
public override Task AddPlaylistItem(MultiplayerPlaylistItem item) public override Task AddPlaylistItem(MultiplayerPlaylistItem item)

4
osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
View File

@ -30,7 +30,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
break; break;
case MultiplayerUserState.WaitingForLoad: case MultiplayerUserState.WaitingForLoad:
client.AbortLoad(); case MultiplayerUserState.Loaded:
case MultiplayerUserState.Playing:
client.AbortGameplay();
break; break;
default: default:

2
osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View File

@ -317,7 +317,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
return ((IMultiplayerClient)this).LoadRequested(); return ((IMultiplayerClient)this).LoadRequested();
} }
public override Task AbortLoad() public override Task AbortGameplay()
{ {
Debug.Assert(Room != null); Debug.Assert(Room != null);
Debug.Assert(LocalUser != null); Debug.Assert(LocalUser != null);