summaryrefslogtreecommitdiffstats
path: root/src/core/Streaming.cpp
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-05-11 23:33:13 +0200
committerGitHub <noreply@github.com>2020-05-11 23:33:13 +0200
commit5f40f06bf024e3806e0fe5a92ca14ee6b22a9933 (patch)
tree3008c5a5977736453221f00daa1f34f9d292906b /src/core/Streaming.cpp
parentRenderPedCB from VC (diff)
parentFix appveyor (hopefully) (diff)
downloadre3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.gz
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.bz2
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.lz
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.xz
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.zst
re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.zip
Diffstat (limited to '')
-rw-r--r--src/core/Streaming.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index e430f758..a2e6048b 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1465,7 +1465,7 @@ CStreaming::GetCdImageOffset(int32 lastPosn)
int dist, mindist;
img = -1;
- mindist = INT_MAX;
+ mindist = INT32_MAX;
offset = ms_imageOffsets[ms_lastImageRead];
if(lastPosn <= offset || lastPosn > offset + ms_imageSize){
// last read position is not in last image
@@ -1513,8 +1513,8 @@ CStreaming::GetNextFileOnCd(int32 lastPosn, bool priority)
streamIdFirst = -1;
streamIdNext = -1;
- posnFirst = UINT_MAX;
- posnNext = UINT_MAX;
+ posnFirst = UINT32_MAX;
+ posnNext = UINT32_MAX;
for(si = ms_startRequestedList.m_next; si != &ms_endRequestedList; si = next){
next = si->m_next;
@@ -1834,7 +1834,7 @@ CStreaming::LoadAllRequestedModels(bool priority)
status = CdStreamRead(0, ms_pStreamingBuffer[0], imgOffset+posn, size);
while(CdStreamSync(0) || status == STREAM_NONE);
ms_aInfoForModel[streamId].m_loadState = STREAMSTATE_READING;
-
+
MakeSpaceFor(size * CDSTREAM_SECTOR_SIZE);
ConvertBufferToObject(ms_pStreamingBuffer[0], streamId);
if(ms_aInfoForModel[streamId].m_loadState == STREAMSTATE_STARTED)