summaryrefslogtreecommitdiffstats
path: root/src/core/Streaming.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-06 01:41:35 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-06 01:41:35 +0200
commit96eee4f10ffd5b5fccf417aba580108b160e3842 (patch)
treea737b09b4d70ea55937210256105f50e94aa8fa7 /src/core/Streaming.cpp
parentFixed a bunch of calculation mistakes in CHud (diff)
downloadre3-96eee4f10ffd5b5fccf417aba580108b160e3842.tar
re3-96eee4f10ffd5b5fccf417aba580108b160e3842.tar.gz
re3-96eee4f10ffd5b5fccf417aba580108b160e3842.tar.bz2
re3-96eee4f10ffd5b5fccf417aba580108b160e3842.tar.lz
re3-96eee4f10ffd5b5fccf417aba580108b160e3842.tar.xz
re3-96eee4f10ffd5b5fccf417aba580108b160e3842.tar.zst
re3-96eee4f10ffd5b5fccf417aba580108b160e3842.zip
Diffstat (limited to 'src/core/Streaming.cpp')
-rw-r--r--src/core/Streaming.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index d15415ea..227a4a9f 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1719,8 +1719,10 @@ CStreaming::RetryLoadFile(int32 ch)
}
switch(ms_channel[ch].state){
+ case CHANNELSTATE_ERROR:
+ ms_channel[ch].numTries++;
+ if (CdStreamGetStatus(ch) == STREAM_READING || CdStreamGetStatus(ch) == STREAM_WAITING) break;
case CHANNELSTATE_IDLE:
-streamread:
CdStreamRead(ch, ms_pStreamingBuffer[ch], ms_channel[ch].position, ms_channel[ch].size);
ms_channel[ch].state = CHANNELSTATE_READING;
ms_channel[ch].field24 = -600;
@@ -1731,11 +1733,6 @@ streamread:
CTimer::SetCodePause(false);
}
break;
- case CHANNELSTATE_ERROR:
- ms_channel[ch].numTries++;
- if(CdStreamGetStatus(ch) != STREAM_READING && CdStreamGetStatus(ch) != STREAM_WAITING)
- goto streamread;
- break;
}
}