mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Use appropriate integer types

Browse Source
This commit is contained in:
Ted John
2017-01-03 12:43:34 +00:00
parent 683fc90ea7
commit a277419855
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio/FileAudioSource.cpp
View File

@@ -48,7 +48,7 @@ public:
Unload();
}
size_t GetLength() override
uint64 GetLength() override
{
return _dataLength;
}
@@ -58,13 +58,13 @@ public:
return _format;
}
size_t Read(void * dst, size_t offset, size_t len) override
size_t Read(void * dst, uint64 offset, size_t len) override
{
size_t bytesRead = 0;
sint64 currentPosition = SDL_RWtell(_rw);
if (currentPosition != -1)
{
size_t bytesToRead = Math::Min<size_t>(len, _dataLength - offset);
size_t bytesToRead = (size_t)Math::Min<uint64>(len, _dataLength - offset);
sint64 dataOffset = _dataBegin + offset;
if (currentPosition != dataOffset)
{
@@ -95,8 +95,8 @@ public:
}
_rw = rw;
Uint32 chunk_id = SDL_ReadLE32(rw);
if (chunk_id != RIFF)
Uint32 chunkId = SDL_ReadLE32(rw);
if (chunkId != RIFF)
{
log_verbose("Not a WAV file");
return false;