- fixed "vista-no-mic-leads-to-crash" bug

- better fading texture handling
- fixed black video background on second screen in song menu
- "Blue Sensation" as default theme

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

2 files changed, 16 insertions, 11 deletions

diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas
index f5a29054..ee4c2cba 100644
--- a/Game/Code/Screens/UScreenOptions.pas
+++ b/Game/Code/Screens/UScreenOptions.pas
@@ -19,10 +19,10 @@ type
 

 const

   ID='ID_006';   //for help system

-  

+

 implementation

 

-uses UGraphic, UHelp, ULog;

+uses UGraphic, UHelp, ULog, URecord, ULanguage;

 

 function TScreenOptions.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;

 begin

@@ -74,8 +74,12 @@ begin
           end;

 

           if SelInteraction = 5 then begin

-            Music.PlayStart;

-            FadeTo(@ScreenOptionsRecord);

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

+            begin

+              Music.PlayStart;

+              FadeTo(@ScreenOptionsRecord);

+            end else

+              ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_SOUND_INPUT'));

           end;

 

           if SelInteraction = 6 then begin

diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas
index 8b3df639..8dda4a6f 100644
--- a/Game/Code/Screens/UScreenOptionsRecord.pas
+++ b/Game/Code/Screens/UScreenOptionsRecord.pas
@@ -90,21 +90,22 @@ begin
   LoadFromTheme(Theme.OptionsRecord);

 

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

+

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

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

 //  end;

 

-//  if Length(Recording.SoundCard[Ini.Card].Input) > 0 then begin

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

+  begin

     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;

-//  end;

 

-

-  AddSelectSlide(Theme.OptionsRecord.SelectSlideCard, Ini.Card, ICard);

-  SelectSlideInput    := AddSelectSlide(Theme.OptionsRecord.SelectSlideInput, Ini.CardList[0].Input, IInput);

-  SelectSlideChannelL := AddSelectSlide(Theme.OptionsRecord.SelectSlideChannelL, Ini.CardList[0].ChannelL, IChannel);

-  SelectSlideChannelR := AddSelectSlide(Theme.OptionsRecord.SelectSlideChannelR, Ini.CardList[0].ChannelR, IChannel);

+    AddSelectSlide(Theme.OptionsRecord.SelectSlideCard, Ini.Card, ICard);

+    SelectSlideInput    := AddSelectSlide(Theme.OptionsRecord.SelectSlideInput, Ini.CardList[0].Input, IInput);

+    SelectSlideChannelL := AddSelectSlide(Theme.OptionsRecord.SelectSlideChannelL, Ini.CardList[0].ChannelL, IChannel);

+    SelectSlideChannelR := AddSelectSlide(Theme.OptionsRecord.SelectSlideChannelR, Ini.CardList[0].ChannelR, IChannel);

+  end;

 

   AddButton(Theme.OptionsRecord.ButtonExit);

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