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/base_media_func.h | |
| 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/base_media_func.h')
| -rw-r--r-- | src/base_media_func.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base_media_func.h b/src/base_media_func.h index c5b07fb4c..1070ead61 100644 --- a/src/base_media_func.h +++ b/src/base_media_func.h @@ -131,7 +131,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const file->missing_warning = strdup(item->value); } - switch (file->CheckMD5(Tsearch_in_tars ? BASESET_DIR : GM_DIR)) { + switch (file->CheckMD5(BASESET_DIR)) { case MD5File::CR_MATCH: this->valid_files++; /* FALL THROUGH */ @@ -155,7 +155,7 @@ bool BaseMedia<Tbase_set>::AddFile(const char *filename, size_t basepath_length, Tbase_set *set = new Tbase_set(); IniFile *ini = new IniFile(); - ini->LoadFromDisk(filename, Tbase_set::SEARCH_IN_TARS ? BASESET_DIR : GM_DIR); + ini->LoadFromDisk(filename, BASESET_DIR); char *path = strdup(filename + basepath_length); char *psep = strrchr(path, PATHSEPCHAR); |