(svn r11109) -Fix r11106: it is silly to use a std::list for something that is cleary a std::vector (less memory ;) WHOHO!)
authortruelight
Fri, 14 Sep 2007 23:03:28 +0000
changeset 8080 82f577c50067
parent 8079 037a8b09887c
child 8081 392997d1f284
(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
src/fileio.h
--- a/src/fileio.cpp	Fri Sep 14 22:35:39 2007 +0000
+++ b/src/fileio.cpp	Fri Sep 14 23:03:28 2007 +0000
@@ -204,7 +204,7 @@
 };
 
 const char *_searchpaths[NUM_SEARCHPATHS];
-std::list<const char *> _tar_list;
+std::vector<const char *> _tar_list;
 
 /**
  * Check whether the given file exists
--- a/src/fileio.h	Fri Sep 14 22:35:39 2007 +0000
+++ b/src/fileio.h	Fri Sep 14 23:03:28 2007 +0000
@@ -6,7 +6,7 @@
 #define FILEIO_H
 
 #include "helpers.hpp"
-#include <list>
+#include <vector>
 
 void FioSeekTo(uint32 pos, int mode);
 void FioSeekToFile(uint8 slot, uint32 pos);
@@ -64,7 +64,7 @@
 /**
  * All the tar-files OpenTTD could search through.
  */
-extern std::list<const char *>_tar_list;
+extern std::vector<const char *>_tar_list;
 
 /**
  * Checks whether the given search path is a valid search path
@@ -78,7 +78,7 @@
 
 /** 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<const char *>::iterator it = _tar_list.begin(); it != _tar_list.end(); it++) if (tar = *it, true)
+#define FOR_ALL_TARS(tar) for (std::vector<const char *>::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);