- fix: crash at startup (my fault)

- fix: it was possible to add non-medley songs to the medley playlist -> crash in singscreen
- updated polish language (thx to Pit33)
- deactivate all elements (but not background/video) in singscreen (with "N")

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

3 files changed, 12 insertions, 12 deletions

diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas
index ea79fbe3..3ff73cca 100644
--- a/Game/Code/Screens/UScreenOptionsRecord.pas
+++ b/Game/Code/Screens/UScreenOptionsRecord.pas
@@ -116,16 +116,16 @@ var
   SCI:    integer;

 begin

   inherited Create;

-  

+

   LoadFromTheme(Theme.OptionsRecord);

 

   SetLength(ICard, Length(Recording.SoundCard));

 

-  for SC := 0 to High(Recording.SoundCard) do

-    ICard[SC] := Recording.SoundCard[SC].Description;

-

   if (Length(Recording.SoundCard)>0) then

   begin

+    for SC := 0 to High(Recording.SoundCard) do

+      ICard[SC] := Recording.SoundCard[SC].Description;

+

     SetLength(IInput, Length(Recording.SoundCard[Ini.Card].Input));

     for SCI := 0 to High(Recording.SoundCard[Ini.Card].Input) do

       IInput[SCI] := Recording.SoundCard[Ini.Card].Input[SCI].Name;

@@ -136,12 +136,11 @@ begin
     SelectSlideChannelR := AddSelectSlide(Theme.OptionsRecord.SelectSlideChannelR, Ini.CardList[0].ChannelR, IChannel);

   end;

 

-  IWebCamDevice := GetCapDevices();

+  GetCapDevices(IWebCamDevice);

   if (Length(IWebCamDevice)=0) then

     Ini.EnableWebCam := 0;

 

   SelectSlideWebCamOnOff := AddSelectSlide(Theme.OptionsRecord.SelectSlideWebCamOnOff, Ini.EnableWebCam, IEnableWebCam);

-

   if (Length(IWebCamDevice)>0) then

   begin

     if (Length(IWebCamDevice)-1 < Ini.WebCamID) then

@@ -155,7 +154,6 @@ begin
     WebCamPreviewOn := (Ini.EnableWebCam=1);

   end else

     WebCamPreviewOn := false;

-

   AddButton(Theme.OptionsRecord.ButtonExit);

   if (Length(Button[0].Text)=0) then

     AddButtonText(14, 20, Theme.Options.Description[7]);

@@ -169,7 +167,7 @@ begin
   if not Help.SetHelpID(ID) then

     Log.LogError('No Entry for Help-ID ' + ID + ' (ScreenOptionsRecord)');

 

-  IWebCamDevice := GetCapDevices();

+  GetCapDevices(IWebCamDevice);

 

   if (Length(IWebCamDevice)>0) then

   begin

@@ -232,7 +230,7 @@ procedure TScreenOptionsRecord.UpdateWebCam;
 begin

   wClose;

 

-  IWebCamDevice := GetCapDevices();

+  GetCapDevices(IWebCamDevice);

 

   if (Length(IWebCamDevice)>0) then

   begin

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 46f7b63c..70da386b 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -225,7 +225,7 @@ begin
             Exit;

             

           Inc(ShowNotes);

-          if (ShowNotes>3) then

+          if (ShowNotes>4) then

             ShowNotes:=0;

         end;

 

@@ -1996,7 +1996,8 @@ begin
 

   wDraw(WebCam, ScreenAct);

   // draw static menu (FG)

-  DrawFG;

+  if (ShowNotes<4) then

+    DrawFG;

 

   //Medley Countdown

   if ScreenSong.Mode = smMedley then

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index e69cfcfb..9cc87a41 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -610,7 +610,8 @@ begin
 

             if Length(PlaylistMedley.Song)=0 then

               MakeMedley := false;

-          end else if (Mode = smNormal) and (Length(getVisibleMedleyArr(msCalculated)) > 0) then

+          end else if (Mode = smNormal) and (CatSongs.Song[Interaction].Medley.Source>=msCalculated) and

+            (Length(getVisibleMedleyArr(msCalculated)) > 0) then

           begin

             MakeMedley := true;

             StartMedley(99, msCalculated);