From 3e918cc3e09fefbb045f41a1f1e06fa6b550e080 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 10 Oct 2010 13:36:48 +0000
Subject: - removed solmization option from theme - added hint in singscreen
 when webcam is starting

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2655 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Screens/UScreenOptionsLyrics.pas |  2 --
 Game/Code/Screens/UScreenSing.pas          | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'Game/Code/Screens')

diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas
index bfb69c92..42fc63ac 100644
--- a/Game/Code/Screens/UScreenOptionsLyrics.pas
+++ b/Game/Code/Screens/UScreenOptionsLyrics.pas
@@ -83,8 +83,6 @@ begin
 
   AddSelect(Theme.OptionsLyrics.SelectLyricsFont, Ini.LyricsFont, ILyricsFont);
   AddSelect(Theme.OptionsLyrics.SelectLyricsEffect, Ini.LyricsEffect, ILyricsEffect);
-  //AddSelect(Theme.OptionsLyrics.SelectSolmization, Ini.Solmization, ISolmization);
-
 
   AddButton(Theme.OptionsLyrics.ButtonExit);
   if (Length(Button[0].Text)=0) then
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 2f8ee68f..0fa5227c 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -1575,7 +1575,18 @@ begin
     end;
   end;
 
-  wStartWebCam();
+  if not FGrabFrameFlag and (Ini.EnableWebCam=1) then
+  begin
+    //Display White Activating WebCam Text
+    SetFontStyle(2); //Font: Outlined1
+    SetFontSize(12);
+    SetFontItalic(False);
+    SetFontPos (400 - glTextWidth ('Activating Webcam ...')/2, 250); //Position
+    glColor4f(1,1,1,1);
+    glPrint('Activating Webcam ...');
+    SwapBuffers;
+    wStartWebCam();
+  end;
 
   // play music (II)
   if (ScreenSong.Mode = smMedley) or ScreenSong.PartyMedley then
-- 
cgit v1.2.3