Feature: It's now possible to move/skin the time progress thing (no fix positions anymore) (affected: UDraw.pas, UGraphic.pas, UThemes.pas, UScreenSing.pas, UScreenSingModi.pas)

Theme/Skin: Added the time stuff beneath the lyrics (as "the others" did too)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@164 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 22 insertions, 12 deletions

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 93c3ac48..3e66b197 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -12,7 +12,12 @@ type
     PauseTime: Real;

     NumEmptySentences: integer;

     public

-      TextTime:           integer;

+      //TextTime:           integer;

+

+      //TimeBar mod

+       StaticTimeProgress:  integer;

+       TextTimeText:        integer;

+      //eoa TimeBar mod

 

       StaticP1:           integer;

       StaticP1ScoreBG:    integer;

@@ -166,7 +171,12 @@ begin
   LoadFromTheme(Theme.Sing);

 

   // time

-  TextTime := AddText(75, 14, 1, 8, 0.25, 0.25, 0.25, '00:00');

+  //TextTime := AddText(75, 14, 1, 8, 0.25, 0.25, 0.25, '00:00');

+

+  //TimeBar mod

+    StaticTimeProgress :=  AddStatic(Theme.Sing.StaticTimeProgress);

+    TextTimeText       :=  AddText(Theme.Sing.TextTimeText);

+  //eoa TimeBar mod

 

   StaticP1 := AddStatic(Theme.Sing.StaticP1);

   StaticP1ScoreBG := AddStatic(Theme.Sing.StaticP1ScoreBG);

@@ -908,11 +918,11 @@ begin
   // update static menu with time ...

   Min := Round(Czas.Teraz) div 60;

   Sec := Round(Czas.Teraz) mod 60;

-  Text[TextTime].Text := '';

-  if Min < 10 then Text[TextTime].Text := '0';

-  Text[TextTime].Text := Text[TextTime].Text + IntToStr(Min) + ':';

-  if Sec < 10 then Text[TextTime].Text := Text[TextTime].Text + '0';

-  Text[TextTime].Text := Text[TextTime].Text + IntToStr(Sec);

+  Text[TextTimeText].Text := '';

+  if Min < 10 then Text[TextTimeText].Text := '0';

+  Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Min) + ':';

+  if Sec < 10 then Text[TextTimeText].Text := Text[TextTimeText].Text + '0';

+  Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Sec);

 

   // .. and scores

   if PlayersPlay = 1 then begin

diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index 86613152..484d7d56 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -927,11 +927,11 @@ begin
   // update static menu with time ...

   Min := Round(Czas.Teraz) div 60;

   Sec := Round(Czas.Teraz) mod 60;

-  Text[TextTime].Text := '';

-  if Min < 10 then Text[TextTime].Text := '0';

-  Text[TextTime].Text := Text[TextTime].Text + IntToStr(Min) + ':';

-  if Sec < 10 then Text[TextTime].Text := Text[TextTime].Text + '0';

-  Text[TextTime].Text := Text[TextTime].Text + IntToStr(Sec);

+  Text[TextTimeText].Text := '';

+  if Min < 10 then Text[TextTimeText].Text := '0';

+  Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Min) + ':';

+  if Sec < 10 then Text[TextTimeText].Text := Text[TextTimeText].Text + '0';

+  Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Sec);

 end;

 

   // draw static menu (BG)