aboutsummaryrefslogtreecommitdiffstats
path: root/src/screens/UScreenSong.pas
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-02-23 15:47:29 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-02-23 15:47:29 +0000
commit09cb93c06202febc160b644b384a8d7d29978c04 (patch)
treeb16975f0c3e26ce1d2cdb793f6edaa8c824fb977 /src/screens/UScreenSong.pas
parentfb364dd193945e9027df807b4648e1f325b43d35 (diff)
downloadusdx-09cb93c06202febc160b644b384a8d7d29978c04.tar.gz
usdx-09cb93c06202febc160b644b384a8d7d29978c04.tar.xz
usdx-09cb93c06202febc160b644b384a8d7d29978c04.zip
medley mod: Themes modifications. This is considered the last part of the medley mod.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2946 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/screens/UScreenSong.pas')
-rw-r--r--src/screens/UScreenSong.pas27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
index 7558a59b..50efd792 100644
--- a/src/screens/UScreenSong.pas
+++ b/src/screens/UScreenSong.pas
@@ -78,6 +78,10 @@ type
//Video Icon Mod
VideoIcon: cardinal;
+ //Medley Icons
+ MedleyIcon: cardinal;
+ CalcMedleyIcon: cardinal;
+
TextCat: integer;
StaticCat: integer;
@@ -425,13 +429,6 @@ begin
Ord('S'):
begin
- Log.LogError('SDL_ModState: ' + inttostr(SDL_ModState));
- Log.LogError('KMOD_LSHIFT: ' + inttostr(KMOD_LSHIFT));
- Log.LogError('CatSongs.Song[Interaction].Medley.Source: ' + inttostr(ord(CatSongs.Song[Interaction].Medley.Source)));
- Log.LogError('msCalculated: ' + inttostr(ord(msCalculated)));
- Log.LogError('msTag: ' + inttostr(ord(msTag)));
- Log.LogError('Mode: ' + inttostr(ord(Mode)));
- Log.LogError('smNormal: ' + inttostr(ord(smNormal)));
if //(SDL_ModState = KMOD_LSHIFT) and
(CatSongs.Song[Interaction].Medley.Source >= msCalculated) and (Mode = smNormal) then
StartMedley(0, msCalculated)
@@ -441,14 +438,6 @@ begin
Ord('D'):
begin
- Log.LogError('SDL_ModState: ' + inttostr(SDL_ModState));
- Log.LogError('KMOD_LSHIFT: ' + inttostr(KMOD_LSHIFT));
- Log.LogError('length(getVisibleMedleyArr(msCalculated)): ' + inttostr(length(getVisibleMedleyArr(msCalculated))));
- Log.LogError('msCalculated: ' + inttostr(ord(msCalculated)));
- Log.LogError('msTag: ' + inttostr(ord(msTag)));
- Log.LogError('Length(getVisibleMedleyArr(msTag)): ' + inttostr(Length(getVisibleMedleyArr(msTag))));
- Log.LogError('smNormal: ' + inttostr(ord(smNormal)));
- Log.LogError('Mode: ' + inttostr(ord(Mode)));
if (Mode = smNormal) and //(SDL_ModState = KMOD_LSHIFT) and
(length(getVisibleMedleyArr(msCalculated)) > 0) then
StartMedley(5, msCalculated)
@@ -881,6 +870,10 @@ begin
//Show Video Icon Mod
VideoIcon := AddStatic(Theme.Song.VideoIcon);
+ //Medley Icons
+ MedleyIcon := AddStatic(Theme.Song.MedleyIcon);
+ CalcMedleyIcon := AddStatic(Theme.Song.CalculatedMedleyIcon);
+
//Party Mode
StaticTeam1Joker1 := AddStatic(Theme.Song.StaticTeam1Joker1);
StaticTeam1Joker2 := AddStatic(Theme.Song.StaticTeam1Joker2);
@@ -1042,6 +1035,10 @@ begin
// Set visibility of video icon
Statics[VideoIcon].Visible := CatSongs.Song[Interaction].Video.IsSet;
+ // Set visibility of medley icons
+ Statics[MedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msTag);
+ Statics[CalcMedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msCalculated);
+
// Set texts
Text[TextArtist].Text := CatSongs.Song[Interaction].Artist;
Text[TextTitle].Text := CatSongs.Song[Interaction].Title;