TicTacToe: Optimisation and code compliance

PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs

@@ -26,7 +26,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
 {
     // ReSharper disable UnusedMember.Global
     public class CPartyScreenTicTacToeConfig : CPartyScreenTicTacToe
-        // ReSharper restore UnusedMember.Global
+    // ReSharper restore UnusedMember.Global
     {
         // Version number for theme files. Increment it, if you've changed something on the theme files!
         protected override int _ScreenVersion
@@ -50,14 +50,14 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             base.Init();
 
             _ThemeSelectSlides = new string[] { _SelectSlideNumFields, _SelectSlideNumJokers, _SelectSlideRefillJokers, _SelectSlideSwitchPlayer };
-            _ThemeButtons = new string[] {_ButtonNext, _ButtonBack};
+            _ThemeButtons = new string[] { _ButtonNext, _ButtonBack };
         }
 
         public override bool HandleInput(SKeyEvent keyEvent)
         {
             base.HandleInput(keyEvent);
 
-            if (keyEvent.KeyPressed) {}
+            if (keyEvent.KeyPressed) { }
             else
             {
                 switch (keyEvent.Key)
@@ -135,10 +135,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             _SelectSlides[_SelectSlideNumFields].SelectedTag = _PartyMode.GameData.NumFields;
 
             _SelectSlides[_SelectSlideNumJockers].Clear();
-            _SelectSlides[_SelectSlideNumJockers].AddValue(0);
-            _SelectSlides[_SelectSlideNumJockers].AddValue(1);
-            _SelectSlides[_SelectSlideNumJockers].AddValue(2);
-            _SelectSlides[_SelectSlideNumJockers].AddValue(3);
+            for (int i = 0; i <= 3; i++)
+                _SelectSlides[_SelectSlideNumJockers].AddValue(i);
 
             _SelectSlides[_SelectSlideNumJockers].SelectedTag = _PartyMode.GameData.NumJockers;
 

PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs

@@ -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;

PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs

@@ -77,8 +77,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                 _PartyMode.GameData.ProfileIDsTeam1 = _TeamList[0];
                 _PartyMode.GameData.ProfileIDsTeam2 = _TeamList[1];
             }
-            _PartyMode.GameData.NumPlayerTeam1 = _PartyMode.GameData.ProfileIDsTeam1.Count();
-            _PartyMode.GameData.NumPlayerTeam2 = _PartyMode.GameData.ProfileIDsTeam2.Count();
+            _PartyMode.GameData.NumPlayerTeam1 = _PartyMode.GameData.ProfileIDsTeam1.Count;
+            _PartyMode.GameData.NumPlayerTeam2 = _PartyMode.GameData.ProfileIDsTeam2.Count;
 
             _PartyMode.Next();
         }