summaryrefslogtreecommitdiff
path: root/fileio.c
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-12-09 10:56:12 +0000
committerDarkvater <darkvater@openttd.org>2006-12-09 10:56:12 +0000
commitf87c8834e23188f27cd1fd1626c040d3ebafb998 (patch)
tree821bb8da5168e61028bf8fc5f43ea46f076a70e9 /fileio.c
parent9a0917141b99cea7703e28af3c46cdbc86f23629 (diff)
downloadopenttd-f87c8834e23188f27cd1fd1626c040d3ebafb998.tar.xz
(svn r7449) -Codechange: Rename _path to _paths as it is technically more correct, but mainly because
it interferes with OS/2 symbol in libc (psmedley)
Diffstat (limited to 'fileio.c')
-rw-r--r--fileio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fileio.c b/fileio.c
index 2bd01f16d..2a09916ea 100644
--- a/fileio.c
+++ b/fileio.c
@@ -117,19 +117,19 @@ FILE *FioFOpenFile(const char *filename)
FILE *f;
char buf[MAX_PATH];
- snprintf(buf, lengthof(buf), "%s%s", _path.data_dir, filename);
+ snprintf(buf, lengthof(buf), "%s%s", _paths.data_dir, filename);
f = fopen(buf, "rb");
#if !defined(WIN32)
if (f == NULL) {
- strtolower(buf + strlen(_path.data_dir) - 1);
+ strtolower(buf + strlen(_paths.data_dir) - 1);
f = fopen(buf, "rb");
#if defined SECOND_DATA_DIR
// tries in the 2nd data directory
if (f == NULL) {
- snprintf(buf, lengthof(buf), "%s%s", _path.second_data_dir, filename);
- strtolower(buf + strlen(_path.second_data_dir) - 1);
+ snprintf(buf, lengthof(buf), "%s%s", _paths.second_data_dir, filename);
+ strtolower(buf + strlen(_paths.second_data_dir) - 1);
f = fopen(buf, "rb");
}
#endif
@@ -143,7 +143,7 @@ void FioOpenFile(int slot, const char *filename)
{
FILE *f = FioFOpenFile(filename);
- if (f == NULL) error("Cannot open file '%s%s'", _path.data_dir, filename);
+ if (f == NULL) error("Cannot open file '%s%s'", _paths.data_dir, filename);
FioCloseFile(slot); // if file was opened before, close it
_fio.handles[slot] = f;