diff options
| author | rubidium <rubidium@openttd.org> | 2011-08-25 10:31:35 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-08-25 10:31:35 +0000 |
| commit | 672df52e0c2e2192f7b63acfdbcd6e4f0fa457bf (patch) | |
| tree | b24178a6cdfbd27b4f6d455badff4e9794bb8ebf | |
| parent | 41169291e399771ef807777c8706b0d4b94d6448 (diff) | |
| download | openttd-672df52e0c2e2192f7b63acfdbcd6e4f0fa457bf.tar.xz | |
(svn r22835) -Codechange: keep track of the subdirectory we are looking through in the file scanner
| -rw-r--r-- | src/fileio.cpp | 2 | ||||
| -rw-r--r-- | src/fileio_func.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/fileio.cpp b/src/fileio.cpp index 9f3d7ea94..86714d108 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -1317,6 +1317,8 @@ static uint ScanTar(FileScanner *fs, const char *extension, TarFileList::iterato */ uint FileScanner::Scan(const char *extension, Subdirectory sd, bool tars, bool recursive) { + this->subdir = sd; + Searchpath sp; char path[MAX_PATH]; TarFileList::iterator tar; diff --git a/src/fileio_func.h b/src/fileio_func.h index 162ad3b1c..30aa997ae 100644 --- a/src/fileio_func.h +++ b/src/fileio_func.h @@ -67,8 +67,9 @@ bool ExtractTar(const char *tar_filename); extern char *_personal_dir; ///< custom directory for personal settings, saves, newgrf, etc. /** Helper for scanning for files with a given name */ -class FileScanner -{ +class FileScanner { +protected: + Subdirectory subdir; ///< The current sub directory we are searching through public: /** Destruct the proper one... */ virtual ~FileScanner() {} |