cpp/openttd-patchpack/source File Diff

File diff r9102:cbd100f4d81b → r9103:84d77f49b5d8

src/fileio.cpp

➞

Show inline comments

@@ @@ -42,13 +42,13 @@ struct Fio { @@
 static Fio _fio;
 /* Get current position in file */
 uint32 FioGetPos()
+{
-	return _fio.pos + (_fio.buffer - _fio.buffer_start) - FIO_BUFFER_SIZE;
+	return _fio.pos + (_fio.buffer - _fio.buffer_end);
+}
 const char *FioGetFilename(uint8 slot)
+{
 	return _fio.shortnames[slot];
+}
@@ @@ -89,13 +89,17 @@ void FioSeekToFile(uint8 slot, uint32 po @@
+}
 byte FioReadByte()
+{
 	if (_fio.buffer == _fio.buffer_end) {
 		_fio.buffer = _fio.buffer_start;
 		_fio.pos += fread(_fio.buffer, 1, FIO_BUFFER_SIZE, _fio.cur_fh);
 		size_t size = fread(_fio.buffer, 1, FIO_BUFFER_SIZE, _fio.cur_fh);
 		_fio.pos += size;
 		_fio.buffer_end = _fio.buffer_start + size;
 		if (size == 0) return 0;
+	}
 	return *_fio.buffer++;
+}
 void FioSkipBytes(int n)
+{