sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Unify namings across the board

Browse Source
This commit is contained in:
Dan Balasescu
2022-02-09 12:09:04 +09:00
parent 4966c4e974
commit ffc4c64f7e
9 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Online/Spectator/SpectatingUserState.cs → osu.Game/Online/Spectator/SpectatedUserState.cs
View File

@ -3,7 +3,7 @@
namespace osu.Game.Online.Spectator
{
public enum SpectatingUserState
public enum SpectatedUserState
{
/// <summary>
/// The spectated user is not yet playing.
@ -26,7 +26,7 @@ namespace osu.Game.Online.Spectator
Passed,
/// <summary>
/// The spectator user has failed gameplay.
/// The spectated user has failed gameplay.
/// </summary>
Failed,

36
osu.Game/Online/Spectator/SpectatorClient.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Online.Spectator
/// <summary>
/// The states of all users currently being watched.
/// </summary>
public IBindableDictionary<int, SpectatorState> WatchingUserStates => watchingUserStates;
public IBindableDictionary<int, SpectatorState> WatchedUserStates => watchedUserStates;
/// <summary>
/// A global list of all players currently playing.
@ -48,9 +48,9 @@ namespace osu.Game.Online.Spectator
/// <summary>
/// All users currently being watched.
/// </summary>
private readonly List<int> watchingUsers = new List<int>();
private readonly List<int> watchedUsers = new List<int>();
private readonly BindableDictionary<int, SpectatorState> watchingUserStates = new BindableDictionary<int, SpectatorState>();
private readonly BindableDictionary<int, SpectatorState> watchedUserStates = new BindableDictionary<int, SpectatorState>();
private readonly BindableList<int> playingUsers = new BindableList<int>();
private readonly SpectatorState currentState = new SpectatorState();
@ -85,8 +85,8 @@ namespace osu.Game.Online.Spectator
if (connected.NewValue)
{
// get all the users that were previously being watched
int[] users = watchingUsers.ToArray();
watchingUsers.Clear();
int[] users = watchedUsers.ToArray();
watchedUsers.Clear();
// resubscribe to watched users.
foreach (int userId in users)
@ -99,7 +99,7 @@ namespace osu.Game.Online.Spectator
else
{
playingUsers.Clear();
watchingUserStates.Clear();
watchedUserStates.Clear();
}
}), true);
}
@ -111,8 +111,8 @@ namespace osu.Game.Online.Spectator
if (!playingUsers.Contains(userId))
playingUsers.Add(userId);
if (watchingUsers.Contains(userId))
watchingUserStates[userId] = state;
if (watchedUsers.Contains(userId))
watchedUserStates[userId] = state;
OnUserBeganPlaying?.Invoke(userId, state);
});
@ -126,8 +126,8 @@ namespace osu.Game.Online.Spectator
{
playingUsers.Remove(userId);
if (watchingUsers.Contains(userId))
watchingUserStates[userId] = state;
if (watchedUsers.Contains(userId))
watchedUserStates[userId] = state;
OnUserFinishedPlaying?.Invoke(userId, state);
});
@ -159,7 +159,7 @@ namespace osu.Game.Online.Spectator
currentState.BeatmapID = score.ScoreInfo.BeatmapInfo.OnlineID;
currentState.RulesetID = score.ScoreInfo.RulesetID;
currentState.Mods = score.ScoreInfo.Mods.Select(m => new APIMod(m)).ToArray();
currentState.State = SpectatingUserState.Playing;
currentState.State = SpectatedUserState.Playing;
currentBeatmap = state.Beatmap;
currentScore = score;
@ -186,11 +186,11 @@ namespace osu.Game.Online.Spectator
currentBeatmap = null;
if (state.HasPassed)
currentState.State = SpectatingUserState.Passed;
currentState.State = SpectatedUserState.Passed;
else if (state.HasFailed)
currentState.State = SpectatingUserState.Failed;
currentState.State = SpectatedUserState.Failed;
else
currentState.State = SpectatingUserState.Quit;
currentState.State = SpectatedUserState.Quit;
EndPlayingInternal(currentState);
});
@ -200,10 +200,10 @@ namespace osu.Game.Online.Spectator
{
Debug.Assert(ThreadSafety.IsUpdateThread);
if (watchingUsers.Contains(userId))
if (watchedUsers.Contains(userId))
return;
watchingUsers.Add(userId);
watchedUsers.Add(userId);
WatchUserInternal(userId);
}
@ -214,8 +214,8 @@ namespace osu.Game.Online.Spectator
// Todo: This should not be a thing, but requires framework changes.
Schedule(() =>
{
watchingUsers.Remove(userId);
watchingUserStates.Remove(userId);
watchedUsers.Remove(userId);
watchedUserStates.Remove(userId);
StopWatchingUserInternal(userId);
});
}

2
osu.Game/Online/Spectator/SpectatorState.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Online.Spectator
public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
[Key(3)]
public SpectatingUserState State { get; set; }
public SpectatedUserState State { get; set; }
public bool Equals(SpectatorState other)
{