changeset 6944:25662c569a92 draft

(svn r10198) -Fix (r10194): did not search all search paths.
author rubidium <rubidium@openttd.org>
date Mon, 18 Jun 2007 11:04:12 +0000
parents fd42cb9816c6
children e5df6d35abac
files src/fileio.h
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/fileio.h
+++ b/src/fileio.h
@@ -40,12 +40,13 @@
  * Types of searchpaths OpenTTD might use
  */
 enum Searchpath {
-	SP_WORKING_DIR,            ///< Search in the working directory
-	SP_PERSONAL_DIR,           ///< Search in the personal directory
-	SP_SHARED_DIR,             ///< Search in the shared directory, like 'Shared Files' under Windows
-	SP_BINARY_DIR,             ///< Search in the directory where the binary resides
-	SP_INSTALLATION_DIR,       ///< Search in the installation directory
-	SP_APPLICATION_BUNDLE_DIR, ///< Search within the application bundle
+	SP_FIRST_DIR,
+	SP_WORKING_DIR = SP_FIRST_DIR, ///< Search in the working directory
+	SP_PERSONAL_DIR,               ///< Search in the personal directory
+	SP_SHARED_DIR,                 ///< Search in the shared directory, like 'Shared Files' under Windows
+	SP_BINARY_DIR,                 ///< Search in the directory where the binary resides
+	SP_INSTALLATION_DIR,           ///< Search in the installation directory
+	SP_APPLICATION_BUNDLE_DIR,     ///< Search within the application bundle
 	NUM_SEARCHPATHS
 };
 
@@ -70,7 +71,7 @@
 }
 
 /** Iterator for all the search paths */
-#define FOR_ALL_SEARCHPATHS(sp) for (sp = SP_PERSONAL_DIR; sp < NUM_SEARCHPATHS; sp++) if (IsValidSearchPath(sp))
+#define FOR_ALL_SEARCHPATHS(sp) for (sp = SP_FIRST_DIR; sp < NUM_SEARCHPATHS; sp++) if (IsValidSearchPath(sp))
 
 FILE *FioFOpenFile(const char *filename, const char *mode = "rb", Subdirectory subdir = DATA_DIR);
 bool FioCheckFileExists(const char *filename, Subdirectory subdir = DATA_DIR);