- fix: appearence of short notes in 4/6 player mode on one screen

- fix: playing notes in editor (esp. on high bpm)
- add: disable showning notes and scores in singscreen with N
- some other small corrections

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

3 files changed, 352 insertions, 290 deletions

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index ff1340de..fea240a3 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -2592,13 +2592,18 @@ var
   end_:   boolean;

 

   Window: TRectCoords;

-  Blend: real;

+  Blend:  real;

+

+  beat:   integer;

+  last:   integer;

 begin

   DrawStatics;

   end_ := false;

 

   glClearColor(1,1,1,1);

 

+  last := LastClick;

+

   PlayClick := false;

   if PlaySentenceMidi or PlaySentence then

   begin

@@ -2621,14 +2626,18 @@ begin
         end_ := false;

     end;

 

-    if AktBeat <> LastClick then

+    if AktBeat <> last then

     begin

+      for beat := LastClick+1 to AktBeat do

+      begin

+

+      PlayClick := false;

       for line := 0 to Length(Czesci[CP].Czesc) - 1 do

       begin

         for note := 0 to Length(Czesci[CP].Czesc[line].Nuta) - 1 do

         begin

           //line change

-          if (Czesci[CP].Czesc[line].Start = AktBeat) and (line <> Czesci[CP].Akt) and

+          if (Czesci[CP].Czesc[line].Start = beat) and (line <> Czesci[CP].Akt) and

             not end_ and not PlayOneSentence then

           begin

             Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[AktNuta[CP]].Color := 0;

@@ -2640,9 +2649,9 @@ begin
             LineChanged[CP] := true;

           end;

 

-          if (Czesci[CP].Czesc[line].Nuta[note].Start = AktBeat) then

+          if (Czesci[CP].Czesc[line].Nuta[note].Start = beat) then

           begin

-            LastClick := AktBeat;

+            LastClick := beat;

             PlayClick := true;

           end;

         end;

@@ -2655,7 +2664,7 @@ begin
           for note := 0 to Length(Czesci[(CP+1) mod 2].Czesc[line].Nuta) - 1 do

           begin

             //line change

-            if (Czesci[(CP+1) mod 2].Czesc[line].Start = AktBeat) and (line <> Czesci[(CP+1) mod 2].Akt) and not end_ then

+            if (Czesci[(CP+1) mod 2].Czesc[line].Start = beat) and (line <> Czesci[(CP+1) mod 2].Akt) and not end_ then

             begin

               if(Length(Czesci[(CP+1) mod 2].Czesc[Czesci[(CP+1) mod 2].Akt].Nuta)>0) then

                 Czesci[(CP+1) mod 2].Czesc[Czesci[(CP+1) mod 2].Akt].Nuta[AktNuta[(CP+1) mod 2]].Color := 0;

@@ -2669,16 +2678,9 @@ begin
           end;

         end;

       end;

-    end;

-  end else

-  begin

-    LineChanged[0]:=false;

-    LineChanged[1]:=false;

-    PlayVideo := false;

-    PlayOneSentence := false;

-  end;

 

-  // midi music

+

+      // midi music

   if PlaySentenceMidi then

   begin

     // stop the music

@@ -2689,7 +2691,7 @@ begin
       Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[AktNuta[CP]].Color := 0;

       if (Czesci[CP].Akt = lineStart) then

         AktNuta[CP] := noteStart;

-        

+

       Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[AktNuta[CP]].Color := 2;

       EditorLyric[CP].Selected := AktNuta[CP];

     end;

@@ -2700,7 +2702,7 @@ begin
     if PlayClick then

     begin

       for Pet := 0 to Czesci[CP].Czesc[Czesci[CP].Akt].HighNut do

-        if (Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet].Start = AktBeat) then

+        if (Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet].Start = beat) then

         begin

           if Pet > 0 then

             MidiOut.PutShort($81, Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet-1].Ton + 60, 127);

@@ -2742,7 +2744,7 @@ begin
       for note := 0 to Length(Czesci[CP].Czesc[line].Nuta) - 1 do

       begin

         //note change

-        if (Czesci[CP].Czesc[line].Nuta[note].Start = AktBeat) and

+        if (Czesci[CP].Czesc[line].Nuta[note].Start = beat) and

           (((note <> AktNuta[CP]) or LineChanged[CP]) and

           (not PlayOneSentence or (line = Czesci[CP].Akt))) then

         begin

@@ -2768,7 +2770,7 @@ begin
         for note := 0 to Length(Czesci[(CP+1) mod 2].Czesc[line].Nuta) - 1 do

         begin

           //note change

-          if (Czesci[(CP+1) mod 2].Czesc[line].Nuta[note].Start = AktBeat) and

+          if (Czesci[(CP+1) mod 2].Czesc[line].Nuta[note].Start = beat) and

             ((note <> AktNuta[(CP+1) mod 2]) or LineChanged[(CP+1) mod 2]) then

           begin

             if(Length(Czesci[(CP+1) mod 2].Czesc[Czesci[(CP+1) mod 2].Akt].Nuta)>0) then

@@ -2790,36 +2792,16 @@ begin
 

   end;

 

-  // midi music

-  if PlayOneNoteMidi then

-  begin

-    MidiPos := USTime.GetTime - MidiTime + MidiStart;

-    // stop the music

-    if (MidiPos > MidiStop) then

-    begin

-      MidiOut.PutShort($81, Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[MidiLastNote].Ton + 60, 127);

-      PlayOneNoteMidi := false;

-    end;

-

-    // click

-    AktBeat := Floor(GetMidBeat(MidiPos - AktSong.GAP / 1000));

-    Text[TextDebug].Text := IntToStr(AktBeat);

 

-    if AktBeat <> LastClick then

-    begin

-      for Pet := 0 to Czesci[CP].Czesc[Czesci[CP].Akt].HighNut do

-      begin

-        if (Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet].Start = AktBeat) then

-        begin

-          LastClick := AktBeat;

-          if Pet > 0 then

-            MidiOut.PutShort($81, Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet-1].Ton + 60, 127);

-          MidiOut.PutShort($91, Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet].Ton + 60, 127);

-          MidiLastNote := Pet;

-        end;

-      end;

+      end; //for beat

     end;

-  end; // if PlayOneNoteMidi

+  end else

+  begin

+    LineChanged[0]:=false;

+    LineChanged[1]:=false;

+    PlayVideo := false;

+    PlayOneSentence := false;

+  end;

 

   // mp3 music

   if PlayOneNote then

@@ -2838,18 +2820,55 @@ begin
       Text[TextDebug].Text := IntToStr(AktBeat);

       if AktBeat <> LastClick then

       begin

-        for Pet := 0 to Czesci[CP].Czesc[Czesci[CP].Akt].HighNut do

+        for beat := LastClick+1 to AktBeat do

         begin

-          if (Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet].Start = AktBeat) then

+          for Pet := 0 to Czesci[CP].Czesc[Czesci[CP].Akt].HighNut do

           begin

-            Music.PlayClick;

-            LastClick := AktBeat;

+            if (Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet].Start = beat) then

+            begin

+              Music.PlayClick;

+              LastClick := beat;

+            end;

           end;

-        end;

+        end; //for beat

       end;

     end; // click

   end; // if PlayOneNote

 

+  // midi music

+  if PlayOneNoteMidi then

+  begin

+    MidiPos := USTime.GetTime - MidiTime + MidiStart;

+    // stop the music

+    if (MidiPos > MidiStop) then

+    begin

+      MidiOut.PutShort($81, Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[MidiLastNote].Ton + 60, 127);

+      PlayOneNoteMidi := false;

+    end;

+

+    // click

+    AktBeat := Floor(GetMidBeat(MidiPos - AktSong.GAP / 1000));

+    Text[TextDebug].Text := IntToStr(AktBeat);

+

+    if AktBeat <> LastClick then

+    begin

+      for beat := LastClick+1 to AktBeat do

+      begin

+        for Pet := 0 to Czesci[CP].Czesc[Czesci[CP].Akt].HighNut do

+        begin

+          if (Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet].Start = beat) then

+          begin

+            LastClick := beat;

+            if Pet > 0 then

+              MidiOut.PutShort($81, Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet-1].Ton + 60, 127);

+            MidiOut.PutShort($91, Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[Pet].Ton + 60, 127);

+            MidiLastNote := Pet;

+          end;

+        end;

+      end; //for beat

+    end;

+  end; // if PlayOneNoteMidi

+

   Text[TextSentence].Text := 'Line: ' + IntToStr(Czesci[CP].Akt + 1) + '/' + IntToStr(Czesci[CP].Ilosc);

   Text[TextNote].Text := 'Note: ' + IntToStr(AktNuta[CP] + 1) + '/' + IntToStr(Czesci[CP].Czesc[Czesci[CP].Akt].IlNut);

 

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 7f60fe95..6e3da366 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -150,6 +150,8 @@ type
       procedure Finish; virtual;

       procedure Pause; //Pause Mod(Toggles Pause)

 

+      procedure SetVis();

+

       //OnSentenceEnd for LineBonus + Singbar

       procedure onSentenceEnd(CP: integer; S: Cardinal);

       //OnSentenceChange (for Golden Notes)

@@ -217,6 +219,16 @@ begin
             Music.EnableVocalRemover;

         end;

 

+      SDLK_N:

+        begin

+          if (ScreenSong.Mode <> smNormal) then

+            Exit;

+            

+          Inc(ShowNotes);

+          if (ShowNotes>2) then

+            ShowNotes:=0;

+        end;

+

       SDLK_TAB:

         begin

           if not paused then

@@ -470,17 +482,6 @@ end;
 

 procedure TScreenSing.onShow;

 var

-  V1:       boolean;

-  V1TwoP:   boolean; //added for ps3 skin

-  V1ThreeP: boolean; //added for ps3 skin

-  V2R:      boolean;

-  V2M:      boolean;

-  V3R:      boolean;

-  V3FourP:  boolean;

-  V4FourP:  boolean;

-  V4SixP:   boolean;

-  V5:       boolean;

-  V6:       boolean;

   NR:       TRecR; //Line Bonus Mod

 begin

   Log.LogStatus('Begin', 'onShow');

@@ -498,6 +499,8 @@ begin
 

   MP3VolumeHandler.changed := false;

 

+  ShowNotes := 0;

+

   //Reset Player Medley stats

   if (ScreenSong.Mode = smMedley) or ScreenSong.PartyMedley  then

   begin

@@ -558,87 +561,6 @@ begin
     Theme.Sing.StaticP3RScoreBG.X := Round(SaveCoords.PlayerS[6].StaticScoreBG);

     Theme.Sing.TextP3R.X := Round(SaveCoords.PlayerS[6].TextP);

     Theme.Sing.TextP3RScore.X := Round(SaveCoords.PlayerS[6].TextPScore);

-

-    case PlayersPlay of

-    1:  begin

-          V1       := true;

-          V1TwoP   := false;  //added for ps3 skin

-          V1ThreeP := false;  //added for ps3 skin

-          V2R      := false;

-          V2M      := false;

-          V3R      := false;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    2:  begin

-          V1       := false;

-          V1TwoP   := true;  //added for ps3 skin

-          V1ThreeP := false; //added for ps3 skin

-          V2R      := true;

-          V2M      := false;

-          V3R      := false;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    3:  begin

-          V1       := false;

-          V1TwoP   := false; //added for ps3 skin

-          V1ThreeP := true;  //added for ps3 skin

-          V2R      := false;

-          V2M      := true;

-          V3R      := true;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    4:  begin // double screen

-          V1       := false;

-          V1TwoP   := true;  //added for ps3 skin

-          V1ThreeP := false; //added for ps3 skin

-          V2R      := true;

-          V2M      := false;

-          V3R      := false;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    6:  begin // double screen

-          V1       := false;

-          V1TwoP   := false; //added for ps3 skin

-          V1ThreeP := true;  //added for ps3 skin

-          V2R      := false;

-          V2M      := true;

-          V3R      := true;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    else begin    //should not happen

-          V1       := true;

-          V1TwoP   := false;

-          V1ThreeP := false;

-          V2R      := false;

-          V2M      := false;

-          V3R      := false;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    end;

   end else

   begin

     P4Mode := true;

@@ -685,87 +607,6 @@ begin
     Theme.Sing.StaticP3RScoreBG.X := Round(SaveCoords.PlayerS[6].StaticScoreBG+Theme.Sing.OFF_P3);

     Theme.Sing.TextP3R.X := Round(SaveCoords.PlayerS[6].TextP+Theme.Sing.OFF_P3);

     Theme.Sing.TextP3RScore.X := Round(SaveCoords.PlayerS[6].TextPScore+Theme.Sing.OFF_P3);

-

-    case PlayersPlay of

-    1:  begin

-          V1       := true;

-          V1TwoP   := false;  //added for ps3 skin

-          V1ThreeP := false;  //added for ps3 skin

-          V2R      := false;

-          V2M      := false;

-          V3R      := false;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    2:  begin

-          V1       := false;

-          V1TwoP   := true;  //added for ps3 skin

-          V1ThreeP := false; //added for ps3 skin

-          V2R      := true;

-          V2M      := false;

-          V3R      := false;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    3:  begin

-          V1       := false;

-          V1TwoP   := false; //added for ps3 skin

-          V1ThreeP := true;  //added for ps3 skin

-          V2R      := false;

-          V2M      := true;

-          V3R      := true;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    4:  begin

-          V1       := false;

-          V1TwoP   := true;  //added for ps3 skin

-          V1ThreeP := false; //added for ps3 skin

-          V2R      := true;

-          V2M      := false;

-          V3R      := false;

-          V3FourP  := true;

-          V4FourP  := true;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    6:  begin

-          V1       := false;

-          V1TwoP   := false; //added for ps3 skin

-          V1ThreeP := true;  //added for ps3 skin

-          V2R      := false;

-          V2M      := true;

-          V3R      := true;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := true;

-          V5       := true;

-          V6       := true;

-        end;

-    else begin    //should not happen

-          V1       := true;

-          V1TwoP   := false;

-          V1ThreeP := false;

-          V2R      := false;

-          V2M      := false;

-          V3R      := false;

-          V3FourP  := false;

-          V4FourP  := false;

-          V4SixP   := false;

-          V5       := false;

-          V6       := false;

-        end;

-    end;

   end;

 

     Static[StaticP1].Texture.X := Theme.Sing.StaticP1.X;

@@ -802,67 +643,7 @@ begin
   NR.WMid := NR.Width / 2;

   NR.Mid := NR.Left + NR.WMid;

 

-

-

-  //Added for ps3 skin

-  //This one is shown in 1P mode

-  Static[StaticP1].Visible := V1;

-  Static[StaticP1ScoreBG].Visible := V1;

-  Text[TextP1].Visible := V1;

-  Text[TextP1Score].Visible := V1;

-

-  //This one is shown in 2/4P mode

-  Static[StaticP1TwoP].Visible := V1TwoP;

-  Static[StaticP1TwoPScoreBG].Visible := V1TwoP;

-  Text[TextP1TwoP].Visible := V1TwoP;

-  Text[TextP1TwoPScore].Visible := V1TwoP;

-

-  //This one is shown in 3/6P mode

-  Static[StaticP1ThreeP].Visible := V1ThreeP and not (PlayersPlay=6);

-  Static[StaticP1ThreePScoreBG].Visible := V1ThreeP;

-  Text[TextP1ThreeP].Visible := V1ThreeP and not (PlayersPlay=6);

-  Text[TextP1ThreePScore].Visible := V1ThreeP;

-  //eoa

-

-  Static[StaticP2R].Visible := V2R;

-  Static[StaticP2RScoreBG].Visible := V2R;

-  Text[TextP2R].Visible := V2R;

-  Text[TextP2RScore].Visible := V2R;

-

-  Static[StaticP2M].Visible := V2M and not (PlayersPlay=6);

-  Static[StaticP2MScoreBG].Visible := V2M;

-  Text[TextP2M].Visible := V2M and not (PlayersPlay=6);

-  Text[TextP2MScore].Visible := V2M;

-

-  Static[StaticP3R].Visible := V3R and not (PlayersPlay=6);

-  Static[StaticP3RScoreBG].Visible := V3R;

-  Text[TextP3R].Visible := V3R and not (PlayersPlay=6);

-  Text[TextP3RScore].Visible := V3R;

-

-  Static[StaticP3FourP].Visible := V3FourP;

-  Static[StaticP3FourPScoreBG].Visible := V3FourP;

-  Text[TextP3FourP].Visible := V3FourP;

-  Text[TextP3FourPScore].Visible := V3FourP;

-

-  Static[StaticP4FourP].Visible := V4FourP;

-  Static[StaticP4FourPScoreBG].Visible := V4FourP;

-  Text[TextP4FourP].Visible := V4FourP;

-  Text[TextP4FourPScore].Visible := V4FourP;

-

-  Static[StaticP4SixP].Visible := false and V4SixP;

-  Static[StaticP4SixPScoreBG].Visible := V4SixP;

-  Text[TextP4SixP].Visible := false and V4SixP;

-  Text[TextP4SixPScore].Visible := V4SixP;

-

-  Static[StaticP5].Visible := false and V5;

-  Static[StaticP5ScoreBG].Visible := V5;

-  Text[TextP5].Visible := false and V5;

-  Text[TextP5Score].Visible := V5;

-

-  Static[StaticP6].Visible := false and V6;

-  Static[StaticP6ScoreBG].Visible := V6;

-  Text[TextP6].Visible := false and V6;

-  Text[TextP6Score].Visible := V6;

+  SetVis();

 

   //Set Position of Line Bonus - PhrasenBonus

   if (Ini.LineBonus = 1) then //Show Line Bonus at Scores

@@ -1209,6 +990,265 @@ begin
     PerfLog.StartNewLog;

 end;

 

+procedure TScreenSing.SetVis();

+var

+  V1:       boolean;

+  V1TwoP:   boolean; //added for ps3 skin

+  V1ThreeP: boolean; //added for ps3 skin

+  V2R:      boolean;

+  V2M:      boolean;

+  V3R:      boolean;

+  V3FourP:  boolean;

+  V4FourP:  boolean;

+  V4SixP:   boolean;

+  V5:       boolean;

+  V6:       boolean;

+  vis:      boolean;

+begin

+  vis := (ShowNotes<2);

+

+  if not P4Mode and vis then

+  begin

+    case PlayersPlay of

+    1:  begin

+          V1       := true;

+          V1TwoP   := false;  //added for ps3 skin

+          V1ThreeP := false;  //added for ps3 skin

+          V2R      := false;

+          V2M      := false;

+          V3R      := false;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    2:  begin

+          V1       := false;

+          V1TwoP   := true;  //added for ps3 skin

+          V1ThreeP := false; //added for ps3 skin

+          V2R      := true;

+          V2M      := false;

+          V3R      := false;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    3:  begin

+          V1       := false;

+          V1TwoP   := false; //added for ps3 skin

+          V1ThreeP := true;  //added for ps3 skin

+          V2R      := false;

+          V2M      := true;

+          V3R      := true;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    4:  begin // double screen

+          V1       := false;

+          V1TwoP   := true;  //added for ps3 skin

+          V1ThreeP := false; //added for ps3 skin

+          V2R      := true;

+          V2M      := false;

+          V3R      := false;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    6:  begin // double screen

+          V1       := false;

+          V1TwoP   := false; //added for ps3 skin

+          V1ThreeP := true;  //added for ps3 skin

+          V2R      := false;

+          V2M      := true;

+          V3R      := true;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    else begin    //should not happen

+          V1       := true;

+          V1TwoP   := false;

+          V1ThreeP := false;

+          V2R      := false;

+          V2M      := false;

+          V3R      := false;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    end;

+  end else if vis then

+  begin

+    case PlayersPlay of

+    1:  begin

+          V1       := true;

+          V1TwoP   := false;  //added for ps3 skin

+          V1ThreeP := false;  //added for ps3 skin

+          V2R      := false;

+          V2M      := false;

+          V3R      := false;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    2:  begin

+          V1       := false;

+          V1TwoP   := true;  //added for ps3 skin

+          V1ThreeP := false; //added for ps3 skin

+          V2R      := true;

+          V2M      := false;

+          V3R      := false;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    3:  begin

+          V1       := false;

+          V1TwoP   := false; //added for ps3 skin

+          V1ThreeP := true;  //added for ps3 skin

+          V2R      := false;

+          V2M      := true;

+          V3R      := true;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    4:  begin

+          V1       := false;

+          V1TwoP   := true;  //added for ps3 skin

+          V1ThreeP := false; //added for ps3 skin

+          V2R      := true;

+          V2M      := false;

+          V3R      := false;

+          V3FourP  := true;

+          V4FourP  := true;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    6:  begin

+          V1       := false;

+          V1TwoP   := false; //added for ps3 skin

+          V1ThreeP := true;  //added for ps3 skin

+          V2R      := false;

+          V2M      := true;

+          V3R      := true;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := true;

+          V5       := true;

+          V6       := true;

+        end;

+    else begin    //should not happen

+          V1       := true;

+          V1TwoP   := false;

+          V1ThreeP := false;

+          V2R      := false;

+          V2M      := false;

+          V3R      := false;

+          V3FourP  := false;

+          V4FourP  := false;

+          V4SixP   := false;

+          V5       := false;

+          V6       := false;

+        end;

+    end;

+  end;

+

+  if not vis then

+  begin

+    V1       := false;

+    V1TwoP   := false;

+    V1ThreeP := false;

+    V2R      := false;

+    V2M      := false;

+    V3R      := false;

+    V3FourP  := false;

+    V4FourP  := false;

+    V4SixP   := false;

+    V5       := false;

+    V6       := false;

+  end;

+

+  //Added for ps3 skin

+  //This one is shown in 1P mode

+  Static[StaticP1].Visible := V1;

+  Static[StaticP1ScoreBG].Visible := V1;

+  Text[TextP1].Visible := V1;

+  Text[TextP1Score].Visible := V1;

+

+  //This one is shown in 2/4P mode

+  Static[StaticP1TwoP].Visible := V1TwoP;

+  Static[StaticP1TwoPScoreBG].Visible := V1TwoP;

+  Text[TextP1TwoP].Visible := V1TwoP;

+  Text[TextP1TwoPScore].Visible := V1TwoP;

+

+  //This one is shown in 3/6P mode

+  Static[StaticP1ThreeP].Visible := V1ThreeP and not (PlayersPlay=6);

+  Static[StaticP1ThreePScoreBG].Visible := V1ThreeP;

+  Text[TextP1ThreeP].Visible := V1ThreeP and not (PlayersPlay=6);

+  Text[TextP1ThreePScore].Visible := V1ThreeP;

+  //eoa

+

+  Static[StaticP2R].Visible := V2R;

+  Static[StaticP2RScoreBG].Visible := V2R;

+  Text[TextP2R].Visible := V2R;

+  Text[TextP2RScore].Visible := V2R;

+

+  Static[StaticP2M].Visible := V2M and not (PlayersPlay=6);

+  Static[StaticP2MScoreBG].Visible := V2M;

+  Text[TextP2M].Visible := V2M and not (PlayersPlay=6);

+  Text[TextP2MScore].Visible := V2M;

+

+  Static[StaticP3R].Visible := V3R and not (PlayersPlay=6);

+  Static[StaticP3RScoreBG].Visible := V3R;

+  Text[TextP3R].Visible := V3R and not (PlayersPlay=6);

+  Text[TextP3RScore].Visible := V3R;

+

+  Static[StaticP3FourP].Visible := V3FourP;

+  Static[StaticP3FourPScoreBG].Visible := V3FourP;

+  Text[TextP3FourP].Visible := V3FourP;

+  Text[TextP3FourPScore].Visible := V3FourP;

+

+  Static[StaticP4FourP].Visible := V4FourP;

+  Static[StaticP4FourPScoreBG].Visible := V4FourP;

+  Text[TextP4FourP].Visible := V4FourP;

+  Text[TextP4FourPScore].Visible := V4FourP;

+

+  Static[StaticP4SixP].Visible := false and V4SixP;

+  Static[StaticP4SixPScoreBG].Visible := V4SixP;

+  Text[TextP4SixP].Visible := false and V4SixP;

+  Text[TextP4SixPScore].Visible := V4SixP;

+

+  Static[StaticP5].Visible := false and V5;

+  Static[StaticP5ScoreBG].Visible := V5;

+  Text[TextP5].Visible := false and V5;

+  Text[TextP5Score].Visible := V5;

+

+  Static[StaticP6].Visible := false and V6;

+  Static[StaticP6ScoreBG].Visible := V6;

+  Text[TextP6].Visible := false and V6;

+  Text[TextP6Score].Visible := V6;

+end;

+

 procedure TScreenSing.SongError;

 var

   I, len:  integer;

@@ -1397,7 +1437,7 @@ begin
 

   if error then

   begin

-    Log.LogError('Error: TXT is longer then the MP3 in Song: ' + AktSong.Path + AktSong.Filename);

+    Log.LogError('Error: TXT is longer than the MP3 in Song: ' + AktSong.Path + AktSong.Filename);

     SongError;

     Exit;

   end;

@@ -1641,6 +1681,7 @@ var
 begin

   PerfLog.AddComment('ScreenSing: Start Draw');

 

+  SetVis;

   //ScoreBG Mod

   // set player colors

   if PlayersPlay = 4 then

@@ -1745,7 +1786,6 @@ begin
           end;

     end; // case

   end; // if

-

   // stereo

 

 // weird stuff, maybe this is for "dual screen?", but where is player three then?

@@ -2054,12 +2094,13 @@ begin
 

   if AktSong.isDuet then

     Static[StaticLyricDuetBar].Texture.Alpha := Alpha[0];

-    

+

   // draw custom items

   SingDraw(Alpha);  // always draw

 

   //GoldenNoteStarsTwinkle Mod

-  GoldenRec.SpawnRec(Alpha);

+  if (ShowNotes=0) then

+    GoldenRec.SpawnRec(Alpha);

   //GoldenNoteStarsTwinkle Mod

 

   // back stereo

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 59d4b50b..e2576a90 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -2006,6 +2006,8 @@ begin
   if SongIndex<>Interaction then

     Music.Stop;

 

+  ShowNotes := 0;

+

   PartyMedley := false;

   FadeOut := false;