- new option "PossibleScore": show max possible score in singscreen (toggle on/off with "S")

- fade the "ball" also
- fixed screensong preview volume
- update of acinerella

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2565 b956fd51-792f-4845-bead-9b4dfca2ff2c

5 files changed, 159 insertions, 43 deletions

diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas
index 0d0a710b..8fe6a85e 100644
--- a/Game/Code/Classes/UDraw.pas
+++ b/Game/Code/Classes/UDraw.pas
@@ -41,7 +41,7 @@ procedure SingDrawStar(X, Y, A: real);
 procedure SingGoldenStar(X, Y, A: real);

 }

 // The Singbar

-procedure SingDrawSingbar(X, Y, W, H: real; Percent: integer);

+procedure SingDrawSingbar(X, Y, W, H: real; Percent: integer; ScoreMax: integer);

 

 //Phrasen Bonus - Line Bonus

 procedure SingDrawLineBonus( const X, Y: Single; Color: TRGB; Alpha: Single; Text: string; Age: Integer);

@@ -773,23 +773,23 @@ begin
     if PlayersPlay = 1 then

     begin

       //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP1SingBar.x, Theme.Sing.StaticP1SingBar.y, Theme.Sing.StaticP1SingBar.w, Theme.Sing.StaticP1SingBar.h , Player[0].ScorePercent);

+      SingDrawSingbar(Theme.Sing.StaticP1SingBar.x, Theme.Sing.StaticP1SingBar.y, Theme.Sing.StaticP1SingBar.w, Theme.Sing.StaticP1SingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

    end;

     if PlayersPlay = 2 then

     begin

       //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

       //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent);

+      SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

+      SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent, Player[1].ScoreMax);

    end;

     if PlayersPlay = 3 then

     begin

       //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

       //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent);

       //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[0].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent);

+      SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

+      SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent, Player[1].ScoreMax);

+      SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent, Player[2].ScoreMax);

     end;

     if PlayersPlay = 4 then

     begin

@@ -797,15 +797,15 @@ begin
       begin

       //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

       //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent);

+      SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

+      SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent, Player[1].ScoreMax);

       end;

       if ScreenAct = 2 then

       begin

       //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent);

       //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[3].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[2].ScorePercent);

-      SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[3].ScorePercent);

+      SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[2].ScorePercent, Player[2].ScoreMax);

+      SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[3].ScorePercent, Player[3].ScoreMax);

       end;

     end;

     if PlayersPlay = 6 then

@@ -815,18 +815,18 @@ begin
         //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

         //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent);

         //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[0].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent);

+        SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

+        SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent, Player[1].ScoreMax);

+        SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent, Player[2].ScoreMax);

      end;

       if ScreenAct = 2 then

       begin

         //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[3].ScorePercent);

         //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[4].ScorePercent);

         //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[5].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[3].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[4].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[5].ScorePercent);

+        SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[3].ScorePercent, Player[3].ScoreMax);

+        SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[4].ScorePercent, Player[4].ScoreMax);

+        SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[5].ScorePercent, Player[5].ScoreMax);

       end;

     end;

   end;

@@ -1312,67 +1312,67 @@ begin
     if PlayersPlay = 1 then begin

       if PlayerInfo.Playerinfo[0].Enabled then

         //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP1SingBar.x, Theme.Sing.StaticP1SingBar.y, Theme.Sing.StaticP1SingBar.w, Theme.Sing.StaticP1SingBar.h , Player[0].ScorePercent);

+        SingDrawSingbar(Theme.Sing.StaticP1SingBar.x, Theme.Sing.StaticP1SingBar.y, Theme.Sing.StaticP1SingBar.w, Theme.Sing.StaticP1SingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

    end;

     if PlayersPlay = 2 then begin

       if PlayerInfo.Playerinfo[0].Enabled then

         //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent);

+        SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

       if PlayerInfo.Playerinfo[1].Enabled then

         //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent);

+        SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent, Player[1].ScoreMax);

    end;

     if PlayersPlay = 3 then begin

       if PlayerInfo.Playerinfo[0].Enabled then

         //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[0].ScorePercent);

+        SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

       if PlayerInfo.Playerinfo[1].Enabled then

         //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent);

+        SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent, Player[1].ScoreMax);

       if PlayerInfo.Playerinfo[2].Enabled then

         //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent);

-        SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent);

+        SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent, Player[2].ScoreMax);

     end;

     if PlayersPlay = 4 then begin

       if ScreenAct = 1 then begin

         if PlayerInfo.Playerinfo[0].Enabled then

           //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

         if PlayerInfo.Playerinfo[1].Enabled then

           //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[1].ScorePercent, Player[1].ScoreMax);

       end;

       if ScreenAct = 2 then begin

         if PlayerInfo.Playerinfo[2].Enabled then

           //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[2].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP1TwoPSingBar.x, Theme.Sing.StaticP1TwoPSingBar.y, Theme.Sing.StaticP1TwoPSingBar.w, Theme.Sing.StaticP1TwoPSingBar.h , Player[2].ScorePercent, Player[2].ScoreMax);

         if PlayerInfo.Playerinfo[3].Enabled then

           //SingDrawSingbar(620 + 10*ScreenX, 95, 100, 8, Player[3].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[3].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP2RSingBar.x, Theme.Sing.StaticP2RSingBar.y, Theme.Sing.StaticP2RSingBar.w, Theme.Sing.StaticP2RSingBar.h , Player[3].ScorePercent, Player[3].ScoreMax);

       end;

     end;

     if PlayersPlay = 6 then begin

       if ScreenAct = 1 then begin

         if PlayerInfo.Playerinfo[0].Enabled then

           //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[0].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[0].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[0].ScorePercent, Player[0].ScoreMax);

         if PlayerInfo.Playerinfo[1].Enabled then

           //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[1].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[1].ScorePercent, Player[1].ScoreMax);

         if PlayerInfo.Playerinfo[2].Enabled then

           //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[2].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[2].ScorePercent, Player[2].ScoreMax);

       end;

       if ScreenAct = 2 then begin

         if PlayerInfo.Playerinfo[3].Enabled then

           //SingDrawSingbar( 75 + 10*ScreenX, 95, 100, 8, Player[3].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[3].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP1ThreePSingBar.x, Theme.Sing.StaticP1ThreePSingBar.y, Theme.Sing.StaticP1ThreePSingBar.w, Theme.Sing.StaticP1ThreePSingBar.h , Player[3].ScorePercent, Player[3].ScoreMax);

         if PlayerInfo.Playerinfo[4].Enabled then

           //SingDrawSingbar(370 + 10*ScreenX, 95, 100, 8, Player[4].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[4].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP2MSingBar.x, Theme.Sing.StaticP2MSingBar.y, Theme.Sing.StaticP2MSingBar.w, Theme.Sing.StaticP2MSingBar.h , Player[4].ScorePercent, Player[4].ScoreMax);

         if PlayerInfo.Playerinfo[5].Enabled then

           //SingDrawSingbar(670 + 10*ScreenX, 95, 100, 8, Player[5].ScorePercent);

-          SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[5].ScorePercent);

+          SingDrawSingbar(Theme.Sing.StaticP3SingBar.x, Theme.Sing.StaticP3SingBar.y, Theme.Sing.StaticP3SingBar.w, Theme.Sing.StaticP3SingBar.h , Player[5].ScorePercent, Player[5].ScoreMax);

       end;

     end;

   end;

@@ -1596,12 +1596,13 @@ end;
 

 

 //SingBar Mod

-procedure SingDrawSingbar(X, Y, W, H: real; Percent: integer);

+procedure SingDrawSingbar(X, Y, W, H: real; Percent: integer; ScoreMax: integer);

 var

   R:   Real;

   G:   Real;

   B:   Real;

-

+  str: string;

+  wd:  real;

 begin;

 

    //SingBar Background

@@ -1674,6 +1675,31 @@ begin;
     glTexCoord2f(1, 1); glVertex2f(X+W, Y+H);

     glTexCoord2f(1, 0); glVertex2f(X+W, Y);

   glEnd;

+

+  if (Ini.PossibleScore=0) then

+    Exit;

+    

+  //possible score Front

+  glColor4f(1, 1, 1, 0.8);

+  glEnable(GL_TEXTURE_2D);

+  glEnable(GL_BLEND);

+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

+  glBindTexture(GL_TEXTURE_2D, Tex_SingBar_Back.TexNum);

+  glBegin(GL_QUADS);

+    glTexCoord2f(0, 0); glVertex2f(X, Y+H);

+    glTexCoord2f(0, 1); glVertex2f(X, Y+H*3);

+    glTexCoord2f(1, 1); glVertex2f(X+W, Y+H*3);

+    glTexCoord2f(1, 0); glVertex2f(X+W, Y+H);

+  glEnd;

+

+  glColor4f(0, 0, 0, 1);

+  SetFontStyle(1);

+  SetFontItalic(false);
+  SetFontSize(H*0.7);
+  str := 'max: ' + IntToStr(ScoreMax);
+  wd := glTextWidth(PChar(str));
+  SetFontPos (X+W/2-wd/2, Y+H);
+  glPrint(PChar(str));

 end;

 //end Singbar Mod

 

diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas
index ecf2cbc8..242fe092 100644
--- a/Game/Code/Classes/UFiles.pas
+++ b/Game/Code/Classes/UFiles.pas
@@ -1368,10 +1368,13 @@ begin
       for note := 0 to Length(Czesci[pl].Czesc[line].Nuta) - 1 do

       begin

         if Czesci[pl].Czesc[line].Nuta[note].Start < start then      //check start

-          Czesci[pl].Czesc[line].Nuta[note].FreeStyle := true

-        else if Czesci[pl].Czesc[line].Nuta[note].Start>= end_ then  //check end

         begin

           Czesci[pl].Czesc[line].Nuta[note].FreeStyle := true;

+          Czesci[pl].Czesc[line].Nuta[note].Wartosc := 0;

+        end else if Czesci[pl].Czesc[line].Nuta[note].Start>= end_ then  //check end

+        begin

+          Czesci[pl].Czesc[line].Nuta[note].FreeStyle := true;

+          Czesci[pl].Czesc[line].Nuta[note].Wartosc := 0;

           if not foundcut[pl] then

           begin

             if (note=0) then

@@ -1396,7 +1399,8 @@ begin
     if (foundcut[pl]) and (Length(Czesci[pl].Czesc)>cut_line[pl]) then

     begin

       SetLength(Czesci[pl].Czesc, cut_line[pl]);

-      Czesci[pl].high := cut_line[pl]-1;

+      Czesci[pl].High := cut_line[pl]-1;

+      Czesci[pl].Ilosc := Czesci[pl].High+1;

     end;

   end;

 end;

diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas
index cc24e3a8..6e2f1b16 100644
--- a/Game/Code/Classes/UIni.pas
+++ b/Game/Code/Classes/UIni.pas
@@ -82,6 +82,7 @@ type
     PartyPopup:     integer;

     SumPlayers:     integer;

     DuelRatio:      integer;

+    PossibleScore:  integer;

 

     // Soundcards

     SoundCard:      array[0..7, 1..2] of integer;

@@ -169,13 +170,14 @@ const
   // Advanced

   ILoadAnimation: array[0..1] of string = ('Off', 'On');

   IEffectSing:    array[0..1] of string = ('Off', 'On');

-  IScreenFade:    array [0..1] of String =('Off', 'On');

+  IScreenFade:    array[0..1] of String =('Off', 'On');

   IAskbeforeDel:  array[0..1] of string = ('Off', 'On');

   IOnSongClick:   array[0..2] of string = ('Sing', 'Select Players', 'Open Menu');

   ILineBonus:     array[0..2] of string = ('Off', 'At Score', 'At Notes');

   IPartyPopup:    array[0..1] of string = ('Off', 'On');

   ISumPlayers:    array[0..2] of string = ('Never', 'Dynamic', 'Always');

   IDuelRatio:     array[0..9] of string = ('normal', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%');

+  IPossibleScore: array[0..1] of string = ('Off', 'On');

 

   IChannel:       array[0..6] of string = ('Off', '1', '2', '3', '4', '5', '6');

 

@@ -604,6 +606,11 @@ begin
   for Pet := 0 to High(IDuelRatio) do

     if Tekst = IDuelRatio[Pet] then Ini.DuelRatio := Pet;

 

+  // PossibleScore

+  Tekst := IniFile.ReadString('Advanced', 'PossibleScore', IPossibleScore[0]);

+  for Pet := 0 to High(IPossibleScore) do

+    if Tekst = IPossibleScore[Pet] then Ini.PossibleScore := Pet;

+

   // SongPath

   if (Params.SongPath <> '') then

     SongPath := IncludeTrailingPathDelimiter(Params.SongPath)

@@ -831,6 +838,10 @@ begin
     Tekst := IDuelRatio[Ini.DuelRatio];

     IniFile.WriteString('Advanced', 'DuelRatio', Tekst);

 

+    //PossibleScore

+    Tekst := IPossibleScore[Ini.PossibleScore];

+    IniFile.WriteString('Advanced', 'PossibleScore', Tekst);

+

     IniFile.Free;

   end;

 end;

diff --git a/Game/Code/Classes/ULyrics.pas b/Game/Code/Classes/ULyrics.pas
index c6a5e635..0b301260 100644
--- a/Game/Code/Classes/ULyrics.pas
+++ b/Game/Code/Classes/ULyrics.pas
@@ -316,7 +316,8 @@ begin
       end;

     3: // slide

       begin

-        for W := 0 to High(Word) do begin

+        for W := 0 to High(Word) do

+        begin

           if not Word[W].Selected then

             DrawNormal(W)

           else

@@ -329,12 +330,13 @@ begin
           DrawNormal(W);

 

         for W := 0 to High(Word) do

-          if Word[W].Selected then begin

+          if Word[W].Selected then

+          begin

             Tex_Ball.X := (Word[W].X - 10) + Word[W].Done * Word[W].Width;

             Tex_Ball.Y := YR -12 - 10*sin(Word[W].Done * pi);

             Tex_Ball.W := 20;

             Tex_Ball.H := 20;

-            DrawTexture(Tex_Ball);

+            DrawTexture(Tex_Ball, Alpha);

           end;

       end;

   end; // case

diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index c2497f32..a1df643e 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -26,6 +26,8 @@ type
     ScorePercentTarget:  integer;//Target Fillstate of the SingBar

     //end Singbar Mod

 

+    ScoreMax:     integer; //max possible score (actual)

+

     //PhrasenBonus - Line Bonus Mod

     LineBonus_PosX:     Single;

     LineBonus_PosY:     Single;

@@ -112,7 +114,7 @@ function GetTimeFromBeat(Beat: integer): real;
 procedure ClearScores(PlayerNum: integer);

 

 implementation

-uses USongs, math, UCommandLine, UVideo;

+uses USongs, Math, UCommandLine, UVideo;

 

 procedure MainLoop;

 var

@@ -548,6 +550,9 @@ procedure NewNote(P: integer; Sender: TScreenSing);
 var

   CP:     integer; // current player

   S:      integer; // sentence

+  N:      integer;

+  SumN:   real;

+  NumS:   integer;

   SMin:   integer;

   SMax:   integer;

   SDet:   integer; // temporary: sentence of detected note

@@ -698,6 +703,39 @@ begin
           end;// else beep; // if S = SMax

         end; //for

       end; // if moze

+

+      //calc score last

+      SumN := 0;

+      NumS := 0;

+      for S := Czesci[P].Akt to Czesci[P].High do

+      begin

+        for N := 0 to Czesci[P].Czesc[S].HighNut do

+        begin

+          if (Czesci[P].Czesc[S].Nuta[N].Start+Czesci[P].Czesc[S].Nuta[N].Dlugosc

+            >= Czas.AktBeatD) then

+          begin

+            if (Ini.LineBonus = 0) then

+              // add points without LineBonus

+              SumN := SumN + 10000 / Czesci[P].Wartosc * Czesci[P].Czesc[S].Nuta[N].Wartosc *

+                Czesci[P].Czesc[S].Nuta[N].Dlugosc

+            else

+              // add points with Line Bonus

+              SumN := SumN + 9000 / Czesci[P].Wartosc * Czesci[P].Czesc[S].Nuta[N].Wartosc *

+                Czesci[P].Czesc[S].Nuta[N].Dlugosc;

+          end;

+        end;

+

+        if (Czesci[P].Czesc[S].TotalNotes>0) and

+          (Czesci[P].Czesc[S].Koniec > Czas.AktBeatD) then

+          Inc(NumS);

+      end;

+

+      N := (Czesci[P].Ilosc - ScreenSing.NumEmptySentences[P]);

+      if (N>0) and (Ini.LineBonus > 0) then

+        Player[CP].ScoreMax := Floor((SumN + NumS*1000 / N)/10)*10;

+

+      Player[CP].ScoreMax := Player[CP].ScoreTotalI + Player[CP].ScoreMax;

+

     end else

     begin     //############################ DUET #####################

       if (CP mod 2 = P) then

@@ -838,8 +876,41 @@ begin
           end;// else beep; // if S = SMax

         end; //for

       end; // if moze

+

+      //calc score last

+      SumN := 0;

+      NumS := 0;

+      for S := Czesci[P].Akt to Czesci[P].High do

+      begin

+        for N := 0 to Czesci[P].Czesc[S].HighNut do

+        begin

+          if (Czesci[P].Czesc[S].Nuta[N].Start+Czesci[P].Czesc[S].Nuta[N].Dlugosc

+            >=Czas.AktBeat) then

+          begin

+            if (Ini.LineBonus = 0) then

+              // add points without LineBonus

+              SumN := SumN + 10000 / Czesci[P].Wartosc * Czesci[P].Czesc[S].Nuta[N].Wartosc *

+                Czesci[P].Czesc[S].Nuta[N].Dlugosc

+            else

+              // add points with Line Bonus

+              SumN := SumN + 9000 / Czesci[P].Wartosc * Czesci[P].Czesc[S].Nuta[N].Wartosc *

+                Czesci[P].Czesc[S].Nuta[N].Dlugosc;

+          end;

+        end;

+

+        if (Czesci[P].Czesc[S].TotalNotes>0) and

+          (Czesci[P].Czesc[S].Koniec > Czas.AktBeatD) then

+          Inc(NumS);

+      end;

+

+      N := (Czesci[P].Ilosc - ScreenSing.NumEmptySentences[P]);

+      if (N>0) and (Ini.LineBonus > 0) then

+        Player[CP].ScoreMax := Floor((SumN + NumS*1000 / N)/10)*10;

+

+      Player[CP].ScoreMax := Player[CP].ScoreTotalI + Player[CP].ScoreMax;

       end; //if mod 2

     end;

+

   end; // for CP

 

   //On Sentence End -> For LineBonus + SingBar

@@ -871,6 +942,8 @@ begin
   Player[PlayerNum].ScorePercentTarget := 50;// Sets to 50% when song starts

   //end SingBar Mod

 

+  Player[PlayerNum].ScoreMax := 9990;

+

   //PhrasenBonus - Line Bonus Mod

   Player[PlayerNum].LineBonus_Visible := False; //Hide Line Bonus

   Player[PlayerNum].LineBonus_Alpha   := 0;