summaryrefslogtreecommitdiff
path: root/src/music.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-11-14 19:24:22 +0000
committerrubidium <rubidium@openttd.org>2011-11-14 19:24:22 +0000
commit15f671279df2696aad13aca3d431ee4a988694f3 (patch)
treea5e7c7e76c564885310f30ef3372819d30e0b2a7 /src/music.cpp
parenta06443774fb8cc21631a3e76bca4d1c03913303b (diff)
downloadopenttd-15f671279df2696aad13aca3d431ee4a988694f3.tar.xz
(svn r23214) -Codechange: for base media sets pass the "search in tars" parameter to determine what to do
Diffstat (limited to 'src/music.cpp')
-rw-r--r--src/music.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/music.cpp b/src/music.cpp
index de642cc30..55599a947 100644
--- a/src/music.cpp
+++ b/src/music.cpp
@@ -27,8 +27,8 @@ static const char * const _music_file_names[] = {
/** Make sure we aren't messing things up. */
assert_compile(lengthof(_music_file_names) == NUM_SONGS_AVAILABLE);
-template <class T, size_t Tnum_files, Subdirectory Tsubdir>
-/* static */ const char * const *BaseSet<T, Tnum_files, Tsubdir>::file_names = _music_file_names;
+template <class T, size_t Tnum_files, bool Tsearch_in_tars>
+/* static */ const char * const *BaseSet<T, Tnum_files, Tsearch_in_tars>::file_names = _music_file_names;
template <class Tbase_set>
/* static */ const char *BaseMedia<Tbase_set>::GetExtension()
@@ -60,7 +60,7 @@ template <class Tbase_set>
bool MusicSet::FillSetDetails(IniFile *ini, const char *path, const char *full_filename)
{
- bool ret = this->BaseSet<MusicSet, NUM_SONGS_AVAILABLE, GM_DIR>::FillSetDetails(ini, path, full_filename);
+ bool ret = this->BaseSet<MusicSet, NUM_SONGS_AVAILABLE, false>::FillSetDetails(ini, path, full_filename);
if (ret) {
this->num_available = 0;
IniGroup *names = ini->GetGroup("names");