archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-29 19:20:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Fire-Head/master'

Browse Source 
# Conflicts:
#	src/core/Radar.cpp
This commit is contained in:
Sergeanur
2020-04-09 21:40:46 +03:00
parent 5b5de5d2f3 590ff32469
commit a5239b554f
20 changed files with 1726 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Camera.cpp
View File

@ -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;