summaryrefslogtreecommitdiff
path: root/src/gfxinit.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/gfxinit.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/gfxinit.cpp')
-rw-r--r--src/gfxinit.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 9edaadc39..0e4e2e89f 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -248,7 +248,7 @@ void GfxLoadSprites()
bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path, const char *full_filename)
{
- bool ret = this->BaseSet<GraphicsSet, MAX_GFT, BASESET_DIR>::FillSetDetails(ini, path, full_filename, false);
+ bool ret = this->BaseSet<GraphicsSet, MAX_GFT, true>::FillSetDetails(ini, path, full_filename, false);
if (ret) {
IniGroup *metadata = ini->GetGroup("metadata");
IniItem *item;
@@ -299,8 +299,8 @@ MD5File::ChecksumResult MD5File::CheckMD5(Subdirectory subdir) const
static const char * const _graphics_file_names[] = { "base", "logos", "arctic", "tropical", "toyland", "extra" };
/** Implementation */
-template <class T, size_t Tnum_files, Subdirectory Tsubdir>
-/* static */ const char * const *BaseSet<T, Tnum_files, Tsubdir>::file_names = _graphics_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 = _graphics_file_names;
template <class Tbase_set>
/* static */ bool BaseMedia<Tbase_set>::DetermineBestSet()