File diff r2951:a52cbb930051 → r2952:e97f823d2dbe
fileio.c
Show inline comments
 
@@ -50,25 +50,25 @@ void FioSeekToFile(uint32 pos)
 

	
 
byte FioReadByte(void)
 
{
 
	if (_fio.buffer == _fio.buffer_end) {
 
		_fio.pos += FIO_BUFFER_SIZE;
 
		fread(_fio.buffer = _fio.buffer_start, 1, FIO_BUFFER_SIZE, _fio.cur_fh);
 
	}
 
	return *_fio.buffer++;
 
}
 

	
 
void FioSkipBytes(int n)
 
{
 
	for(;;) {
 
	for (;;) {
 
		int m = min(_fio.buffer_end - _fio.buffer, n);
 
		_fio.buffer += m;
 
		n -= m;
 
		if (n == 0) break;
 
		FioReadByte();
 
		n--;
 
	}
 
}
 

	
 

	
 
uint16 FioReadWord(void)
 
{
 
@@ -108,33 +108,33 @@ void FioCloseAll(void)
 
bool FiosCheckFileExists(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) {
 
		char *s;
 
		// Make lower case and try again
 
		for(s=buf + strlen(_path.data_dir) - 1; *s != 0; s++)
 
		for (s = buf + strlen(_path.data_dir) - 1; *s != 0; s++)
 
			*s = tolower(*s);
 
		f = fopen(buf, "rb");
 

	
 
#if defined SECOND_DATA_DIR
 
	// tries in the 2nd data directory
 
		if (f == NULL) {
 
			sprintf(buf, "%s%s", _path.second_data_dir, filename);
 
			for(s=buf + strlen(_path.second_data_dir) - 1; *s != 0; s++)
 
			for (s = buf + strlen(_path.second_data_dir) - 1; *s != 0; s++)
 
			*s = tolower(*s);
 
		f = fopen(buf, "rb");
 
		}
 
#endif
 
	}
 
#endif
 

	
 
	if (f == NULL)
 
		return false;
 
	else {
 
		fclose(f);
 
		return true;
 
@@ -144,64 +144,64 @@ bool FiosCheckFileExists(const char *fil
 
FILE *FioFOpenFile(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) {
 
		char *s;
 
		// Make lower case and try again
 
		for(s=buf + strlen(_path.data_dir) - 1; *s != 0; s++)
 
		for (s = buf + strlen(_path.data_dir) - 1; *s != 0; s++)
 
			*s = tolower(*s);
 
		f = fopen(buf, "rb");
 

	
 
#if defined SECOND_DATA_DIR
 
		// tries in the 2nd data directory
 
		if (f == NULL) {
 
			sprintf(buf, "%s%s", _path.second_data_dir, filename);
 
			for(s=buf + strlen(_path.second_data_dir) - 1; *s != 0; s++)
 
			for (s = buf + strlen(_path.second_data_dir) - 1; *s != 0; s++)
 
				*s = tolower(*s);
 
			f = fopen(buf, "rb");
 
		}
 
#endif
 
	}
 
#endif
 

	
 
	return f;
 
}
 

	
 
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) {
 
		char *s;
 
		// Make lower case and try again
 
		for(s=buf + strlen(_path.data_dir) - 1; *s != 0; s++)
 
		for (s = buf + strlen(_path.data_dir) - 1; *s != 0; s++)
 
			*s = tolower(*s);
 
		f = fopen(buf, "rb");
 

	
 
#if defined SECOND_DATA_DIR
 
	// tries in the 2nd data directory
 
		if (f == NULL) {
 
			sprintf(buf, "%s%s", _path.second_data_dir, filename);
 
			for(s=buf + strlen(_path.second_data_dir) - 1; *s != 0; s++)
 
			for (s = buf + strlen(_path.second_data_dir) - 1; *s != 0; s++)
 
			*s = tolower(*s);
 
		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)