From 67adf766d039bbdcef84a55cf8d6767075f3073b Mon Sep 17 00:00:00 2001
From: yexo <yexo@openttd.org>
Date: Tue, 3 Aug 2010 13:32:02 +0000
Subject: [PATCH] (svn r20346) -Change: scan for tar files before scanning for
 AIs/NewGRFs so new AIs/NewGRFs inside a tar file are found

---
 src/ai/ai_scanner.cpp | 1 +
 src/newgrf_config.cpp | 2 ++
 src/tar_type.h        | 3 ---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 9d689a815b..d404270d98 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -25,6 +25,7 @@
 
 void AIScanner::RescanAIDir()
 {
+	TarScanner::DoScan();
 	this->ScanScriptDir("info.nut", AI_DIR);
 	this->ScanScriptDir("library.nut", AI_LIBRARY_DIR);
 }
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index 6807a5d5d1..b12c688aa0 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -549,6 +549,8 @@ void ScanNewGRFFiles()
 {
 	ClearGRFConfigList(&_all_grfs);
 
+	TarScanner::DoScan();
+
 	DEBUG(grf, 1, "Scanning for NewGRFs");
 	uint num = GRFFileScanner::DoScan();
 
diff --git a/src/tar_type.h b/src/tar_type.h
index 335b646d01..272ae5da45 100644
--- a/src/tar_type.h
+++ b/src/tar_type.h
@@ -40,7 +40,4 @@ extern TarFileList _tar_filelist;
 
 #define FOR_ALL_TARS(tar) for (tar = _tar_filelist.begin(); tar != _tar_filelist.end(); tar++)
 
-typedef bool FioTarFileListCallback(const char *filename, int size, void *userdata);
-FILE *FioTarFileList(const char *tar, const char *mode, size_t *filesize, FioTarFileListCallback *callback, void *userdata);
-
 #endif /* TAR_TYPE_H */