diff options
| author | Niels Martin Hansen <nielsm@indvikleren.dk> | 2018-03-21 17:12:29 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2018-06-05 22:58:35 +0200 |
| commit | a8080f14a9c75a1175976ee8d0cd17c677b55119 (patch) | |
| tree | dc57362c439d6958f01c680f8f538da28fd3bf4e /src/music/dmusic.cpp | |
| parent | 458e441a4ca5d451941958e056189a059f2eee76 (diff) | |
| download | openttd-a8080f14a9c75a1175976ee8d0cd17c677b55119.tar.xz | |
Change: DOS music loading for non-Windows music drivers
Diffstat (limited to 'src/music/dmusic.cpp')
| -rw-r--r-- | src/music/dmusic.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp index b874924f2..ce76d22ef 100644 --- a/src/music/dmusic.cpp +++ b/src/music/dmusic.cpp @@ -1228,11 +1228,10 @@ void MusicDriver_DMusic::Stop() void MusicDriver_DMusic::PlaySong(const MusicSongInfo &song) { - if (song.filetype != MTT_STANDARDMIDI) return; - ThreadMutexLocker lock(_thread_mutex); - _playback.next_file.LoadFile(song.filename); + if (!_playback.next_file.LoadSong(song)) return; + _playback.next_segment.start = 0; _playback.next_segment.end = 0; _playback.next_segment.loop = false; |