mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11109) -Fix r11106: it is silly to use a std::list for something that is cleary a std::vector (less memory ;) WHOHO!)

release/0.6
truelight 2007-09-14 23:03:28 +00:00
parent e8ff9ee982
commit f438dcdd67
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fileio.cpp
View File

@ -204,7 +204,7 @@ const char *_subdirs[NUM_SUBDIRS] = {
}; };
const char *_searchpaths[NUM_SEARCHPATHS]; const char *_searchpaths[NUM_SEARCHPATHS];
std::list<const char *> _tar_list; std::vector<const char *> _tar_list;
/** /**
* Check whether the given file exists * Check whether the given file exists

6
src/fileio.h
View File

@ -6,7 +6,7 @@
#define FILEIO_H #define FILEIO_H
#include "helpers.hpp" #include "helpers.hpp"
#include <list> #include <vector>
void FioSeekTo(uint32 pos, int mode); void FioSeekTo(uint32 pos, int mode);
void FioSeekToFile(uint8 slot, uint32 pos); void FioSeekToFile(uint8 slot, uint32 pos);
@ -64,7 +64,7 @@ extern const char *_searchpaths[NUM_SEARCHPATHS];
/** /**
* All the tar-files OpenTTD could search through. * 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 * 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 */ /** 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_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); 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); FILE *FioTarFileList(const char *tar, const char *mode, size_t *filesize, FioTarFileListCallback *callback, void *userdata);