mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Avoid unnecessary re-reads/seeks in RandomAccessFile::ReadBlock

pull/13118/head
Jonathan G Rennison 2024-11-17 14:12:07 +00:00 committed by rubidium42
parent 653e5e8b63
commit b84a164590
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/random_access_file.cpp
View File

@ -144,7 +144,15 @@ uint32_t RandomAccessFile::ReadDword()
*/ */
void RandomAccessFile::ReadBlock(void *ptr, size_t size) void RandomAccessFile::ReadBlock(void *ptr, size_t size)
{ {
this->SeekTo(this->GetPos(), SEEK_SET); if (this->buffer != this->buffer_end) {
size_t to_copy = std::min<size_t>(size, this->buffer_end - this->buffer);
memcpy(ptr, this->buffer, to_copy);
this->buffer += to_copy;
size -= to_copy;
if (size == 0) return;
ptr = static_cast<char *>(ptr) + to_copy;
}
this->pos += fread(ptr, 1, size, *this->file_handle); this->pos += fread(ptr, 1, size, *this->file_handle);
} }