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

(svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one

release/1.2
rubidium 2011-08-24 13:53:34 +00:00
parent 8e5f433b22
commit b4edc30c64
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fileio_func.h
View File

@ -48,8 +48,8 @@ static inline bool IsValidSearchPath(Searchpath sp)
#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))
void FioFCloseFile(FILE *f); void FioFCloseFile(FILE *f);
FILE *FioFOpenFile(const char *filename, const char *mode = "rb", Subdirectory subdir = NEWGRF_DIR, size_t *filesize = NULL); FILE *FioFOpenFile(const char *filename, const char *mode, Subdirectory subdir, size_t *filesize = NULL);
bool FioCheckFileExists(const char *filename, Subdirectory subdir = NEWGRF_DIR); bool FioCheckFileExists(const char *filename, Subdirectory subdir);
char *FioGetFullPath(char *buf, size_t buflen, Searchpath sp, Subdirectory subdir, const char *filename); char *FioGetFullPath(char *buf, size_t buflen, Searchpath sp, Subdirectory subdir, const char *filename);
char *FioFindFullPath(char *buf, size_t buflen, Subdirectory subdir, const char *filename); char *FioFindFullPath(char *buf, size_t buflen, Subdirectory subdir, const char *filename);
char *FioAppendDirectory(char *buf, size_t buflen, Searchpath sp, Subdirectory subdir); char *FioAppendDirectory(char *buf, size_t buflen, Searchpath sp, Subdirectory subdir);

2
src/fios.cpp
View File

@ -599,7 +599,7 @@ public:
/* virtual */ bool AddFile(const char *filename, size_t basepath_length) /* virtual */ bool AddFile(const char *filename, size_t basepath_length)
{ {
FILE *f = FioFOpenFile(filename, "r"); FILE *f = FioFOpenFile(filename, "r", SCENARIO_DIR);
if (f == NULL) return false; if (f == NULL) return false;
ScenarioIdentifier id; ScenarioIdentifier id;

4
src/heightmap.cpp
View File

@ -105,7 +105,7 @@ static bool ReadHeightmapPNG(char *filename, uint *x, uint *y, byte **map)
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
fp = FioFOpenFile(filename, "rb"); fp = FioFOpenFile(filename, "rb", HEIGHTMAP_DIR);
if (fp == NULL) { if (fp == NULL) {
ShowErrorMessage(STR_ERROR_PNGMAP, STR_ERROR_PNGMAP_FILE_NOT_FOUND, WL_ERROR); ShowErrorMessage(STR_ERROR_PNGMAP, STR_ERROR_PNGMAP_FILE_NOT_FOUND, WL_ERROR);
return false; return false;
@ -228,7 +228,7 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map)
/* Init BmpData */ /* Init BmpData */
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
f = FioFOpenFile(filename, "rb"); f = FioFOpenFile(filename, "rb", HEIGHTMAP_DIR);
if (f == NULL) { if (f == NULL) {
ShowErrorMessage(STR_ERROR_BMPMAP, STR_ERROR_PNGMAP_FILE_NOT_FOUND, WL_ERROR); ShowErrorMessage(STR_ERROR_BMPMAP, STR_ERROR_PNGMAP_FILE_NOT_FOUND, WL_ERROR);
return false; return false;

4
src/saveload/oldloader.cpp
View File

@ -281,7 +281,7 @@ bool LoadOldSaveGame(const char *file)
InitLoading(&ls); InitLoading(&ls);
/* Open file */ /* Open file */
ls.file = FioFOpenFile(file, "rb"); ls.file = FioFOpenFile(file, "rb", NO_DIRECTORY);
if (ls.file == NULL) { if (ls.file == NULL) {
DEBUG(oldloader, 0, "Cannot open file '%s'", file); DEBUG(oldloader, 0, "Cannot open file '%s'", file);
@ -320,7 +320,7 @@ bool LoadOldSaveGame(const char *file)
void GetOldSaveGameName(const char *file, char *title, const char *last) void GetOldSaveGameName(const char *file, char *title, const char *last)
{ {
FILE *f = FioFOpenFile(file, "rb"); FILE *f = FioFOpenFile(file, "rb", NO_DIRECTORY);
if (f == NULL) { if (f == NULL) {
*title = '\0'; *title = '\0';

2
src/spriteloader/png.cpp
View File

@ -42,7 +42,7 @@ static bool OpenPNGFile(const char *filename, uint32 id, bool mask)
/* Add path separator after 'sprites' if not present */ /* Add path separator after 'sprites' if not present */
const char *sep = (filename[0] == PATHSEPCHAR) ? "" : PATHSEP; const char *sep = (filename[0] == PATHSEPCHAR) ? "" : PATHSEP;
snprintf(png_file, sizeof(png_file), "sprites%s%s" PATHSEP "%d%s.png", sep, filename, id, mask ? "m" : ""); snprintf(png_file, sizeof(png_file), "sprites%s%s" PATHSEP "%d%s.png", sep, filename, id, mask ? "m" : "");
if (FioCheckFileExists(png_file)) { if (FioCheckFileExists(png_file, NEWGRF_DIR)) {
FioOpenFile(PNG_SLOT, png_file, NEWGRF_DIR); FioOpenFile(PNG_SLOT, png_file, NEWGRF_DIR);
return true; return true;
} }