added: Video Icon. Shows if Video is present in Song-Selection. Needs to be fixed.

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

8 files changed, 36 insertions, 2 deletions

diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index 0fe207e9..471e46bf 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -249,7 +249,10 @@ type
     TextTitle:        TThemeText;

     TextNumber:       TThemeText;

 

-    //Show Cat in TopLeft Mod

+    //Video Icon Mod

+    VideoIcon:        TThemeStatic;

+

+   //Show Cat in TopLeft Mod

     TextCat:          TThemeText;

     StaticCat:        TThemeStatic;

 

@@ -280,6 +283,7 @@ type
       ColR, ColG, ColB: Real;

       end;

 

+

     //Party and Non Party specific Statics and Texts

     StaticParty:    AThemeStatic;

     TextParty:      AThemeText;

@@ -303,6 +307,8 @@ type
     StaticTeam3Joker3: TThemeStatic;

     StaticTeam3Joker4: TThemeStatic;

     StaticTeam3Joker5: TThemeStatic;

+

+

   end;

 

    TThemeSing = class(TThemeBasic)

@@ -959,6 +965,9 @@ begin
       ThemeLoadText(Song.TextTitle, 'SongTextTitle');

       ThemeLoadText(Song.TextNumber, 'SongTextNumber');

 

+      //Video Icon Mod

+      ThemeLoadStatic(Song.VideoIcon, 'SongVideoIcon');

+

       //Show Cat in TopLeft Mod

       ThemeLoadStatic(Song.StaticCat, 'SongStaticCat');

       ThemeLoadText(Song.TextCat, 'SongTextCat');

@@ -1020,6 +1029,7 @@ begin
       ThemeLoadStatic(Song.StaticTeam3Joker4, 'SongStaticTeam3Joker4');

       ThemeLoadStatic(Song.StaticTeam3Joker5, 'SongStaticTeam3Joker5');

 

+

       // Sing

       ThemeLoadBasic(Sing, 'Sing');

 

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 6f3bbc63..4fe679f7 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -13,6 +13,9 @@ type
       TextTitle:    integer;

       TextNumber:   integer;

 

+      //Video Icon Mod

+      VideoIcon:         Cardinal;

+

       TextCat:   integer;

       StaticCat: integer;

 

@@ -58,6 +61,7 @@ type
       StaticNonParty: Array of Cardinal;

       TextNonParty:   Array of Cardinal;

 

+

       constructor Create; override;

       procedure SetScroll;

       procedure SetScroll1;

@@ -1326,6 +1330,13 @@ begin
 

   inherited Draw;

 

+  //Draw Video Icon if Video is present

+  if CatSongs.Song[Interaction].Video <> '' then

+    Static[VideoIcon].Visible := True

+  else

+    Static[VideoIcon].Visible := False;

+

+

   //Draw Equalizer

   if Theme.Song.Equalizer.Visible then

     DrawEqualizer;

diff --git a/Skins/Deluxe/Autum.ini b/Skins/Deluxe/Autum.ini
index ad9dbdbe..4be2a132 100644
--- a/Skins/Deluxe/Autum.ini
+++ b/Skins/Deluxe/Autum.ini
@@ -34,6 +34,7 @@ IconSongMenu   = [icon]songmenu.jpg
 ScoreIcon      = [icon]score.jpg

 PartyIcon      = [icon]party.jpg

 StatIcon       = [icon]stats.jpg

+VideoIcon      = [icon]video.jpg

 

 IconError      = [icon]error.jpg

 IconQuestion   = [icon]question.jpg

diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index 6c45cfcc..7ef40741 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -34,6 +34,7 @@ IconSongMenu   = [icon]songmenu.jpg
 ScoreIcon      = [icon]score.jpg

 PartyIcon      = [icon]party.jpg

 StatIcon       = [icon]stats.jpg

+VideoIcon      = [icon]video.jpg

 

 IconError      = [icon]error.jpg

 IconQuestion   = [icon]question.jpg

diff --git a/Skins/Deluxe/Summer.ini b/Skins/Deluxe/Summer.ini
index 4e830766..72126d08 100644
--- a/Skins/Deluxe/Summer.ini
+++ b/Skins/Deluxe/Summer.ini
@@ -34,6 +34,7 @@ IconSongMenu   = [icon]songmenu.jpg
 ScoreIcon      = [icon]score.jpg

 PartyIcon      = [icon]party.jpg

 StatIcon       = [icon]stats.jpg

+VideoIcon      = [icon]video.jpg

 

 IconError      = [icon]error.jpg

 IconQuestion   = [icon]question.jpg

diff --git a/Skins/Deluxe/Winter.ini b/Skins/Deluxe/Winter.ini
index 93f95b88..00db0467 100644
--- a/Skins/Deluxe/Winter.ini
+++ b/Skins/Deluxe/Winter.ini
@@ -34,6 +34,7 @@ IconSongMenu   = [icon]songmenu.jpg
 ScoreIcon      = [icon]score.jpg

 PartyIcon      = [icon]party.jpg

 StatIcon       = [icon]stats.jpg

+VideoIcon      = [icon]video.jpg

 

 IconError      = [icon]error.jpg

 IconQuestion   = [icon]question.jpg

diff --git a/Skins/Deluxe/[icon]video.jpg b/Skins/Deluxe/[icon]video.jpg
new file mode 100644
index 00000000..12d71add
--- /dev/null
+++ b/Skins/Deluxe/[icon]video.jpg
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index a0759ade..e20155c4 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -340,6 +340,15 @@ Space=1
 Bands=5

 Length=18

 

+[SongVideoIcon]

+X =140

+Y =495

+W =32

+H =32

+Color=White

+Tex =VideoIcon

+Type=Font Black

+

 [SongStatic1]

 X =0

 Y =549

@@ -419,7 +428,6 @@ Size =8
 Align =2

 Text=

 

-

 #Variable statics and texts for song-screen in sing- and partymode

 # There can be an unlimited Number of Statics and Texts, As long 

 # as the numbers are in order.

@@ -838,6 +846,7 @@ TexY1=0
 TexX2=1

 TexY2=1

 

+

 [Sing]

 Texts =1