From 357783eb1e0c8a80e29f6adba99ead89136ac43f Mon Sep 17 00:00:00 2001 From: truelight Date: Fri, 14 Sep 2007 23:03:28 +0000 Subject: (svn r11109) -Fix r11106: it is silly to use a std::list for something that is cleary a std::vector (less memory ;) WHOHO!) --- src/fileio.cpp | 2 +- src/fileio.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fileio.cpp b/src/fileio.cpp index f4d7e847f..c1542f81e 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -204,7 +204,7 @@ const char *_subdirs[NUM_SUBDIRS] = { }; const char *_searchpaths[NUM_SEARCHPATHS]; -std::list _tar_list; +std::vector _tar_list; /** * Check whether the given file exists diff --git a/src/fileio.h b/src/fileio.h index 426226399..a6556def4 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -6,7 +6,7 @@ #define FILEIO_H #include "helpers.hpp" -#include +#include void FioSeekTo(uint32 pos, int mode); void FioSeekToFile(uint8 slot, uint32 pos); @@ -64,7 +64,7 @@ extern const char *_searchpaths[NUM_SEARCHPATHS]; /** * All the tar-files OpenTTD could search through. */ -extern std::list_tar_list; +extern std::vector_tar_list; /** * Checks whether the given search path is a valid search path @@ -78,7 +78,7 @@ static inline bool IsValidSearchPath(Searchpath sp) /** Iterator for all the search paths */ #define FOR_ALL_SEARCHPATHS(sp) for (sp = SP_FIRST_DIR; sp < NUM_SEARCHPATHS; sp++) if (IsValidSearchPath(sp)) -#define FOR_ALL_TARS(tar) for (std::list::iterator it = _tar_list.begin(); it != _tar_list.end(); it++) if (tar = *it, true) +#define FOR_ALL_TARS(tar) for (std::vector::iterator it = _tar_list.begin(); it != _tar_list.end(); it++) if (tar = *it, true) 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); -- cgit v1.2.3-70-g09d2