aboutsummaryrefslogtreecommitdiffstats
path: root/Game
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-17 14:15:50 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-17 14:15:50 +0000
commit8c035bb950519a86c90f64aab7c58aa98089569c (patch)
treeb96c53209160395864a2e52aa821df46077a949c /Game
parentd52cb874cd39eac4a4aff100c22bf3280eea4275 (diff)
downloadusdx-8c035bb950519a86c90f64aab7c58aa98089569c.tar.gz
usdx-8c035bb950519a86c90f64aab7c58aa98089569c.tar.xz
usdx-8c035bb950519a86c90f64aab7c58aa98089569c.zip
Some Code Cleanup in UScreenSong
Fixed VideoIcon Display git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@213 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game')
-rw-r--r--Game/Code/Screens/UScreenSong.pas28
1 files changed, 8 insertions, 20 deletions
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 4fe679f7..82dad1ed 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -664,9 +664,6 @@ var
begin
inherited Create;
-// AddStatic(200, 10, 400, 90, Skin.SelectSong);
-// AddStatic(200-10, 140-5, 400+20, 50+10, Skin.Selection, 'JPG', 'Font Gray');
-
LoadFromTheme(Theme.Song);
TextArtist := AddText(Theme.Song.TextArtist);
@@ -677,6 +674,9 @@ begin
TextCat := AddText(Theme.Song.TextCat);
StaticCat := AddStatic(Theme.Song.StaticCat);
+ //Show Video Icon Mod
+ VideoIcon := AddStatic(Theme.Song.VideoIcon);
+
//Party Mode
StaticTeam1Joker1 := AddStatic(Theme.Song.StaticTeam1Joker1);
StaticTeam1Joker2 := AddStatic(Theme.Song.StaticTeam1Joker2);
@@ -748,21 +748,12 @@ begin
AddButton(300 + Pet*250, 140, 200, 200, CatSongs.Song[Pet].Path + CatSongs.Song[Pet].Cover, 'JPG', 'Plain', Theme.Song.Cover.Reflections);
end;
Texture.Limit := 1024*1024;
-
-
-// AddButtonText(11, 10, CatSongs.Song[Pet].Title); // new way
end;
-// Covers.Save;
- { if Length(CatSongs.Song) > 0 then // setting to first song
- Interaction := 0
- else begin // no song detected
- AddButton(400-200, 140, 400, 50, Skin.Button, 'JPG', 'Transparent Range');
- AddButtonText(11, 10, 'No songs detected');
- end;}
+
// Randomize Patch
- Randomize;
+ Randomize;
//Equalizer
SetLength(EqualizerBands, Theme.Song.Equalizer.Bands);
//ClearArray
@@ -788,6 +779,9 @@ begin
end;
else SetScroll4;
end;
+ //Set Visibility of Video Icon
+ Static[VideoIcon].Visible := (CatSongs.Song[Interaction].Video <> '');
+
//Set Texts:
Text[TextArtist].Text := CatSongs.Song[Interaction].Artist;
Text[TextTitle].Text := CatSongs.Song[Interaction].Title;
@@ -1330,12 +1324,6 @@ 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