diff options
author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-10-15 22:16:48 +0000 |
---|---|---|
committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-10-15 22:16:48 +0000 |
commit | 85bfeda53c2ace946d89a5edcb7c01a8a5ad7a10 (patch) | |
tree | 89340bf3bcf31ff8037427b3fac5226f4605d343 /medley_new/src/screens/UScreenSong.pas | |
parent | a1db18bc7cce48620534c2d6a0f9589d1dd8a95e (diff) | |
download | usdx-85bfeda53c2ace946d89a5edcb7c01a8a5ad7a10.tar.gz usdx-85bfeda53c2ace946d89a5edcb7c01a8a5ad7a10.tar.xz usdx-85bfeda53c2ace946d89a5edcb7c01a8a5ad7a10.zip |
- medley songs are startable now (press S in songscreen)
todo: medley fadeout in screensing, edit screenscore and themes
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2668 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'medley_new/src/screens/UScreenSong.pas')
-rw-r--r-- | medley_new/src/screens/UScreenSong.pas | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/medley_new/src/screens/UScreenSong.pas b/medley_new/src/screens/UScreenSong.pas index 9b741788..716cfb0c 100644 --- a/medley_new/src/screens/UScreenSong.pas +++ b/medley_new/src/screens/UScreenSong.pas @@ -423,6 +423,24 @@ begin Exit; end; + Ord('S'): + begin + if (SDL_ModState = KMOD_LSHIFT) and + (CatSongs.Song[Interaction].Medley.Source>=msCalculated) and (Mode = smNormal)then + StartMedley(0, msCalculated) + else if (CatSongs.Song[Interaction].Medley.Source>=msTag) and (Mode = smNormal) then + StartMedley(0, msTag); + end; + + Ord('D'): + begin + if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT) and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(5, msCalculated) + else if (Mode = smNormal) and (Length(getVisibleMedleyArr(msTag)) > 0) then + StartMedley(5, msTag); + end; + Ord('R'): begin if (Songs.SongList.Count > 0) and @@ -1526,6 +1544,8 @@ begin // reset Medley-Playlist SetLength(PlaylistMedley.Song, 0); + if Mode = smMedley then + Mode := smNormal; if Ini.Players <= 3 then PlayersPlay := Ini.Players + 1; if Ini.Players = 4 then PlayersPlay := 6; |