Preparation for namestyle fixing: fixed ambiguous name

VocaluxeLib/Menu/CMenu.cs

@@ -463,9 +463,9 @@ namespace VocaluxeLib.Menu
             return new CStatic(_PartyModeID);
         }
 
-        public CStatic GetNewStatic(CStatic Static)
+        public CStatic GetNewStatic(CStatic oldStatic)
         {
-            return new CStatic(Static);
+            return new CStatic(oldStatic);
         }
 
         public CStatic GetNewStatic(STexture Texture, SColorF Color, SRectF Rect)
@@ -1962,22 +1962,22 @@ namespace VocaluxeLib.Menu
             }
         }
 
-        private bool CheckVersion(int Version, CXMLReader xmlReader)
+        private bool CheckVersion(int reqVersion, CXMLReader xmlReader)
         {
-            int version = 0;
-            xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref version);
+            int actualVersion = 0;
+            xmlReader.TryGetIntValue("//root/" + ThemeName + "/ScreenVersion", ref actualVersion);
 
-            if (version == Version)
+            if (actualVersion == reqVersion)
                 return true;
             else
             {
                 string msg = "Can't load screen file of screen \"" + ThemeName + "\", ";
-                if (version < Version)
+                if (actualVersion < reqVersion)
                     msg += "the file ist outdated! ";
                 else
                     msg += "the file is for newer program versions! ";
 
-                msg += "Current screen version is " + Version.ToString();
+                msg += "Current screen version is " + reqVersion.ToString();
                 CBase.Log.LogError(msg);
             }
             return false;

VocaluxeLib/Menu/IMenu.cs

@@ -810,17 +810,17 @@ namespace VocaluxeLib.Menu
     {
         private readonly SPlayer[,] _Rounds;
 
-        public CPoints(int NumRounds, SPlayer[] Player)
+        public CPoints(int NumRounds, SPlayer[] Players)
         {
-            _Rounds = new SPlayer[NumRounds,Player.Length];
+            _Rounds = new SPlayer[NumRounds,Players.Length];
 
             for (int round = 0; round < NumRounds; round++)
             {
-                for (int player = 0; player < Player.Length; player++)
+                for (int player = 0; player < Players.Length; player++)
                 {
-                    _Rounds[round, player].ProfileID = Player[player].ProfileID;
-                    _Rounds[round, player].Name = Player[player].Name;
-                    _Rounds[round, player].Difficulty = Player[player].Difficulty;
+                    _Rounds[round, player].ProfileID = Players[player].ProfileID;
+                    _Rounds[round, player].Name = Players[player].Name;
+                    _Rounds[round, player].Difficulty = Players[player].Difficulty;
                     _Rounds[round, player].Points = 0f;
                     _Rounds[round, player].PointsGoldenNotes = 0f;
                     _Rounds[round, player].PointsLineBonus = 0f;
@@ -832,21 +832,21 @@ namespace VocaluxeLib.Menu
             }
         }
 
-        public void SetPoints(int Round, int SongID, SPlayer[] Player, bool Medley, bool Duet, bool ShortSong)
+        public void SetPoints(int Round, int SongID, SPlayer[] Players, bool Medley, bool Duet, bool ShortSong)
         {
             long DateTicks = DateTime.Now.Ticks;
-            for (int player = 0; player < Player.Length; player++)
+            for (int player = 0; player < Players.Length; player++)
             {
                 _Rounds[Round, player].SongID = SongID;
-                _Rounds[Round, player].LineNr = Player[player].LineNr;
-                _Rounds[Round, player].Points = Player[player].Points;
-                _Rounds[Round, player].PointsGoldenNotes = Player[player].PointsGoldenNotes;
-                _Rounds[Round, player].PointsLineBonus = Player[player].PointsLineBonus;
+                _Rounds[Round, player].LineNr = Players[player].LineNr;
+                _Rounds[Round, player].Points = Players[player].Points;
+                _Rounds[Round, player].PointsGoldenNotes = Players[player].PointsGoldenNotes;
+                _Rounds[Round, player].PointsLineBonus = Players[player].PointsLineBonus;
                 _Rounds[Round, player].Medley = Medley;
                 _Rounds[Round, player].Duet = Duet;
                 _Rounds[Round, player].ShortSong = ShortSong;
                 _Rounds[Round, player].DateTicks = DateTicks;
-                _Rounds[Round, player].SongFinished = Player[player].SongFinished;
+                _Rounds[Round, player].SongFinished = Players[player].SongFinished;
             }
         }
 

VocaluxeLib/Menu/SingNotes/CSingNotes.cs

@@ -674,7 +674,7 @@ namespace VocaluxeLib.Menu.SingNotes
         {
             int TonePlayer = CBase.Record.GetToneAbs(_PlayerNotes[n].PlayerNr);
 
-            SRectF Rect = _PlayerNotes[n].Rect;
+            SRectF noteBounds = _PlayerNotes[n].Rect;
 
             while (TonePlayer - BaseLine < 0)
                 TonePlayer += 12;
@@ -685,16 +685,16 @@ namespace VocaluxeLib.Menu.SingNotes
             if (XOffset < 0f)
                 XOffset = 0f;
 
-            if (XOffset > Rect.W)
-                XOffset = Rect.W;
+            if (XOffset > noteBounds.W)
+                XOffset = noteBounds.W;
 
-            float dy = Rect.H / CBase.Settings.GetNumNoteLines();
-            SRectF rect = new SRectF(
-                Rect.X - dy + XOffset,
-                Rect.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
+            float dy = noteBounds.H / CBase.Settings.GetNumNoteLines();
+            SRectF drawRect = new SRectF(
+                noteBounds.X - dy + XOffset,
+                noteBounds.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
                 dy,
                 dy,
-                Rect.Z
+                noteBounds.Z
                 );
 
             SColorF color = new SColorF(
@@ -704,7 +704,7 @@ namespace VocaluxeLib.Menu.SingNotes
                 _PlayerNotes[n].Color.A * _PlayerNotes[n].Alpha);
 
             STexture ToneHelper = CBase.Theme.GetSkinTexture(_Theme.SkinToneHelperName, _PartyModeID);
-            CBase.Drawing.DrawTexture(ToneHelper, rect, color);
+            CBase.Drawing.DrawTexture(ToneHelper, drawRect, color);
 
 
             while (TonePlayer - BaseLine < 12)
@@ -713,15 +713,15 @@ namespace VocaluxeLib.Menu.SingNotes
             while (TonePlayer - BaseLine > 24)
                 TonePlayer -= 12;
 
-            rect = new SRectF(
-                Rect.X - dy + XOffset,
-                Rect.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
+            drawRect = new SRectF(
+                noteBounds.X - dy + XOffset,
+                noteBounds.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f),
                 dy,
                 dy,
-                Rect.Z
+                noteBounds.Z
                 );
 
-            CBase.Drawing.DrawTexture(ToneHelper, rect, color);
+            CBase.Drawing.DrawTexture(ToneHelper, drawRect, color);
         }
 
         #region ThemeEdit