Mercurial > hg > openttd
changeset 4202:00c70f28fbcc draft
(svn r5686) - Codechange: Use only FioFOpenFile for opening files, use the other similar functions (FioCheckFileExists and FioOpenFile) as its caller.
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Mon, 31 Jul 2006 22:24:09 +0000 |
parents | 29a0c19df3fb |
children | 25270f120409 |
files | fileio.c |
diffstat | 1 files changed, 6 insertions(+), 54 deletions(-) [+] |
line wrap: on
line diff
--- a/fileio.c +++ b/fileio.c @@ -105,34 +105,11 @@ bool FioCheckFileExists(const char *filename) { - FILE *f; - char buf[MAX_PATH]; - - sprintf(buf, "%s%s", _path.data_dir, filename); - - f = fopen(buf, "rb"); -#if !defined(WIN32) - if (f == NULL) { // Make lower case and try again - strtolower(buf + strlen(_path.data_dir) - 1); - f = fopen(buf, "rb"); + FILE *f = FioFOpenFile(filename); + if (f == NULL) return false; -#if defined SECOND_DATA_DIR - // tries in the 2nd data directory - if (f == NULL) { - sprintf(buf, "%s%s", _path.second_data_dir, filename); - strtolower(buf + strlen(_path.second_data_dir) - 1); - f = fopen(buf, "rb"); - } -#endif - } -#endif - - if (f == NULL) { - return false; - } else { - fclose(f); - return true; - } + fclose(f); + return true; } FILE *FioFOpenFile(const char *filename) @@ -164,34 +141,9 @@ void FioOpenFile(int slot, const char *filename) { - FILE *f; - char buf[MAX_PATH]; - - sprintf(buf, "%s%s", _path.data_dir, filename); - - f = fopen(buf, "rb"); -#if !defined(WIN32) - if (f == NULL) { - strtolower(buf + strlen(_path.data_dir) - 1); - f = fopen(buf, "rb"); + FILE *f = FioFOpenFile(filename); -#if defined SECOND_DATA_DIR - // tries in the 2nd data directory - if (f == NULL) { - sprintf(buf, "%s%s", _path.second_data_dir, filename); - strtolower(buf + strlen(_path.second_data_dir) - 1); - f = fopen(buf, "rb"); - } - - if (f == NULL) - sprintf(buf, "%s%s", _path.data_dir, filename); //makes it print the primary datadir path instead of the secundary one - -#endif - } -#endif - - if (f == NULL) - error("Cannot open file '%s'", buf); + if (f == NULL) error("Cannot open file '%s%s'", _path.data_dir, filename); FioCloseFile(slot); // if file was opened before, close it _fio.handles[slot] = f;