- added webcam support

- faster program start
- faster sorting (mergesort)
- sync lyrics to music
- some new backgrounds and credits graphics (thx to MezzoX)
- own thread for video decoding
- finished 6-Player-on-one-screen-mode
- changqed player-colors
- fixed some bugs...

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

1 files changed, 11 insertions, 6 deletions

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index a8c0a20d..6deb4b00 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -529,17 +529,22 @@ begin
 

             CP := MedleyNotes.Preview.CP;

             Czesci[CP].Akt := MedleyNotes.Preview.line;

-            Czesci[(CP+1) mod 2].Akt := Czesci[CP].Akt;

+            if AktSong.isDuet then

+              Czesci[(CP+1) mod 2].Akt := Czesci[CP].Akt;

 

             AktNuta[CP] := MedleyNotes.Preview.note;

-            AktNuta[(CP+1) mod 2] := 0;

+            if AktSong.isDuet then

+              AktNuta[(CP+1) mod 2] := 0;

 

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

 

             EditorLyric[CP].AddCzesc(CP, Czesci[CP].Akt);

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

-            EditorLyric[(CP+1) mod 2].AddCzesc((CP+1) mod 2, Czesci[(CP+1) mod 2].Akt);

-            EditorLyric[(CP+1) mod 2].Selected := -1;

+            if AktSong.isDuet then

+            begin

+              EditorLyric[(CP+1) mod 2].AddCzesc((CP+1) mod 2, Czesci[(CP+1) mod 2].Akt);

+              EditorLyric[(CP+1) mod 2].Selected := -1;

+            end;

             Music.Stop;

             PlaySentence := false;

             PlayOneNote := false;

@@ -2984,10 +2989,10 @@ begin
         else if Blend>1 then

           Blend := 1;

 

-        acDrawGLi(ScreenAct, Window, Blend);

+        acDrawGLi(ScreenAct, Window, Blend, true);

       end else if VidVis=full then

       begin

-        acDrawGL(ScreenAct);

+        acDrawGL(ScreenAct, true);

       end;

 

       if (Czas.Teraz>=Czas.Razem) then