diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-04-19 16:56:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 16:56:39 +0300 |
| commit | 0f07a323c9a0a97429c551808a38249a6b8ad1ff (patch) | |
| tree | 563add6e54b45ac77ab863815a8750afed24bb1e /src/core/Streaming.cpp | |
| parent | f9ed50e17813d2a6708a6516e18041c7482a7462 (diff) | |
| parent | bcc3a8b6c76ef5851af350ef4d839ef44d473f56 (diff) | |
Merge pull request #474 from Nick007J/master
Bug fixes, mostly replay; added RegisterReference for player ped pointer
Diffstat (limited to 'src/core/Streaming.cpp')
| -rw-r--r-- | src/core/Streaming.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index 039377f4..dae83d89 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -28,6 +28,9 @@ #include "CutsceneMgr.h" #include "CdStream.h" #include "Streaming.h" +#ifdef FIX_BUGS +#include "Replay.h" +#endif #include "main.h" bool CStreaming::ms_disableStreaming; @@ -280,7 +283,11 @@ CStreaming::Update(void) !requestedSubway && !CGame::playingIntro && ms_numModelsRequested < 5 && - !CRenderer::m_loadingPriority){ + !CRenderer::m_loadingPriority +#ifdef FIX_BUGS + && !CReplay::IsPlayingBack() +#endif + ){ StreamVehiclesAndPeds(); StreamZoneModels(FindPlayerCoors()); } @@ -1248,7 +1255,11 @@ CStreaming::StreamVehiclesAndPeds(void) static int modelQualityClass = 0; if(CRecordDataForGame::IsRecording() || - CRecordDataForGame::IsPlayingBack()) + CRecordDataForGame::IsPlayingBack() +#ifdef FIX_BUGS + || CReplay::IsPlayingBack() +#endif + ) return; if(FindPlayerPed()->m_pWanted->AreSwatRequired()){ |