Deleted uncommented stuff (watch line count!)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1272 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 4 insertions, 527 deletions

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 656471db..fc21f684 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -46,56 +46,28 @@ type
 
       StaticP1:           integer;
       TextP1:             integer;
-      {StaticP1ScoreBG:    integer;
-      TextP1Score:        integer;}
-
-      {//moveable singbar mod
-      StaticP1SingBar:         integer;
-      StaticP1ThreePSingBar:   integer;
-      StaticP1TwoPSingBar:     integer;
-      StaticP2RSingBar:        integer;
-      StaticP2MSingBar:        integer;
-      StaticP3SingBar:         integer;
-      //eoa moveable singbar }
-
-      //Added for ps3 skin
+
       //shown when game is in 2/4 player modus
       StaticP1TwoP:           integer;
       TextP1TwoP:             integer;
 
-      {StaticP1TwoPScoreBG:    integer;
-      TextP1TwoPScore:        integer;}
       //shown when game is in 3/6 player modus
       StaticP1ThreeP:           integer;
       TextP1ThreeP:             integer;
 
-      {TextP1ThreePScore:        integer;
-      StaticP1ThreePScoreBG:    integer;  }
-      //eoa
-
       StaticP2R:          integer;
       TextP2R:            integer;
 
-      {StaticP2RScoreBG:   integer;
-      TextP2RScore:       integer;}
-
       StaticP2M:          integer;
       TextP2M:            integer;
 
-      {StaticP2MScoreBG:   integer;
-      TextP2MScore:       integer; }
-
       StaticP3R:          integer;
       TextP3R:            integer;
 
-      {StaticP3RScoreBG:   integer;
-      TextP3RScore:       integer;}
       StaticPausePopup:   integer;
 
       Tex_Background:     TTexture;
       FadeOut:            boolean;
-      //LyricMain:          TLyric;
-      //LyricSub:           TLyric;
       Lyrics:             TLyricEngine;
 
       //Score Manager:
@@ -254,8 +226,8 @@ begin
   inherited Create;
 
   fShowVisualization := false;
-  fCurrentVideoPlaybackEngine := VideoPlayback;
 
+  fCurrentVideoPlaybackEngine := VideoPlayback;
 
   //Create Score Class
   Scores := TSingScores.Create;
@@ -271,56 +243,31 @@ begin
   StaticP1              := AddStatic(Theme.Sing.StaticP1);
   TextP1                := AddText(Theme.Sing.TextP1);
 
-  {StaticP1ScoreBG       := AddStatic(Theme.Sing.StaticP1ScoreBG);
-  TextP1Score           := AddText(Theme.Sing.TextP1Score);
-  StaticP1SingBar       := AddStatic(Theme.Sing.StaticP1SingBar);}
-
 // 2 or 4 players | P1
   StaticP1TwoP          := AddStatic(Theme.Sing.StaticP1TwoP);
   TextP1TwoP            := AddText(Theme.Sing.TextP1TwoP);
 
-  {StaticP1TwoPScoreBG   := AddStatic(Theme.Sing.StaticP1TwoPScoreBG);
-  TextP1TwoPScore       := AddText(Theme.Sing.TextP1TwoPScore);
-  StaticP1TwoPSingBar   := AddStatic(Theme.Sing.StaticP2RSingBar);}
-
   //              | P2
   StaticP2R             := AddStatic(Theme.Sing.StaticP2R);
   TextP2R               := AddText(Theme.Sing.TextP2R);
 
-  {StaticP2RScoreBG      := AddStatic(Theme.Sing.StaticP2RScoreBG);
-  TextP2RScore          := AddText(Theme.Sing.TextP2RScore);
-  StaticP2RSingBar      := AddStatic(Theme.Sing.StaticP2RSingBar); }
-
-// 3 or 6 players | P1
+  // 3 or 6 players | P1
   StaticP1ThreeP        := AddStatic(Theme.Sing.StaticP1ThreeP);
   TextP1ThreeP          := AddText(Theme.Sing.TextP1ThreeP);
 
-  {StaticP1ThreePScoreBG := AddStatic(Theme.Sing.StaticP1ThreePScoreBG);
-  TextP1ThreePScore     := AddText(Theme.Sing.TextP1ThreePScore);
-  StaticP1ThreePSingBar := AddStatic(Theme.Sing.StaticP1ThreePSingBar);}
-
   //              | P2
   StaticP2M             := AddStatic(Theme.Sing.StaticP2M);
   TextP2M               := AddText(Theme.Sing.TextP2M);
 
-  {StaticP2MScoreBG      := AddStatic(Theme.Sing.StaticP2MScoreBG);
-  TextP2MScore          := AddText(Theme.Sing.TextP2MScore);
-  StaticP2MSingBar      := AddStatic(Theme.Sing.StaticP2MSingBar);}
-
   //              | P3
   StaticP3R             := AddStatic(Theme.Sing.StaticP3R);
   TextP3R               := AddText(Theme.Sing.TextP3R);
 
-  {StaticP3RScoreBG      := AddStatic(Theme.Sing.StaticP3RScoreBG);
-  TextP3RScore          := AddText(Theme.Sing.TextP3RScore);
-  StaticP3SingBar       := AddStatic(Theme.Sing.StaticP3SingBar);}
-
   StaticPausePopup      := AddStatic(Theme.Sing.PausePopUp);
   Static[StaticPausePopup].Visible := false; //Pausepopup is not visibile at the beginning
 
   if ScreenAct = 2 then begin
-      // katze und affe
-
+      //TODO:why is this here?
     end;
 
   Lyrics := TLyricEngine.Create(80,Skin_LyricsT,640,12,80,Skin_LyricsT+36,640,12);
@@ -363,8 +310,6 @@ begin
 
   Scores.Init; //Get Positions for Players
 
-
-
   // prepare players
   SetLength(Player, PlayersPlay);
   //Player[0].ScoreTotalInt := 0;
@@ -417,42 +362,27 @@ begin
   Static[StaticP1].Visible              := V1;
   Text[TextP1].Visible                  := V1;
 
-  {Static[StaticP1ScoreBG].Visible       := V1;
-  Text[TextP1Score].Visible             := V1;}
-
 
   //This one is shown in 2/4P mode
   Static[StaticP1TwoP].Visible          := V1TwoP;
   Text[TextP1TwoP].Visible              := V1TwoP;
 
-  {Static[StaticP1TwoPScoreBG].Visible   := V1TwoP;
-  Text[TextP1TwoPScore].Visible         := V1TwoP;}
-
   Static[StaticP2R].Visible             := V2R;
   Text[TextP2R].Visible                 := V2R;
 
-  {Static[StaticP2RScoreBG].Visible      := V2R;
-  Text[TextP2RScore].Visible            := V2R;  }
-
 
   //This one is shown in 3/6P mode
   Static[StaticP1ThreeP].Visible        := V1ThreeP;
   Text[TextP1ThreeP].Visible            := V1ThreeP;
 
-  {Static[StaticP1ThreePScoreBG].Visible := V1ThreeP;
-  Text[TextP1ThreePScore].Visible       := V1ThreeP; }
 
   Static[StaticP2M].Visible             := V2M;
   Text[TextP2M].Visible                 := V2M;
 
-  {Static[StaticP2MScoreBG].Visible      := V2M;
-  Text[TextP2MScore].Visible            := V2M; }
 
   Static[StaticP3R].Visible             := V3R;
   Text[TextP3R].Visible                 := V3R;
 
-  {Static[StaticP3RScoreBG].Visible      := V3R;
-  Text[TextP3RScore].Visible            := V3R; }
 
   // FIXME: sets Path and Filename to ''
   ResetSingTemp;
@@ -482,8 +412,6 @@ begin
     Exit;
   end;
 
-
-
   // reset video playback engine, to play video clip...
   fCurrentVideoPlaybackEngine.Close;
   fCurrentVideoPlaybackEngine := VideoPlayback;
@@ -558,47 +486,9 @@ begin
         Lyrics.LineColor_act.G := 163/256;
         Lyrics.LineColor_act.B := 210/256;
         Lyrics.LineColor_act.A := 1;
-
-        {
-        LyricSub.FontStyle := 0;
-        LyricMain.Size := 14; // 13
-        LyricSub.Size := 14; // 13
-        LyricMain.ColR := Skin_FontR;
-        LyricMain.ColG := Skin_FontG;
-        LyricMain.ColB := Skin_FontB; //Change für Crazy Joker
-        }
-        {
-        LyricMain.ColSR := Skin_FontHighlightR;
-        LyricMain.ColSG := Skin_FontHighlightG;
-        LyricMain.ColSB := Skin_FontHighlightB;
-        }{
-        LyricMain.ColSR := 5/255; //26
-        LyricMain.ColSG := 163/255; //165
-        LyricMain.ColSB := 210/255;  //220
-
-        LyricSub.ColR := 0.4; //0.6
-        LyricSub.ColG := 0.4; //0.6
-        LyricSub.ColB := 0.4; //0.6
-        }
       end;
     1:
       begin
-        {
-        LyricMain.FontStyle := 2;
-        LyricSub.FontStyle := 2;
-        LyricMain.Size := 14;
-        LyricSub.Size := 14;
-        LyricMain.ColR := 0.75;
-        LyricMain.ColG := 0.75;
-        LyricMain.ColB := 1;
-        LyricMain.ColSR := 0.5;
-        LyricMain.ColSG := 0.5;
-        LyricMain.ColSB := 1;
-        LyricSub.ColR := 0.8;
-        LyricSub.ColG := 0.8;
-        LyricSub.ColB := 0.8;
-        }
-
         Lyrics.UpperLineSize := 14;
         Lyrics.LowerLineSize := 14;
         Lyrics.FontStyle := 2;
@@ -638,20 +528,6 @@ begin
         Lyrics.LineColor_act.G := 0.5;
         Lyrics.LineColor_act.B := 1;
         Lyrics.LineColor_act.A := 1;
-        {
-        LyricSub.FontStyle := 3;
-        LyricMain.Size := 12;
-        LyricSub.Size := 12;
-        LyricMain.ColR := 0.75;
-        LyricMain.ColG := 0.75;
-        LyricMain.ColB := 1;
-        LyricMain.ColSR := 0.5;
-        LyricMain.ColSG := 0.5;
-        LyricMain.ColSB := 1;
-        LyricSub.ColR := 0.8;
-        LyricSub.ColG := 0.8;
-        LyricSub.ColB := 0.8;
-        }
       end;
   end; // case
 
@@ -668,239 +544,6 @@ begin
   // Kill all stars not killed yet (GoldenStarsTwinkle Mod)
   GoldenRec.SentenceChange;
 
-  {//Set Position of Line Bonus - Line Bonus start
-  if (Ini.LineBonus = 1) then //Show Line Bonus at Scores
-  begin
-  Case PlayersPlay of
-    1: begin
-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1ScoreBG.x;
-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1Score.Y;
-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1ScoreBG.x;
-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1Score.Y + 65;
-    end;
-
-    2: begin
-      //P1
-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1TwoPScoreBG.x;
-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1TwoPScore.Y;
-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1TwoPScoreBG.X;
-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1TwoPScore.Y + 65;
-
-      //P2
-      Player[1].LineBonus_TargetX := Theme.Sing.StaticP2RScoreBG.X;
-      Player[1].LineBonus_TargetY := Theme.Sing.TextP2RScore.Y;
-      Player[1].LineBonus_StartX  := Theme.Sing.StaticP2RScoreBG.X;
-      Player[1].LineBonus_StartY  := Theme.Sing.TextP2RScore.Y + 65;
-    end;
-
-    3: begin
-      //P1
-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1ThreePScoreBG.x;
-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1ThreePScore.Y;
-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1ThreePScoreBG.x;
-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1ThreePScore.Y + 65;
-
-      //P2
-      Player[1].LineBonus_TargetX := Theme.Sing.StaticP2MScoreBG.x;
-      Player[1].LineBonus_TargetY := Theme.Sing.TextP2MScore.Y;
-      Player[1].LineBonus_StartX  := Theme.Sing.StaticP2MScoreBG.x;
-      Player[1].LineBonus_StartY  := Theme.Sing.TextP2MScore.Y + 65;
-
-      //P3
-      Player[2].LineBonus_TargetX := Theme.Sing.StaticP3RScoreBG.x;
-      Player[2].LineBonus_TargetY := Theme.Sing.TextP3RScore.Y;
-      Player[2].LineBonus_StartX  := Theme.Sing.StaticP3RScoreBG.x;
-      Player[2].LineBonus_StartY  := Theme.Sing.TextP3RScore.Y + 65;
-    end;
-
-    4: begin
-      //P1
-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1TwoPScoreBG.x;
-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1TwoPScore.Y;
-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1TwoPScoreBG.x;
-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1TwoPScore.Y + 65;
-
-      //P2
-      Player[1].LineBonus_TargetX := Theme.Sing.StaticP2RScoreBG.x;
-      Player[1].LineBonus_TargetY := Theme.Sing.TextP2RScore.Y;
-      Player[1].LineBonus_StartX  := Theme.Sing.StaticP2RScoreBG.x;
-      Player[1].LineBonus_StartY  := Theme.Sing.TextP2RScore.Y + 65;
-
-      //P3
-      Player[2].LineBonus_TargetX := Theme.Sing.StaticP1TwoPScoreBG.x;
-      Player[2].LineBonus_TargetY := Theme.Sing.TextP1TwoPScore.Y;
-      Player[2].LineBonus_StartX  := Theme.Sing.StaticP1TwoPScoreBG.x;
-      Player[2].LineBonus_StartY  := Theme.Sing.TextP1TwoPScore.Y + 65;
-
-      //P4
-      Player[3].LineBonus_TargetX := Theme.Sing.StaticP2RScoreBG.x;
-      Player[3].LineBonus_TargetY := Theme.Sing.TextP2RScore.Y;
-      Player[3].LineBonus_StartX  := Theme.Sing.StaticP2RScoreBG.x;
-      Player[3].LineBonus_StartY  := Theme.Sing.TextP2RScore.Y + 65;
-    end;
-
-    6: begin
-      //P1
-      Player[0].LineBonus_TargetX := Theme.Sing.StaticP1ThreePScoreBG.x;
-      Player[0].LineBonus_TargetY := Theme.Sing.TextP1ThreePScore.Y;
-      Player[0].LineBonus_StartX  := Theme.Sing.StaticP1ThreePScoreBG.x;
-      Player[0].LineBonus_StartY  := Theme.Sing.TextP1ThreePScore.Y + 65;
-
-      //P2
-      Player[1].LineBonus_TargetX := Theme.Sing.StaticP2MScoreBG.x;
-      Player[1].LineBonus_TargetY := Theme.Sing.TextP2MScore.Y;
-      Player[1].LineBonus_StartX  := Theme.Sing.StaticP2MScoreBG.x;
-      Player[1].LineBonus_StartY  := Theme.Sing.TextP2MScore.Y + 65;
-
-      //P3
-      Player[2].LineBonus_TargetX := Theme.Sing.StaticP3RScoreBG.x;
-      Player[2].LineBonus_TargetY := Theme.Sing.TextP3RScore.Y;
-      Player[2].LineBonus_StartX  := Theme.Sing.StaticP3RScoreBG.x;
-      Player[2].LineBonus_StartY  := Theme.Sing.TextP3RScore.Y + 65;
-
-      //P4
-      Player[3].LineBonus_TargetX := Theme.Sing.StaticP1ThreePScoreBG.x;
-      Player[3].LineBonus_TargetY := Theme.Sing.TextP1ThreePScore.Y;
-      Player[3].LineBonus_StartX  := Theme.Sing.StaticP1ThreePScoreBG.x;
-      Player[3].LineBonus_StartY  := Theme.Sing.TextP1ThreePScore.Y + 65;
-
-      //P5
-      Player[4].LineBonus_TargetX := Theme.Sing.StaticP2MScoreBG.x;
-      Player[4].LineBonus_TargetY := Theme.Sing.TextP2MScore.Y;
-      Player[4].LineBonus_StartX  := Theme.Sing.StaticP2MScoreBG.x;
-      Player[4].LineBonus_StartY  := Theme.Sing.TextP2MScore.Y + 65;
-
-      //P6
-      Player[5].LineBonus_TargetX := Theme.Sing.StaticP3RScoreBG.x;
-      Player[5].LineBonus_TargetY := Theme.Sing.TextP3RScore.Y;
-      Player[5].LineBonus_StartX  := Theme.Sing.StaticP3RScoreBG.x;
-      Player[5].LineBonus_StartY  := Theme.Sing.TextP3RScore.Y + 65;
-    end;
-  end;
-  end
-  else if (Ini.LineBonus = 2) then //Show Line Bonus at Notes
-  begin
-
-  // positions
-  if Ini.SingWindow = 0 then begin
-    NR.Left := 120;
-  end else begin
-    NR.Left := 20;
-  end;
-  NR.Right := 780;
-
-  NR.Width := NR.Right - NR.Left;
-  NR.WMid := NR.Width / 2;
-  NR.Mid := NR.Left + NR.WMid;
-
-  Case PlayersPlay of
-    1: begin
-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_TargetY := Skin_P2_NotesB - 105 - 65;
-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_StartY  := Skin_P2_NotesB - 105;
-    end;
-
-    2: begin
-      //P1
-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_TargetY := Skin_P1_NotesB - 105 - 65 + 28;
-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_StartY  := Skin_P1_NotesB - 105 + 28;
-
-      //P2
-      Player[1].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[1].LineBonus_TargetY := Skin_P2_NotesB - 105 - 65 + 28;
-      Player[1].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[1].LineBonus_StartY  := Skin_P2_NotesB - 105 + 28;
-    end;
-
-    3: begin
-      //P1
-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_TargetY := 120 - 65 + 28;
-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_StartY  := 120 + 28;
-
-      //P2
-      Player[1].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[1].LineBonus_TargetY := 245 - 65 + 28;
-      Player[1].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[1].LineBonus_StartY  := 245 + 28;
-
-      //P3
-      Player[2].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[2].LineBonus_TargetY := 370 - 65 + 28;
-      Player[2].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[2].LineBonus_StartY  := 370 + 28;
-    end;
-
-    4: begin
-      //P1
-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_TargetY := Skin_P1_NotesB - 105 - 65 + 28;
-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_StartY  := Skin_P1_NotesB - 105 + 28;
-
-      //P2
-      Player[1].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[1].LineBonus_TargetY := Skin_P2_NotesB - 105 - 65 + 28;
-      Player[1].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[1].LineBonus_StartY  := Skin_P2_NotesB - 105 + 28;
-
-      //P3
-      Player[2].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[2].LineBonus_TargetY := Skin_P1_NotesB - 105 - 65 + 28;
-      Player[2].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[2].LineBonus_StartY  := Skin_P1_NotesB - 105 + 28;
-
-      //P4
-      Player[3].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[3].LineBonus_TargetY := Skin_P2_NotesB - 105 - 65 + 28;
-      Player[3].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[3].LineBonus_StartY  := Skin_P2_NotesB - 105 + 28;
-    end;
-
-    6: begin
-      //P1
-      Player[0].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_TargetY := 120 - 65 + 28;
-      Player[0].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[0].LineBonus_StartY  := 120 + 28;
-
-      //P2
-      Player[1].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[1].LineBonus_TargetY := 245 - 65 + 28;
-      Player[1].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[1].LineBonus_StartY  := 245 + 28;
-
-      //P3
-      Player[2].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[2].LineBonus_TargetY := 370 - 65 + 28;
-      Player[2].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[2].LineBonus_StartY  := 370 + 28;
-
-      //P4
-      Player[3].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[3].LineBonus_TargetY := 120 - 65 + 28;
-      Player[3].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[3].LineBonus_StartY  := 120 + 28;
-
-      //P5
-      Player[4].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[4].LineBonus_TargetY := 245 - 65 + 28;
-      Player[4].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[4].LineBonus_StartY  := 245 + 28;
-
-      //P6
-      Player[5].LineBonus_TargetX := Round(Nr.Right + 10*ScreenX - 100);
-      Player[5].LineBonus_TargetY := 370 - 65 + 28;
-      Player[5].LineBonus_StartX  := Round(Nr.Right + 10*ScreenX - 100);
-      Player[5].LineBonus_StartY  := 370 + 28;
-    end;
-  end;
-  end; }
-  
   // set Position of Line Bonus - Line Bonus end
   // set number of empty sentences for Line Bonus
   NumEmptySentences := 0;
@@ -932,71 +575,7 @@ var
   T:      integer;
   CurLyricsTime: real;
 begin
-  // ScoreBG Mod
-  // TODO: remove this commented out section as we do not need it anymore.
-  //  We use colorized png's now. Set player colors does nothing than changing
-  //  the colors of the statics which will lead to ugly effects on colorized pngs
-  {
-  if PlayersPlay = 4 then begin
-    if ScreenAct = 1 then begin
-      LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,
-      Static[StaticP1TwoP].Texture.ColB, 'P1Dark');
-      LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,
-      Static[StaticP2R].Texture.ColB, 'P2Dark');
-
-      LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,
-      Static[StaticP1TwoPScoreBG].Texture.ColB, 'P1Dark');
-      LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,
-      Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');
-    end;
-    if ScreenAct = 2 then begin
-      LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,
-        Static[StaticP1TwoP].Texture.ColB, 'P3Dark');
-      LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,
-        Static[StaticP2R].Texture.ColB, 'P4Dark');
-
-      LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,
-        Static[StaticP1TwoPScoreBG].Texture.ColB, 'P3Dark');
-      LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,
-        Static[StaticP2RScoreBG].Texture.ColB, 'P4Dark');
-     end;
-  end;
 
-  if PlayersPlay = 6 then begin
-    if ScreenAct = 1 then begin
-     LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,
-        Static[StaticP1ThreeP].Texture.ColB, 'P1Dark');
-      LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,
-        Static[StaticP2R].Texture.ColB, 'P2Dark');
-      LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,
-        Static[StaticP3R].Texture.ColB, 'P3Dark');
-
-      LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,
-        Static[StaticP1ThreePScoreBG].Texture.ColB, 'P1Dark');
-      LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,
-       Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');
-      LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,
-        Static[StaticP3RScoreBG].Texture.ColB, 'P3Dark');
-    end;
-    if ScreenAct = 2 then begin
-
-      LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,
-        Static[StaticP1ThreeP].Texture.ColB, 'P4Dark');
-     LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,
-        Static[StaticP2R].Texture.ColB, 'P5Dark');
-      LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,
-        Static[StaticP3R].Texture.ColB, 'P6Dark');
-
-
-     LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,
-       Static[StaticP1ThreePScoreBG].Texture.ColB, 'P4Dark');
-     LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,
-        Static[StaticP2RScoreBG].Texture.ColB, 'P5Dark');
-      LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,
-        Static[StaticP3RScoreBG].Texture.ColB, 'P6Dark');
-    end;
-  end;
- }
 
   // set player names (for 2 screens and only Singstar skin)
   if ScreenAct = 1 then begin
@@ -1010,20 +589,6 @@ begin
 
   if ScreenAct = 2 then begin
     case PlayersPlay of
-      {
-        1:  begin
-              Text[TextP1].Text := 'P2';
-            end;
-        2:  begin
-              Text[TextP1].Text := 'P3';
-              Text[TextP2R].Text := 'P4';
-            end;
-        3:  begin
-              Text[TextP1].Text := 'P4';
-              Text[TextP2M].Text := 'P5';
-              Text[TextP3R].Text := 'P6';
-            end;
-      }
       4:  begin
             Text[TextP1TwoP].Text   := 'P3';
             Text[TextP2R].Text      := 'P4';
@@ -1082,87 +647,6 @@ begin
   if Sec < 10 then Text[TextTimeText].Text := Text[TextTimeText].Text + '0';
   Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Sec);
 
-  {// .. and scores
-  if PlayersPlay = 1 then begin
-    Tekst := IntToStr(Player[0].ScoreTotalI);
-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-    Text[TextP1Score].Text := Tekst;
-  end;
-
-  if PlayersPlay = 2 then begin
-    Tekst := IntToStr(Player[0].ScoreTotalI);
-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-    Text[TextP1TwoPScore].Text := Tekst;
-
-    Tekst := IntToStr(Player[1].ScoreTotalI);
-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-    Text[TextP2RScore].Text := Tekst;
-  end;
-
-  if PlayersPlay = 3 then begin
-    Tekst := IntToStr(Player[0].ScoreTotalI);
-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-    Text[TextP1ThreePScore].Text := Tekst;
-
-    Tekst := IntToStr(Player[1].ScoreTotalI);
-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-    Text[TextP2MScore].Text := Tekst;
-
-    Tekst := IntToStr(Player[2].ScoreTotalI);
-    while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-    Text[TextP3RScore].Text := Tekst;
-  end;
-
-  if PlayersPlay = 4 then begin
-    if ScreenAct = 1 then begin
-      Tekst := IntToStr(Player[0].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1TwoPScore].Text := Tekst;
-
-      Tekst := IntToStr(Player[1].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP2RScore].Text := Tekst;
-    end;
-    if ScreenAct = 2 then begin
-      Tekst := IntToStr(Player[2].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1TwoPScore].Text := Tekst;
-
-      Tekst := IntToStr(Player[3].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP2RScore].Text := Tekst;
-    end;
-  end;
-
-  if PlayersPlay = 6 then begin
-    if ScreenAct = 1 then begin
-      Tekst := IntToStr(Player[0].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1ThreePScore].Text := Tekst;
-
-      Tekst := IntToStr(Player[1].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP2MScore].Text := Tekst;
-
-      Tekst := IntToStr(Player[2].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP3RScore].Text := Tekst;
-    end;
-    if ScreenAct = 2 then begin
-      Tekst := IntToStr(Player[3].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1ThreePScore].Text := Tekst;
-
-      Tekst := IntToStr(Player[4].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP2MScore].Text := Tekst;
-
-      Tekst := IntToStr(Player[5].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP3RScore].Text := Tekst;
-    end;
-  end;  }
-
   // draw static menu (BG)
   // Note: there is no menu and the animated background brakes the video playback
   //DrawBG;
@@ -1226,16 +710,9 @@ begin
   Static[StaticP1].Texture.X         := Static[StaticP1].Texture.X - 10*ScreenX;
   Text[TextP1].X                     := Text[TextP1].X - 10*ScreenX;
 
-  {Static[StaticP1ScoreBG].Texture.X  := Static[StaticP1ScoreBG].Texture.X - 10*ScreenX;
-  Text[TextP1Score].X                := Text[TextP1Score].X - 10*ScreenX;}
-
-
   Static[StaticP2R].Texture.X        := Static[StaticP2R].Texture.X - 10*ScreenX;
   Text[TextP2R].X                    := Text[TextP2R].X - 10*ScreenX;
 
-  {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X - 10*ScreenX;
-  Text[TextP2RScore].X               := Text[TextP2RScore].X - 10*ScreenX;}
-
   //end of weird
 
   Static[1].Texture.X := Static[1].Texture.X - 10*ScreenX;