equal
deleted
inserted
replaced
414 var s: shortstring; |
414 var s: shortstring; |
415 begin |
415 begin |
416 if (not isSoundEnabled) or (MusicFN = '') or (not isMusicEnabled) then |
416 if (not isSoundEnabled) or (MusicFN = '') or (not isMusicEnabled) then |
417 exit; |
417 exit; |
418 |
418 |
419 s:= UserPathPrefix + '/Data/Music/' + MusicFN; |
419 s:= '/Music/' + MusicFN; |
420 if not FileExists(s) then |
|
421 s:= PathPrefix + '/Music/' + MusicFN; |
|
422 WriteToConsole(msgLoading + s + ' '); |
420 WriteToConsole(msgLoading + s + ' '); |
423 |
421 |
424 Mus:= Mix_LoadMUS(Str2PChar(s)); |
422 Mus:= Mix_LoadMUS_RW(rwopsOpenRead(s)); |
425 SDLTry(Mus <> nil, false); |
423 SDLTry(Mus <> nil, false); |
426 WriteLnToConsole(msgOK); |
424 WriteLnToConsole(msgOK); |
427 |
425 |
428 SDLTry(Mix_FadeInMusic(Mus, -1, 3000) <> -1, false) |
426 SDLTry(Mix_FadeInMusic(Mus, -1, 3000) <> -1, false) |
429 end; |
427 end; |