diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-09 21:40:46 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-09 21:40:46 +0300 |
| commit | a5239b554fa13aaf0ffa5ee850402f71cd680d29 (patch) | |
| tree | 47ac7800bd86e5674fee2b6fc3a797647570e6cb /src/core/Camera.cpp | |
| parent | 5b5de5d2f3a883a795f62098f69a05c77900ecba (diff) | |
| parent | 590ff324691a8dd60c7e05170544cff8b9bcb0ab (diff) | |
Merge remote-tracking branch 'Fire-Head/master'
# Conflicts:
# src/core/Radar.cpp
Diffstat (limited to 'src/core/Camera.cpp')
| -rw-r--r-- | src/core/Camera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index d79c9218..91dd6573 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -142,7 +142,7 @@ CCamera::Init(void) PlayerExhaustion = 1.0f; DebugCamMode = CCam::MODE_NONE; m_PedOrientForBehindOrInFront = 0.0f; - if(!FrontEndMenuManager.m_bStartGameLoading){ + if(!FrontEndMenuManager.m_bWantToRestart){ m_bFading = false; CDraw::FadeValue = 0; m_fFLOATingFade = 0.0f; @@ -151,7 +151,7 @@ CCamera::Init(void) m_fFLOATingFadeMusic = 0.0f; } m_bMoveCamToAvoidGeom = false; - if(FrontEndMenuManager.m_bStartGameLoading) + if(FrontEndMenuManager.m_bWantToRestart) m_bMoveCamToAvoidGeom = true; m_bStartingSpline = false; m_iTypeOfSwitch = INTERPOLATION; |