diff options
author | rubidium <rubidium@openttd.org> | 2011-11-14 21:34:27 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-11-14 21:34:27 +0000 |
commit | 2b897b4fa0dd22334ba21a96ca7df5960b2c3355 (patch) | |
tree | 9574e5285750ecad60b076cb8d0cca35b631129e /src/music_gui.cpp | |
parent | 9e7174e5406cf59a7f0ae79c6dc280b1958ef95d (diff) | |
download | openttd-2b897b4fa0dd22334ba21a96ca7df5960b2c3355.tar.xz |
(svn r23219) -Change: different directories for basesets and newgrfs. So data to baseset or newgrf, and gm to baseset
Diffstat (limited to 'src/music_gui.cpp')
-rw-r--r-- | src/music_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 5d0f2534b..2c9d474f8 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -178,7 +178,7 @@ static void MusicVolumeChanged(byte new_vol) static void DoPlaySong() { char filename[MAX_PATH]; - FioFindFullPath(filename, lengthof(filename), GM_DIR, + FioFindFullPath(filename, lengthof(filename), BASESET_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename); _music_driver->PlaySong(filename); SetWindowDirty(WC_MUSIC_WINDOW, 0); @@ -200,7 +200,7 @@ static void SelectSongToPlay() const char *filename = BaseMusic::GetUsedSet()->files[_playlists[_settings_client.music.playlist][i] - 1].filename; /* We are now checking for the existence of that file prior * to add it to the list of available songs */ - if (!StrEmpty(filename) && FioCheckFileExists(filename, GM_DIR)) { + if (!StrEmpty(filename) && FioCheckFileExists(filename, BASESET_DIR)) { _cur_playlist[j] = _playlists[_settings_client.music.playlist][i]; j++; } |