Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TicTacToe: Optimisation and code compliance

Browse Source
This commit is contained in:
Damien LAGUERRE committed 2023-12-23 19:50:07 +01:00
1 parent fddd2f3f2f
commit b7938ba71c
3 files changed
+28 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
+21 -28
View File
@@ -81,8 +81,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
private const int _FieldSpace = 10;
private float _FieldSize = 100;
int idPlayer1 = 0;
int idPlayer2 = 0;
private int idPlayer1 = 0;
private int idPlayer2 = 0;
private static readonly Random random = new Random();
private static readonly object syncLock = new object();
@@ -535,43 +535,36 @@ namespace VocaluxeLib.PartyModes.TicTacToe
if (_PartyMode.GameData.ProfileIDsTeam1.Count > 0 && (teamNr == 0 || teamNr == -1))
{
if (next == true)
{
idPlayer1++;
if (idPlayer1 >= _PartyMode.GameData.ProfileIDsTeam1.Count)
{
idPlayer1 = 0;
}
}
else
{
idPlayer1 = _GetRamdom(_PartyMode.GameData.ProfileIDsTeam1.Count - 1);
}
idPlayer1 = _GetTeamPlayer(idPlayer1, _PartyMode.GameData.ProfileIDsTeam1.Count, next);
_PartyMode.GameData.Rounds[_PartyMode.GameData.FieldNr].SingerTeam1 = idPlayer1;
}
if (_PartyMode.GameData.ProfileIDsTeam2.Count > 0 && (teamNr == 1 || teamNr == -1))
{
if (next == true)
{
idPlayer2++;
if (idPlayer2 >= _PartyMode.GameData.ProfileIDsTeam2.Count)
{
idPlayer2 = 0;
}
}
else
{
idPlayer2 = _GetRamdom(_PartyMode.GameData.ProfileIDsTeam2.Count - 1);
}
idPlayer2 = _GetTeamPlayer(idPlayer2, _PartyMode.GameData.ProfileIDsTeam2.Count, next);
_PartyMode.GameData.Rounds[_PartyMode.GameData.FieldNr].SingerTeam2 = idPlayer2;
}
_UpdatePlayerInformation();
}
private int _GetTeamPlayer(int idPlayer, int teamCount, bool next)
{
if (next)
{
idPlayer++;
if (idPlayer >= _PartyMode.GameData.ProfileIDsTeam1.Count)
{
idPlayer = 0;
}
}
else
{
idPlayer = _GetRamdom(_PartyMode.GameData.ProfileIDsTeam1.Count - 1);
}
return idPlayer;
}
private void _UpdatePlayerInformation()
{
_Texts[_TextNextPlayerT1].Visible = true;