cpp/openttd-patchpack/source Changeset - r9581:57d6f584b7ea

Changeset - r9581:57d6f584b7ea

Parent rev.

Child rev.

[Not reviewed]

master

0 8 1

smatz - 16 years ago 2008-06-24 09:05:24
smatz@openttd.org

(svn r13618) -Codechange: move tar-specific declarations to separate file
Removes indirect dependency on <string> and <map> for over 40 files

9 files changed with 44 insertions and 22 deletions:

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/fileio.cpp

src/fileio.h

src/newgrf_config.cpp

src/settings_gui.cpp

src/tar_type.h

src/town_cmd.cpp

0 comments (0 inline, 0 general)

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -1456,6 +1456,10 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\tar_type.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\terraform_gui.h"
+				>
 			</File>

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -1453,6 +1453,10 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\tar_type.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\terraform_gui.h"
+				>
 			</File>

source.list

➞

Show inline comments

@@ @@ -289,6 +289,7 @@ string_func.h @@
 string_type.h
 strings_func.h
 strings_type.h
 tar_type.h
 terraform_gui.h
 textbuf_gui.h
 texteff.hpp

src/fileio.cpp

➞

Show inline comments

@@ @@ -11,6 +11,7 @@ @@
 #include "core/alloc_func.hpp"
 #include "core/math_func.hpp"
 #include "string_func.h"
 #include "tar_type.h"
 #ifdef WIN32
 #include <windows.h>
 #else

src/fileio.h

➞

Show inline comments

@@ @@ -5,8 +5,6 @@ @@
 #ifndef FILEIO_H
 #define FILEIO_H
 #include <map>
 #include <string>
 #include "core/enum_type.hpp"
 void FioSeekTo(size_t pos, int mode);
@@ @@ -63,22 +61,6 @@ DECLARE_POSTFIX_INCREMENT(Searchpath); @@
 extern const char *_searchpaths[NUM_SEARCHPATHS];
 /**
  * The define of a TarList.
  */
 struct TarListEntry {
 	const char *filename;
 };
 struct TarFileListEntry {
 	TarListEntry *tar;
 	size_t size;
 	size_t position;
 };
 typedef std::map<std::string, TarListEntry *> TarList;
 typedef std::map<std::string, TarFileListEntry> TarFileList;
 extern TarList _tar_list;
 extern TarFileList _tar_filelist;
 /**
  * Checks whether the given search path is a valid search path
  * @param sp the search path to check
  * @return true if the search path is valid
@@ @@ -90,10 +72,6 @@ static inline bool IsValidSearchPath(Sea @@
 /** 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 (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);
 void FioFCloseFile(FILE *f);
 FILE *FioFOpenFile(const char *filename, const char *mode = "rb", Subdirectory subdir = DATA_DIR, size_t *filesize = NULL);

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -15,6 +15,7 @@ @@
 #include "gamelog.h"
 #include "network/network_type.h"
 #include "tar_type.h"
 #include "fileio.h"
 #include "fios.h"
 #include <sys/stat.h>

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -27,6 +27,7 @@ @@
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "station_func.h"
 #include <map>
 #include "table/sprites.h"
 #include "table/strings.h"

src/tar_type.h

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 #ifndef TAR_TYPE_H
 /** @file tar_type.h Structs, typedefs and macros used for TAR file handling. */
 #include <map>
 #include <string>
 /** The define of a TarList. */
 struct TarListEntry {
 	const char *filename;
 };
 struct TarFileListEntry {
 	TarListEntry *tar;
 	size_t size;
 	size_t position;
 };
 typedef std::map<std::string, TarListEntry *> TarList;
 typedef std::map<std::string, TarFileListEntry> TarFileList;
 extern TarList _tar_list;
 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 */

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -47,6 +47,7 @@ @@
 #include "functions.h"
 #include "animated_tile_func.h"
 #include "date_func.h"
 #include <map>
 #include "table/strings.h"
 #include "table/sprites.h"

0 comments (0 inline, 0 general)