diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-08-15 11:14:42 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-08-15 11:14:42 +0000 |
| commit | b313d7ec423dc118e7195e2f5873d9cbfa2d2411 (patch) | |
| tree | 629a8a0a23c8519757b474727ab92d41a94bc6b8 | |
| parent | 0d382c7708e1b087f35b6d4ea5fc795df52c2a22 (diff) | |
| download | usdx-b313d7ec423dc118e7195e2f5873d9cbfa2d2411.tar.gz usdx-b313d7ec423dc118e7195e2f5873d9cbfa2d2411.tar.xz usdx-b313d7ec423dc118e7195e2f5873d9cbfa2d2411.zip | |
check if a song file was loaded in singscreen and load it if not
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2610 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | Game/Code/Screens/UScreenSing.pas | 3 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSong.pas | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index f840a465..e8884329 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -1344,6 +1344,9 @@ begin Player[I].VoiceFile := '';
end;
+ if not Music.isOpen then
+ Music.Open(CatSongs.Song[CatSongs.Selected].Path + CatSongs.Song[CatSongs.Selected].Mp3);
+
AktSong := CatSongs.Song[CatSongs.Selected];
try
if not LoadSong(CatSongs.Song[CatSongs.Selected].Path + CatSongs.Song[CatSongs.Selected].FileName, SONG_LOAD_COMPLETE) then
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 33018783..6b5792d2 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -3639,7 +3639,8 @@ procedure TScreenSong.StartSong; begin
WaitHandler.changed := false;
CatSongs.Selected := Interaction;
- Music.Stop;
+ if (Music.isOpen) then
+ Music.Stop;
//Party Mode
if (Mode = smParty) or (Mode = smChallenge) then
begin
|