diff options
| author | rubidium <rubidium@openttd.org> | 2011-08-24 13:33:49 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-08-24 13:33:49 +0000 |
| commit | 0061b5f1842776ff4d69bf9f3bcdfb348b2f5a76 (patch) | |
| tree | 3f45b215933b577fb159c9df743926ebdca1d126 /src/fileio.cpp | |
| parent | bbdc8fdba7d30099d80227659919930f3dedf84b (diff) | |
| download | openttd-0061b5f1842776ff4d69bf9f3bcdfb348b2f5a76.tar.xz | |
(svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory
Diffstat (limited to 'src/fileio.cpp')
| -rw-r--r-- | src/fileio.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/fileio.cpp b/src/fileio.cpp index 2215f3705..4bc475857 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -267,7 +267,7 @@ void FioOpenFile(int slot, const char *filename) FioSeekToFile(slot, pos); } -static const char * const _subdirs[NUM_SUBDIRS] = { +static const char * const _subdirs[] = { "", "save" PATHSEP, "save" PATHSEP "autosave" PATHSEP, @@ -275,10 +275,12 @@ static const char * const _subdirs[NUM_SUBDIRS] = { "scenario" PATHSEP "heightmap" PATHSEP, "gm" PATHSEP, "data" PATHSEP, + "data" PATHSEP, "lang" PATHSEP, "ai" PATHSEP, "ai" PATHSEP "library" PATHSEP, }; +assert_compile(lengthof(_subdirs) == NUM_SUBDIRS); const char *_searchpaths[NUM_SEARCHPATHS]; TarList _tar_list; @@ -636,7 +638,7 @@ static void SimplifyFileName(char *name) DEBUG(misc, 1, "Scanning for tars"); TarScanner fs; - uint num = fs.Scan(".tar", DATA_DIR, false); + uint num = fs.Scan(".tar", NEWGRF_DIR, false); num += fs.Scan(".tar", AI_DIR, false); num += fs.Scan(".tar", AI_LIBRARY_DIR, false); num += fs.Scan(".tar", SCENARIO_DIR, false); @@ -1156,7 +1158,7 @@ void DeterminePaths(const char *exe) FioCreateDirectory(_searchpaths[SP_AUTODOWNLOAD_DIR]); /* Create the directory for each of the types of content */ - const Subdirectory dirs[] = { SCENARIO_DIR, HEIGHTMAP_DIR, DATA_DIR, AI_DIR, AI_LIBRARY_DIR, GM_DIR }; + const Subdirectory dirs[] = { SCENARIO_DIR, HEIGHTMAP_DIR, NEWGRF_DIR, AI_DIR, AI_LIBRARY_DIR, GM_DIR }; for (uint i = 0; i < lengthof(dirs); i++) { char *tmp = str_fmt("%s%s", _searchpaths[SP_AUTODOWNLOAD_DIR], _subdirs[dirs[i]]); FioCreateDirectory(tmp); |