diff options
author | shfil <filip.gawin@zoho.com> | 2020-09-26 20:11:25 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-09-30 01:14:10 +0200 |
commit | 35d7591defb352c2af49af0d6e0d3340e7b59672 (patch) | |
tree | 7ebab71a962e176826552e2c6d48287c85ecb332 /src/core | |
parent | Merge pull request #718 from Nick007J/miami (diff) | |
download | re3-35d7591defb352c2af49af0d6e0d3340e7b59672.tar re3-35d7591defb352c2af49af0d6e0d3340e7b59672.tar.gz re3-35d7591defb352c2af49af0d6e0d3340e7b59672.tar.bz2 re3-35d7591defb352c2af49af0d6e0d3340e7b59672.tar.lz re3-35d7591defb352c2af49af0d6e0d3340e7b59672.tar.xz re3-35d7591defb352c2af49af0d6e0d3340e7b59672.tar.zst re3-35d7591defb352c2af49af0d6e0d3340e7b59672.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/CdStream.cpp | 4 | ||||
-rw-r--r-- | src/core/Radar.cpp | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/core/CdStream.cpp b/src/core/CdStream.cpp index d9978040..c11fb72a 100644 --- a/src/core/CdStream.cpp +++ b/src/core/CdStream.cpp @@ -106,12 +106,14 @@ CdStreamInit(int32 numChannels) GetDiskFreeSpace(nil, &SectorsPerCluster, &BytesPerSector, &NumberOfFreeClusters, &TotalNumberOfClusters); _gdwCdStreamFlags = 0; - + +#ifndef FIX_BUGS // this just slows down streaming if ( BytesPerSector <= CDSTREAM_SECTOR_SIZE ) { _gdwCdStreamFlags |= FILE_FLAG_NO_BUFFERING; debug("Using no buffered loading for streaming\n"); } +#endif _gbCdStreamOverlapped = TRUE; diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index 559a8cd6..b9fc369d 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -1151,6 +1151,10 @@ int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay if (!ms_RadarTrace[nextBlip].m_bInUse) break; } +#ifdef FIX_BUGS + if (nextBlip == NUMRADARBLIPS) + return -1; +#endif ms_RadarTrace[nextBlip].m_eBlipType = type; ms_RadarTrace[nextBlip].m_nColor = color; ms_RadarTrace[nextBlip].m_bDim = true; @@ -1182,6 +1186,10 @@ int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDispla if (!ms_RadarTrace[nextBlip].m_bInUse) break; } +#ifdef FIX_BUGS + if (nextBlip == NUMRADARBLIPS) + return -1; +#endif ms_RadarTrace[nextBlip].m_eBlipType = type; ms_RadarTrace[nextBlip].m_nColor = color; ms_RadarTrace[nextBlip].m_bDim = true; @@ -1526,6 +1534,10 @@ CRadar::ToggleTargetMarker(float x, float y) if (!ms_RadarTrace[nextBlip].m_bInUse) break; } +#ifdef FIX_BUGS + if (nextBlip == NUMRADARBLIPS) + return; +#endif ms_RadarTrace[nextBlip].m_eBlipType = BLIP_COORD; ms_RadarTrace[nextBlip].m_nColor = 0x333333FF; ms_RadarTrace[nextBlip].m_bDim = 1; |