changeset 18026:eace4d79d513 draft

(svn r22835) -Codechange: keep track of the subdirectory we are looking through in the file scanner
author rubidium <rubidium@openttd.org>
date Thu, 25 Aug 2011 10:31:35 +0000
parents 7a87d9ed25a1
children fecb76e733cd
files src/fileio.cpp src/fileio_func.h
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -1317,6 +1317,8 @@
  */
 uint FileScanner::Scan(const char *extension, Subdirectory sd, bool tars, bool recursive)
 {
+	this->subdir = sd;
+
 	Searchpath sp;
 	char path[MAX_PATH];
 	TarFileList::iterator tar;
--- a/src/fileio_func.h
+++ b/src/fileio_func.h
@@ -67,8 +67,9 @@
 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() {}