(svn r23219) -Change: different directories for basesets and newgrfs. So data to baseset or newgrf, and gm to baseset

This commit is contained in:
rubidium
2011-11-14 21:34:27 +00:00
parent 9e7174e540
commit 2b897b4fa0
6 changed files with 31 additions and 14 deletions

View File

@@ -164,8 +164,9 @@ public:
static uint FindSets()
{
BaseMedia<Tbase_set> fs;
/* Searching in tars is only done in the sound and graphics base sets. */
return fs.Scan(GetExtension(), Tbase_set::SEARCH_IN_TARS ? BASESET_DIR : GM_DIR, Tbase_set::SEARCH_IN_TARS);
/* Searching in tars is only done in the old "data" directories basesets. */
uint num = fs.Scan(GetExtension(), Tbase_set::SEARCH_IN_TARS ? OLD_DATA_DIR : OLD_GM_DIR, Tbase_set::SEARCH_IN_TARS);
return num + fs.Scan(GetExtension(), BASESET_DIR, Tbase_set::SEARCH_IN_TARS);
}
static bool SetSet(const char *name);