Mercurial > hg > openttd
changeset 18016:09780d1c580a draft
(svn r22825) -Codechange: pass subdir to FioOpenFile
author | rubidium <rubidium@openttd.org> |
---|---|
date | Wed, 24 Aug 2011 13:42:06 +0000 |
parents | 7f4c6ab61bcc |
children | 63bd30142ab5 |
files | src/fileio.cpp src/fileio_func.h src/gfxinit.cpp src/newgrf.cpp src/sound.cpp src/spriteloader/png.cpp |
diffstat | 6 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -237,15 +237,16 @@ * Open a slotted file. * @param slot Index to assign. * @param filename Name of the file at the disk. - */ -void FioOpenFile(int slot, const char *filename) + * @param subdir The sub directory to search this file in. + */ +void FioOpenFile(int slot, const char *filename, Subdirectory subdir) { FILE *f; #if defined(LIMITED_FDS) FioFreeHandle(); #endif /* LIMITED_FDS */ - f = FioFOpenFile(filename); + f = FioFOpenFile(filename, "rb", subdir); if (f == NULL) usererror("Cannot open file '%s'", filename); uint32 pos = ftell(f);
--- a/src/fileio_func.h +++ b/src/fileio_func.h @@ -22,7 +22,7 @@ uint16 FioReadWord(); uint32 FioReadDword(); void FioCloseAll(); -void FioOpenFile(int slot, const char *filename); +void FioOpenFile(int slot, const char *filename, Subdirectory subdir); void FioReadBlock(void *ptr, size_t size); void FioSkipBytes(int n);
--- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -38,7 +38,7 @@ uint load_index_org = load_index; uint sprite_id = 0; - FioOpenFile(file_index, filename); + FioOpenFile(file_index, filename, NEWGRF_DIR); DEBUG(sprite, 2, "Reading grf-file '%s'", filename); @@ -73,7 +73,7 @@ { uint sprite_id = 0; - FioOpenFile(file_index, filename); + FioOpenFile(file_index, filename, NEWGRF_DIR); DEBUG(sprite, 2, "Reading indexed grf-file '%s'", filename);
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -8105,7 +8105,7 @@ return; } - FioOpenFile(file_index, filename); + FioOpenFile(file_index, filename, NEWGRF_DIR); _cur.file_index = file_index; // XXX _palette_remap_grf[_cur.file_index] = (config->palette & GRFP_USE_MASK);
--- a/src/sound.cpp +++ b/src/sound.cpp @@ -30,7 +30,7 @@ /* If there is no sound file (nosound set), don't load anything */ if (filename == NULL) return; - FioOpenFile(SOUND_SLOT, filename); + FioOpenFile(SOUND_SLOT, filename, BASESET_DIR); size_t pos = FioGetPos(); uint count = FioReadDword();
--- a/src/spriteloader/png.cpp +++ b/src/spriteloader/png.cpp @@ -43,7 +43,7 @@ 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" : ""); if (FioCheckFileExists(png_file)) { - FioOpenFile(PNG_SLOT, png_file); + FioOpenFile(PNG_SLOT, png_file, NEWGRF_DIR); return true; }