summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-01-16 16:32:48 +0000
committerrubidium <rubidium@openttd.org>2009-01-16 16:32:48 +0000
commit3fb43b6bcb19b51ccb17e2c89eae4b4f63bff1c3 (patch)
tree04972b00b0bc45f334322887257c3f52614c7b6a
parent7c51d9f429ec70b81b045eea102e0f1ba4dc0a54 (diff)
downloadopenttd-3fb43b6bcb19b51ccb17e2c89eae4b4f63bff1c3.tar.xz
(svn r15113) -Codechange: unify calling ScanForTarFiles when determining the paths.
-rw-r--r--src/fileio.cpp4
-rw-r--r--src/win32.cpp3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/fileio.cpp b/src/fileio.cpp
index 86e2f93b6..744da2e21 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -882,8 +882,6 @@ extern void cocoaSetApplicationBundleDir();
#else
_searchpaths[SP_APPLICATION_BUNDLE_DIR] = NULL;
#endif
-
- ScanForTarFiles();
}
#endif /* defined(WIN32) || defined(WINCE) */
@@ -952,6 +950,8 @@ void DeterminePaths(const char *exe)
free(save_dir);
free(autosave_dir);
+
+ ScanForTarFiles();
}
/**
diff --git a/src/win32.cpp b/src/win32.cpp
index f57ed5052..56f2ce1cf 100644
--- a/src/win32.cpp
+++ b/src/win32.cpp
@@ -1045,7 +1045,6 @@ char *getcwd(char *buf, size_t size)
void DetermineBasePaths(const char *exe)
{
- extern void ScanForTarFiles();
char tmp[MAX_PATH];
TCHAR path[MAX_PATH];
#ifdef WITH_PERSONAL_DIR
@@ -1091,8 +1090,6 @@ void DetermineBasePaths(const char *exe)
_searchpaths[SP_INSTALLATION_DIR] = NULL;
_searchpaths[SP_APPLICATION_BUNDLE_DIR] = NULL;
-
- ScanForTarFiles();
}
/**