diff options
| author | glx <glx@openttd.org> | 2011-12-04 14:17:51 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2011-12-04 14:17:51 +0000 |
| commit | 634796b86059af099c2b75870d6bd006334a2c20 (patch) | |
| tree | 5c9d5fb5ce7f2e741b77afdaa1793a83ae1ce2ed | |
| parent | 8b5d315d2a89f36dd06ec2f5c9b1c600767039ee (diff) | |
| download | openttd-634796b86059af099c2b75870d6bd006334a2c20.tar.xz | |
(svn r23430) -Fix (r23219): also consider the old directories when playing a song
| -rw-r--r-- | src/music_gui.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 2c9d474f8..846c2bcb6 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -178,8 +178,9 @@ static void MusicVolumeChanged(byte new_vol) static void DoPlaySong() { char filename[MAX_PATH]; - FioFindFullPath(filename, lengthof(filename), BASESET_DIR, - BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename); + if (FioFindFullPath(filename, lengthof(filename), BASESET_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename) == NULL) { + FioFindFullPath(filename, lengthof(filename), OLD_GM_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename); + } _music_driver->PlaySong(filename); SetWindowDirty(WC_MUSIC_WINDOW, 0); } |