cosmetic changes, no code change

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

1 files changed, 227 insertions, 164 deletions

diff --git a/src/base/UDraw.pas b/src/base/UDraw.pas
index 97b526c5..d5891182 100644
--- a/src/base/UDraw.pas
+++ b/src/base/UDraw.pas
@@ -67,7 +67,6 @@ type
     WMid:   real;
     Height: real;
     HMid:   real;
-
     Mid:    real;
   end;
 
@@ -75,11 +74,11 @@ var
   NotesW:   real;
   NotesH:   real;
   Starfr:   integer;
-  StarfrG:   integer;
+  StarfrG:  integer;
 
   //SingBar
-  TickOld: cardinal;
-  TickOld2:cardinal;
+  TickOld:  cardinal;
+  TickOld2: cardinal;
 
 implementation
 
@@ -103,10 +102,11 @@ uses
 
 procedure SingDrawBackground;
 var
-  Rec:      TRecR;
-  TexRec:   TRecR;
+  Rec:    TRecR;
+  TexRec: TRecR;
 begin
-  if (ScreenSing.Tex_Background.TexNum > 0) then begin
+  if (ScreenSing.Tex_Background.TexNum > 0) then
+  begin
 
   glClearColor (1, 1, 1, 1);
   glColor4f (1, 1, 1, 1);
@@ -182,16 +182,17 @@ end;
 procedure SingDrawOscilloscope(X, Y, W, H: real; NrSound: integer);
 var
   SampleIndex: integer;
-  Sound: TCaptureBuffer;
-  MaxX, MaxY: real;
+  Sound:       TCaptureBuffer;
+  MaxX, MaxY:  real;
 begin;
   Sound := AudioInputProcessor.Sound[NrSound];
 
   //  Log.LogStatus('Oscilloscope', 'SingDraw');
   glColor3f(Skin_OscR, Skin_OscG, Skin_OscB);
-  {if (ParamStr(1) = '-black') or (ParamStr(1) = '-fsblack') then
-    glColor3f(1, 1, 1);  }
-
+{
+  if (ParamStr(1) = '-black') or (ParamStr(1) = '-fsblack') then
+    glColor3f(1, 1, 1);
+}
   MaxX := W-1;
   MaxY := (H-1) / 2;
 
@@ -212,12 +213,13 @@ end;
 
 procedure SingDrawNoteLines(Left, Top, Right: real; Space: integer);
 var
-  Count:    integer;
+  Count: integer;
 begin
   glEnable(GL_BLEND);
   glColor4f(Skin_P1_LinesR, Skin_P1_LinesG, Skin_P1_LinesB, 0.4);
   glBegin(GL_LINES);
-  for Count := 0 to 9 do begin
+  for Count := 0 to 9 do
+  begin
     glVertex2f(Left,  Top + Count * Space);
     glVertex2f(Right, Top + Count * Space);
   end;
@@ -227,13 +229,14 @@ end;
 
 procedure SingDrawBeatDelimeters(Left, Top, Right: real; NrLines: integer);
 var
-  Count:    integer;
-  TempR:  real;
+  Count: integer;
+  TempR: real;
 begin
   TempR := (Right-Left) / (Lines[NrLines].Line[Lines[NrLines].Current].End_ - Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start);
   glEnable(GL_BLEND);
   glBegin(GL_LINES);
-  for Count := Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start to Lines[NrLines].Line[Lines[NrLines].Current].End_ do begin
+  for Count := Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start to Lines[NrLines].Line[Lines[NrLines].Current].End_ do
+  begin
     if (Count mod Lines[NrLines].Resolution) = Lines[NrLines].NotesGAP then
       glColor4f(0, 0, 0, 1)
     else
@@ -248,16 +251,15 @@ end;
 // draw blank Notebars
 procedure SingDrawLine(Left, Top, Right: real; NrLines: integer; Space: integer);
 var
-  Rec:      TRecR;
-  Count:    integer;
-  TempR:    real;
+  Rec:   TRecR;
+  Count: integer;
+  TempR: real;
 
-  PlayerNumber: Integer;
+  PlayerNumber:  integer;
 
-  GoldenStarPos : real;
+  GoldenStarPos: real;
   
-  lTmpA ,
-  lTmpB : real;
+  lTmpA, lTmpB : real;
 begin
 // We actually don't have a playernumber in this procedure, it should reside in NrLines - but it's always set to zero
 // So we exploit this behavior a bit - we give NrLines the playernumber, keep it in playernumber - and then we set NrLines to zero
@@ -277,8 +279,7 @@ begin
   lTmpA := (Right-Left);
   lTmpB := (Lines[NrLines].Line[Lines[NrLines].Current].End_ - Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start);
 
-  if ( lTmpA > 0 ) AND
-     ( lTmpB > 0 ) THEN
+  if ( lTmpA > 0 ) and ( lTmpB > 0 ) then
   begin
     TempR := lTmpA / lTmpB;
   end
@@ -288,12 +289,14 @@ begin
   end;
 
   
-  with Lines[NrLines].Line[Lines[NrLines].Current] do begin
-    for Count := 0 to HighNote do begin
-      with Note[Count] do begin
-        if NoteType <> ntFreestyle then begin
-
-
+  with Lines[NrLines].Line[Lines[NrLines].Current] do
+  begin
+    for Count := 0 to HighNote do
+    begin
+      with Note[Count] do
+      begin
+        if NoteType <> ntFreestyle then
+	begin
           if Ini.EffectSing = 0 then
           // If Golden note Effect of then Change not Color
           begin
@@ -370,14 +373,16 @@ var
   TempR:      real;
   Rec:        TRecR;
   N:          integer;
-  //R, G, B, A: real;
+//  R, G, B, A: real;
   NotesH2:    real;
 begin
   //Log.LogStatus('Player notes', 'SingDraw');
-
-  //if NrGracza = 0 then LoadColor(R, G, B, 'P1Light')
-  //else LoadColor(R, G, B, 'P2Light');
-
+{
+  if NrGracza = 0 then
+    LoadColor(R, G, B, 'P1Light')
+  else 
+    LoadColor(R, G, B, 'P2Light');
+}
   //R := 71/255;
   //G := 175/255;
   //B := 247/255;
@@ -482,14 +487,12 @@ end;
 //draw Note glow
 procedure SingDrawPlayerBGLine(Left, Top, Right: real; NrLines, PlayerIndex: integer; Space: integer);
 var
-  Rec:      TRecR;
-  Count:      integer;
-  TempR:    real;
+  Rec:            TRecR;
+  Count:          integer;
+  TempR:          real;
   X1, X2, X3, X4: real;
-  W, H:     real;
-  
-  lTmpA  ,
-  lTmpB  : real;
+  W, H:           real;
+  lTmpA, lTmpB:   real;
 begin
   if (Player[PlayerIndex].ScoreTotalInt >= 0) then
   begin
@@ -501,8 +504,7 @@ begin
     lTmpA := (Right-Left);
     lTmpB := (Lines[NrLines].Line[Lines[NrLines].Current].End_ - Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start);
 
-    if ( lTmpA > 0 ) and
-       ( lTmpB > 0 ) then
+    if ( lTmpA > 0 ) and ( lTmpB > 0 ) then
     begin
       TempR := lTmpA / lTmpB;
     end
@@ -710,7 +712,8 @@ begin
     SingDrawNoteLines(Nr.Left + 10*ScreenX, Skin_P2_NotesB - 105, Nr.Right + 10*ScreenX, 15);
   end;
 
-  if ((PlayersPlay = 3) or (PlayersPlay = 6)) and (Ini.NoteLines = 1) then begin
+  if ((PlayersPlay = 3) or (PlayersPlay = 6)) and (Ini.NoteLines = 1) then
+  begin
     SingDrawNoteLines(Nr.Left + 10*ScreenX, 120, Nr.Right + 10*ScreenX, 12);
     SingDrawNoteLines(Nr.Left + 10*ScreenX, 245, Nr.Right + 10*ScreenX, 12);
     SingDrawNoteLines(Nr.Left + 10*ScreenX, 370, Nr.Right + 10*ScreenX, 12);
@@ -721,39 +724,48 @@ begin
   SingDrawLyricHelper(NR.Left, NR.WMid);
 
   // oscilloscope
-  if Ini.Oscilloscope = 1 then begin
+  if Ini.Oscilloscope = 1 then
+  begin
     if PlayersPlay = 1 then
       SingDrawOscilloscope(190 + 10*ScreenX, 55, 180, 40, 0);
 
-    if PlayersPlay = 2 then begin
+    if PlayersPlay = 2 then
+    begin
       SingDrawOscilloscope(190 + 10*ScreenX, 55, 180, 40, 0);
       SingDrawOscilloscope(425 + 10*ScreenX, 55, 180, 40, 1);
     end;
 
-    if PlayersPlay = 4 then begin
-      if ScreenAct = 1 then begin
+    if PlayersPlay = 4 then
+    begin
+      if ScreenAct = 1 then
+      begin
         SingDrawOscilloscope(190 + 10*ScreenX, 55, 180, 40, 0);
         SingDrawOscilloscope(425 + 10*ScreenX, 55, 180, 40, 1);
       end;
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         SingDrawOscilloscope(190 + 10*ScreenX, 55, 180, 40, 2);
         SingDrawOscilloscope(425 + 10*ScreenX, 55, 180, 40, 3);
       end;
     end;
 
-    if PlayersPlay = 3 then begin
+    if PlayersPlay = 3 then
+    begin
       SingDrawOscilloscope(75 + 10*ScreenX, 95, 100, 20, 0);
       SingDrawOscilloscope(370 + 10*ScreenX, 95, 100, 20, 1);
       SingDrawOscilloscope(670 + 10*ScreenX, 95, 100, 20, 2);
     end;
 
-    if PlayersPlay = 6 then begin
-      if ScreenAct = 1 then begin
+    if PlayersPlay = 6 then
+    begin
+      if ScreenAct = 1 then
+      begin
         SingDrawOscilloscope( 75 + 10*ScreenX, 95, 100, 20, 0);
         SingDrawOscilloscope(370 + 10*ScreenX, 95, 100, 20, 1);
         SingDrawOscilloscope(670 + 10*ScreenX, 95, 100, 20, 2);
       end;
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         SingDrawOscilloscope( 75 + 10*ScreenX, 95, 100, 20, 3);
         SingDrawOscilloscope(370 + 10*ScreenX, 95, 100, 20, 4);
         SingDrawOscilloscope(670 + 10*ScreenX, 95, 100, 20, 5);
@@ -782,13 +794,15 @@ begin
   end;
 
   // Draw the Notes
-  if PlayersPlay = 1 then begin
+  if PlayersPlay = 1 then
+  begin
     SingDrawPlayerBGLine(NR.Left + 20, Skin_P2_NotesB, NR.Right - 20, 0, 0, 15);  // Background glow    - colorized in playercolor
     SingDrawLine(NR.Left + 20, Skin_P2_NotesB, NR.Right - 20, 0, 15);             // Plain unsung notes - colorized in playercolor
     SingDrawPlayerLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Width - 40, 0, 15);       // imho the sung notes
   end;
 
-  if (PlayersPlay = 2)  then begin
+  if PlayersPlay = 2 then
+  begin
     SingDrawPlayerBGLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Right - 20, 0, 0, 15);
     SingDrawPlayerBGLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Right - 20, 0, 1, 15);
 
@@ -799,7 +813,8 @@ begin
     SingDrawPlayerLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Width - 40, 1, 15);
   end;
 
-  if PlayersPlay = 3 then begin
+  if PlayersPlay = 3 then
+  begin
     NotesW := NotesW * 0.8;
     NotesH := NotesH * 0.8;
 
@@ -816,67 +831,81 @@ begin
     SingDrawPlayerLine(Nr.Left + 20, 370+95, Nr.Width - 40, 2, 12);
   end;
 
-  if PlayersPlay = 4 then begin
-    if ScreenAct = 1 then begin
+  if PlayersPlay = 4 then
+  begin
+    if ScreenAct = 1 then
+    begin
       SingDrawPlayerBGLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Right - 20, 0, 0, 15);
       SingDrawPlayerBGLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Right - 20, 0, 1, 15);
     end;
-    if ScreenAct = 2 then begin
+    if ScreenAct = 2 then
+    begin
       SingDrawPlayerBGLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Right - 20, 0, 2, 15);
       SingDrawPlayerBGLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Right - 20, 0, 3, 15);
     end;
 
-    if ScreenAct = 1 then begin
+    if ScreenAct = 1 then
+    begin
       SingDrawLine(NR.Left + 20, Skin_P1_NotesB, NR.Right - 20, 0, 15);
       SingDrawLine(NR.Left + 20, Skin_P2_NotesB, NR.Right - 20, 1, 15);
     end;
-    if ScreenAct = 2 then begin
+    if ScreenAct = 2 then
+    begin
       SingDrawLine(NR.Left + 20, Skin_P1_NotesB, NR.Right - 20, 2, 15);
       SingDrawLine(NR.Left + 20, Skin_P2_NotesB, NR.Right - 20, 3, 15);
     end;
 
-    if ScreenAct = 1 then begin
+    if ScreenAct = 1 then
+    begin
       SingDrawPlayerLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Width - 40, 0, 15);
       SingDrawPlayerLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Width - 40, 1, 15);
     end;
-    if ScreenAct = 2 then begin
+    if ScreenAct = 2 then
+    begin
       SingDrawPlayerLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Width - 40, 2, 15);
       SingDrawPlayerLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Width - 40, 3, 15);
     end;
   end;
 
-  if PlayersPlay = 6 then begin
+  if PlayersPlay = 6 then
+  begin
     NotesW := NotesW * 0.8;
     NotesH := NotesH * 0.8;
 
-    if ScreenAct = 1 then begin
+    if ScreenAct = 1 then
+    begin
       SingDrawPlayerBGLine(Nr.Left + 20, 120+95, Nr.Right - 20, 0, 0, 12);
       SingDrawPlayerBGLine(Nr.Left + 20, 245+95, Nr.Right - 20, 0, 1, 12);
       SingDrawPlayerBGLine(Nr.Left + 20, 370+95, Nr.Right - 20, 0, 2, 12);
     end;
-    if ScreenAct = 2 then begin
+    if ScreenAct = 2 then
+    begin
       SingDrawPlayerBGLine(Nr.Left + 20, 120+95, Nr.Right - 20, 0, 3, 12);
       SingDrawPlayerBGLine(Nr.Left + 20, 245+95, Nr.Right - 20, 0, 4, 12);
       SingDrawPlayerBGLine(Nr.Left + 20, 370+95, Nr.Right - 20, 0, 5, 12);
     end;
 
-    if ScreenAct = 1 then begin
+    if ScreenAct = 1 then
+    begin
       SingDrawLine(NR.Left + 20, 120+95, NR.Right - 20, 0, 12);
       SingDrawLine(NR.Left + 20, 245+95, NR.Right - 20, 1, 12);
       SingDrawLine(NR.Left + 20, 370+95, NR.Right - 20, 2, 12);
     end;
-    if ScreenAct = 2 then begin
+    if ScreenAct = 2 then
+    begin
       SingDrawLine(NR.Left + 20, 120+95, NR.Right - 20, 3, 12);
       SingDrawLine(NR.Left + 20, 245+95, NR.Right - 20, 4, 12);
       SingDrawLine(NR.Left + 20, 370+95, NR.Right - 20, 5, 12);
     end;
 
-    if ScreenAct = 1 then begin
+    if ScreenAct = 1 then
+    begin
       SingDrawPlayerLine(Nr.Left + 20, 120+95, Nr.Width - 40, 0, 12);
       SingDrawPlayerLine(Nr.Left + 20, 245+95, Nr.Width - 40, 1, 12);
       SingDrawPlayerLine(Nr.Left + 20, 370+95, Nr.Width - 40, 2, 12);
     end;
-    if ScreenAct = 2 then begin
+    if ScreenAct = 2 then
+    begin
       SingDrawPlayerLine(Nr.Left + 20, 120+95, Nr.Width - 40, 3, 12);
       SingDrawPlayerLine(Nr.Left + 20, 245+95, Nr.Width - 40, 4, 12);
       SingDrawPlayerLine(Nr.Left + 20, 370+95, Nr.Width - 40, 5, 12);
@@ -892,9 +921,12 @@ var
   NR:       TRecR;
 begin
   // positions
-  if Ini.SingWindow = 0 then begin
+  if Ini.SingWindow = 0 then
+  begin
     NR.Left := 120;
-  end else begin
+  end
+  else 
+  begin
     NR.Left := 20;
   end;
 
@@ -910,12 +942,14 @@ begin
   begin
     if PlayersPlay = 1 then
       SingDrawNoteLines(Nr.Left + 10*ScreenX, Skin_P2_NotesB - 105, Nr.Right + 10*ScreenX, 15);
-    if (PlayersPlay = 2) or (PlayersPlay = 4) then begin
+    if (PlayersPlay = 2) or (PlayersPlay = 4) then
+    begin
       SingDrawNoteLines(Nr.Left + 10*ScreenX, Skin_P1_NotesB - 105, Nr.Right + 10*ScreenX, 15);
       SingDrawNoteLines(Nr.Left + 10*ScreenX, Skin_P2_NotesB - 105, Nr.Right + 10*ScreenX, 15);
     end;
 
-    if (PlayersPlay = 3) or (PlayersPlay = 6) then begin
+    if (PlayersPlay = 3) or (PlayersPlay = 6) then
+    begin
       SingDrawNoteLines(Nr.Left + 10*ScreenX, 120, Nr.Right + 10*ScreenX, 12);
       SingDrawNoteLines(Nr.Left + 10*ScreenX, 245, Nr.Right + 10*ScreenX, 12);
       SingDrawNoteLines(Nr.Left + 10*ScreenX, 370, Nr.Right + 10*ScreenX, 12);
@@ -927,26 +961,31 @@ begin
   // TODO: Lyrics helper
 
   // oscilloscope | the thing that moves when you yell into your mic (imho)
-  if (((Ini.Oscilloscope = 1) AND (DLLMan.Selected.ShowRateBar_O)) AND (NOT DLLMan.Selected.ShowRateBar)) then begin
+  if (((Ini.Oscilloscope = 1) AND (DLLMan.Selected.ShowRateBar_O)) AND (NOT DLLMan.Selected.ShowRateBar)) then 
+  begin
     if PlayersPlay = 1 then
       if PlayerInfo.Playerinfo[0].Enabled then
         SingDrawOscilloscope(190 + 10*ScreenX, 55, 180, 40, 0);
 
-    if PlayersPlay = 2 then begin
+    if PlayersPlay = 2 then
+    begin
       if PlayerInfo.Playerinfo[0].Enabled then
         SingDrawOscilloscope(190 + 10*ScreenX, 55, 180, 40, 0);
       if PlayerInfo.Playerinfo[1].Enabled then
         SingDrawOscilloscope(425 + 10*ScreenX, 55, 180, 40, 1);
     end;
 
-    if PlayersPlay = 4 then begin
-      if ScreenAct = 1 then begin
+    if PlayersPlay = 4 then
+    begin
+      if ScreenAct = 1 then
+      begin
         if PlayerInfo.Playerinfo[0].Enabled then
           SingDrawOscilloscope(190 + 10*ScreenX, 55, 180, 40, 0);
         if PlayerInfo.Playerinfo[1].Enabled then
           SingDrawOscilloscope(425 + 10*ScreenX, 55, 180, 40, 1);
       end;
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         if PlayerInfo.Playerinfo[2].Enabled then
           SingDrawOscilloscope(190 + 10*ScreenX, 55, 180, 40, 2);
         if PlayerInfo.Playerinfo[3].Enabled then
@@ -954,7 +993,8 @@ begin
       end;
     end;
 
-    if PlayersPlay = 3 then begin
+    if PlayersPlay = 3 then
+    begin
       if PlayerInfo.Playerinfo[0].Enabled then
         SingDrawOscilloscope(75 + 10*ScreenX, 95, 100, 20, 0);
       if PlayerInfo.Playerinfo[1].Enabled then
@@ -963,8 +1003,10 @@ begin
         SingDrawOscilloscope(670 + 10*ScreenX, 95, 100, 20, 2);
     end;
 
-    if PlayersPlay = 6 then begin
-      if ScreenAct = 1 then begin
+    if PlayersPlay = 6 then
+    begin
+      if ScreenAct = 1 then
+      begin
         if PlayerInfo.Playerinfo[0].Enabled then
           SingDrawOscilloscope( 75 + 10*ScreenX, 95, 100, 20, 0);
         if PlayerInfo.Playerinfo[1].Enabled then
@@ -972,7 +1014,8 @@ begin
         if PlayerInfo.Playerinfo[2].Enabled then
           SingDrawOscilloscope(670 + 10*ScreenX, 95, 100, 20, 2);
       end;
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         if PlayerInfo.Playerinfo[3].Enabled then
           SingDrawOscilloscope( 75 + 10*ScreenX, 95, 100, 20, 3);
         if PlayerInfo.Playerinfo[4].Enabled then
@@ -1003,15 +1046,17 @@ begin
       end;
   end;
 
-  if (DLLMAn.Selected.ShowNotes And DLLMan.Selected.LoadSong) then
+  if (DLLMAn.Selected.ShowNotes and DLLMan.Selected.LoadSong) then
   begin
-    if (PlayersPlay = 1) And PlayerInfo.Playerinfo[0].Enabled then begin
+    if (PlayersPlay = 1) and PlayerInfo.Playerinfo[0].Enabled then
+    begin
       SingDrawPlayerBGLine(NR.Left + 20, Skin_P2_NotesB, NR.Right - 20, 0, 0, 15);
       SingDrawLine(NR.Left + 20, Skin_P2_NotesB, NR.Right - 20, 0, 15);
       SingDrawPlayerLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Width - 40, 0, 15);
     end;
 
-    if (PlayersPlay = 2)  then begin
+    if PlayersPlay = 2 then
+    begin
       if PlayerInfo.Playerinfo[0].Enabled then
       begin
         SingDrawPlayerBGLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Right - 20, 0, 0, 15);
@@ -1027,7 +1072,8 @@ begin
 
     end;
 
-    if PlayersPlay = 3 then begin
+    if PlayersPlay = 3 then
+    begin
       NotesW := NotesW * 0.8;
       NotesH := NotesH * 0.8;
 
@@ -1053,12 +1099,15 @@ begin
       end;
     end;
 
-    if PlayersPlay = 4 then begin
-      if ScreenAct = 1 then begin
+    if PlayersPlay = 4 then
+    begin
+      if ScreenAct = 1 then
+      begin
         SingDrawPlayerBGLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Right - 20, 0, 0, 15);
         SingDrawPlayerBGLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Right - 20, 0, 1, 15);
       end;
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         SingDrawPlayerBGLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Right - 20, 0, 2, 15);
         SingDrawPlayerBGLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Right - 20, 0, 3, 15);
       end;
@@ -1066,26 +1115,31 @@ begin
       SingDrawLine(NR.Left + 20, Skin_P1_NotesB, NR.Right - 20, 0, 15);
       SingDrawLine(NR.Left + 20, Skin_P2_NotesB, NR.Right - 20, 0, 15);
 
-      if ScreenAct = 1 then begin
+      if ScreenAct = 1 then
+      begin
         SingDrawPlayerLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Width - 40, 0, 15);
         SingDrawPlayerLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Width - 40, 1, 15);
       end;
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         SingDrawPlayerLine(Nr.Left + 20, Skin_P1_NotesB, Nr.Width - 40, 2, 15);
         SingDrawPlayerLine(Nr.Left + 20, Skin_P2_NotesB, Nr.Width - 40, 3, 15);
       end;
     end;
 
-    if PlayersPlay = 6 then begin
+    if PlayersPlay = 6 then
+    begin
       NotesW := NotesW * 0.8;
       NotesH := NotesH * 0.8;
 
-      if ScreenAct = 1 then begin
+      if ScreenAct = 1 then
+      begin
         SingDrawPlayerBGLine(Nr.Left + 20, 120+95, Nr.Right - 20, 0, 0, 12);
         SingDrawPlayerBGLine(Nr.Left + 20, 245+95, Nr.Right - 20, 0, 1, 12);
         SingDrawPlayerBGLine(Nr.Left + 20, 370+95, Nr.Right - 20, 0, 2, 12);
       end;
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         SingDrawPlayerBGLine(Nr.Left + 20, 120+95, Nr.Right - 20, 0, 3, 12);
         SingDrawPlayerBGLine(Nr.Left + 20, 245+95, Nr.Right - 20, 0, 4, 12);
         SingDrawPlayerBGLine(Nr.Left + 20, 370+95, Nr.Right - 20, 0, 5, 12);
@@ -1095,12 +1149,14 @@ begin
       SingDrawLine(NR.Left + 20, 245+95, NR.Right - 20, 0, 12);
       SingDrawLine(NR.Left + 20, 370+95, NR.Right - 20, 0, 12);
 
-      if ScreenAct = 1 then begin
+      if ScreenAct = 1 then
+      begin
         SingDrawPlayerLine(Nr.Left + 20, 120+95, Nr.Width - 40, 0, 12);
         SingDrawPlayerLine(Nr.Left + 20, 245+95, Nr.Width - 40, 1, 12);
         SingDrawPlayerLine(Nr.Left + 20, 370+95, Nr.Width - 40, 2, 12);
       end;
-      if ScreenAct = 2 then begin
+      if ScreenAct = 2 then
+      begin
         SingDrawPlayerLine(Nr.Left + 20, 120+95, Nr.Width - 40, 3, 12);
         SingDrawPlayerLine(Nr.Left + 20, 245+95, Nr.Width - 40, 4, 12);
         SingDrawPlayerLine(Nr.Left + 20, 370+95, Nr.Width - 40, 5, 12);
@@ -1116,11 +1172,11 @@ end;
 {//SingBar Mod
 procedure SingDrawSingbar(X, Y, W, H: real; Percent: integer);
 var
-  R:   Real;
-  G:   Real;
-  B:   Real;
-  A:   cardinal;
-  I:   Integer;
+  R: real;
+  G: real;
+  B: real;
+  A: cardinal;
+  I: integer;
 
 begin;
 
@@ -1195,98 +1251,105 @@ end;
 //end Singbar Mod
 
 //PhrasenBonus - Line Bonus Pop Up
-procedure SingDrawLineBonus( const X, Y: Single; Color: TRGB; Alpha: Single; Text: string; Age: Integer);
+procedure SingDrawLineBonus( const X, Y: Single; Color: TRGB; Alpha: Single; Text: string; Age: integer);
 var
-Length, X2: Real; //Length of Text
-Size: Integer;    //Size of Popup
-begin
-if Alpha <> 0 then
+  Length, X2: real; //Length of Text
+  Size: integer;    //Size of Popup
 begin
+  if Alpha <> 0 then
+  begin
 
 //Set Font Propertys
-SetFontStyle(2); //Font: Outlined1
-if Age < 5 then SetFontSize((Age + 1) * 3) else SetFontSize(18);
-SetFontItalic(False);
+    SetFontStyle(2); //Font: Outlined1
+    if Age < 5 then
+      SetFontSize((Age + 1) * 3)
+    else
+      SetFontSize(18);
+    SetFontItalic(False);
 
 //Check Font Size
-Length := glTextWidth (Text) + 3; //Little Space for a Better Look ^^
+    Length := glTextWidth (Text) + 3; //Little Space for a Better Look ^^
 
 //Text
-SetFontPos (X + 50 - (Length / 2), Y + 12); //Position
+    SetFontPos (X + 50 - (Length / 2), Y + 12); //Position
 
 
-if Age < 5 then Size := Age * 10 else Size := 50;
+    if Age < 5 then
+      Size := Age * 10
+    else
+      Size := 50;
 
-  //Draw  Background
-  //glColor4f(Color.R, Color.G, Color.B, Alpha); //Set Color
-  glColor4f(1, 1, 1, Alpha);
+//Draw  Background
+//    glColor4f(Color.R, Color.G, Color.B, Alpha); //Set Color
+    glColor4f(1, 1, 1, Alpha);
 
 
-  glEnable(GL_TEXTURE_2D);
-  glEnable(GL_BLEND);
-  //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_BLEND);
+//    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-  //New Method, Not Variable
-  glBindTexture(GL_TEXTURE_2D, Tex_SingLineBonusBack[2].TexNum);
 
-  glBegin(GL_QUADS);
-    glTexCoord2f(0, 0); glVertex2f(X + 50 - Size, Y + 25 - (Size/2));
-    glTexCoord2f(0, 1); glVertex2f(X + 50 - Size, Y + 25 + (Size/2));
-    glTexCoord2f(1, 1); glVertex2f(X + 50 + Size, Y + 25 + (Size/2));
-    glTexCoord2f(1, 0); glVertex2f(X + 50 + Size, Y + 25 - (Size/2));
-  glEnd;
+//New Method, Not Variable
+    glBindTexture(GL_TEXTURE_2D, Tex_SingLineBonusBack[2].TexNum);
 
-  glColor4f(1, 1, 1, Alpha); //Set Color
-  //Draw Text
-  glPrint (Text);
-end;
+    glBegin(GL_QUADS);
+      glTexCoord2f(0, 0); glVertex2f(X + 50 - Size, Y + 25 - (Size/2));
+      glTexCoord2f(0, 1); glVertex2f(X + 50 - Size, Y + 25 + (Size/2));
+      glTexCoord2f(1, 1); glVertex2f(X + 50 + Size, Y + 25 + (Size/2));
+      glTexCoord2f(1, 0); glVertex2f(X + 50 + Size, Y + 25 - (Size/2));
+    glEnd;
+
+    glColor4f(1, 1, 1, Alpha); //Set Color
+//Draw Text
+    glPrint (Text);
+  end;
 end;
 //PhrasenBonus - Line Bonus Mod}
 
 // Draw Note Bars for Editor
-//There are 11 Resons for a new Procdedure:   (nice binary :D )
+// There are 11 Resons for a new Procdedure:   (nice binary :D )
 // 1. It don't look good when you Draw the Golden Note Star Effect in the Editor
 // 2. You can see the Freestyle Notes in the Editor SemiTransparent
 // 3. Its easier and Faster then changing the old Procedure
 procedure EditDrawLine(Left, Top, Right: real; NrLines: integer; Space: integer);
 var
-  Rec:      TRecR;
-  Count:      integer;
-  TempR:    real;
+  Rec:   TRecR;
+  Count: integer;
+  TempR: real;
 begin
   glColor3f(1, 1, 1);
   glEnable(GL_TEXTURE_2D);
   glEnable(GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   TempR := (Right-Left) / (Lines[NrLines].Line[Lines[NrLines].Current].End_ - Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start);
-  with Lines[NrLines].Line[Lines[NrLines].Current] do begin
-    for Count := 0 to HighNote do begin
-      with Note[Count] do begin
-
-          // Golden Note Patch
-          case NoteType of
-            ntFreestyle: glColor4f(1, 1, 1, 0.35);
-            ntNormal: glColor4f(1, 1, 1, 0.85);
-            ntGolden: Glcolor4f(1, 1, 0.3, 0.85);
-          end; // case
-
+  with Lines[NrLines].Line[Lines[NrLines].Current] do
+  begin
+    for Count := 0 to HighNote do
+    begin
+      with Note[Count] do
+      begin
 
+        // Golden Note Patch
+        case NoteType of
+          ntFreestyle: glColor4f(1, 1, 1, 0.35);
+          ntNormal: glColor4f(1, 1, 1, 0.85);
+          ntGolden: Glcolor4f(1, 1, 0.3, 0.85);
+        end; // case
 
-          // left part
-          Rec.Left := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX;
-          Rec.Right := Rec.Left + NotesW;
-          Rec.Top := Top - (Tone-BaseNote)*Space/2 - NotesH;
-          Rec.Bottom := Rec.Top + 2 * NotesH;
-          glBindTexture(GL_TEXTURE_2D, Tex_Left[Color].TexNum);
-          glBegin(GL_QUADS);
-            glTexCoord2f(0, 0); glVertex2f(Rec.Left,  Rec.Top);
-            glTexCoord2f(0, 1); glVertex2f(Rec.Left,  Rec.Bottom);
-            glTexCoord2f(1, 1); glVertex2f(Rec.Right, Rec.Bottom);
-            glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
-          glEnd;
+        // left part
+        Rec.Left := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX;
+        Rec.Right := Rec.Left + NotesW;
+        Rec.Top := Top - (Tone-BaseNote)*Space/2 - NotesH;
+        Rec.Bottom := Rec.Top + 2 * NotesH;
+        glBindTexture(GL_TEXTURE_2D, Tex_Left[Color].TexNum);
+        glBegin(GL_QUADS);
+          glTexCoord2f(0, 0); glVertex2f(Rec.Left,  Rec.Top);
+          glTexCoord2f(0, 1); glVertex2f(Rec.Left,  Rec.Bottom);
+          glTexCoord2f(1, 1); glVertex2f(Rec.Right, Rec.Bottom);
+          glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
+        glEnd;
 
-         // middle part
+        // middle part
         Rec.Left := Rec.Right;
         Rec.Right := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - NotesW - 0.5 + 10*ScreenX;
 
@@ -1320,7 +1383,7 @@ end;
 
 procedure SingDrawTimeBar();
 var
-  x,y:            real;
+  x, y:           real;
   width, height:  real;
   LyricsProgress: real;
   CurLyricsTime:  real;