summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-24 15:20:41 +0100
committeraap <aap@papnet.eu>2020-11-24 15:20:41 +0100
commit70d8bdc0879c341f2d020544ef3b807bdee89833 (patch)
tree7662c5a2e53c153925984efbecd46d06c958c5ca /src/core
parentScript commands split to original files (diff)
downloadre3-70d8bdc0879c341f2d020544ef3b807bdee89833.tar
re3-70d8bdc0879c341f2d020544ef3b807bdee89833.tar.gz
re3-70d8bdc0879c341f2d020544ef3b807bdee89833.tar.bz2
re3-70d8bdc0879c341f2d020544ef3b807bdee89833.tar.lz
re3-70d8bdc0879c341f2d020544ef3b807bdee89833.tar.xz
re3-70d8bdc0879c341f2d020544ef3b807bdee89833.tar.zst
re3-70d8bdc0879c341f2d020544ef3b807bdee89833.zip
Diffstat (limited to '')
-rw-r--r--src/core/Camera.cpp6
-rw-r--r--src/core/Camera.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 13d03213..56225fed 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -123,7 +123,7 @@ CCamera::Init(void)
Cams[0].Mode = CCam::MODE_FOLLOWPED;
Cams[1].Mode = CCam::MODE_FOLLOWPED;
unknown = 0;
- m_bJustJumpedOutOf1stPersonBecauseOfTarget = false;
+ m_bUnknown = false;
ClearPlayerWeaponMode();
m_bInATunnelAndABigVehicle = false;
m_iModeObbeCamIsInForCar = OBBE_INVALID;
@@ -3398,10 +3398,10 @@ CCamera::Fade(float timeout, int16 direction)
m_fTimeToFadeMusic = timeout;
m_uiFadeTimeStartedMusic = CTimer::GetTimeInMilliseconds();
// Not on PS2
- if(!m_bJustJumpedOutOf1stPersonBecauseOfTarget && m_iMusicFadingDirection == FADE_OUT){
+ if(!m_bUnknown && m_iMusicFadingDirection == FADE_OUT){
unknown++;
if(unknown >= 2){
- m_bJustJumpedOutOf1stPersonBecauseOfTarget = true;
+ m_bUnknown = true;
unknown = 0;
}else
m_bMoveCamToAvoidGeom = true;
diff --git a/src/core/Camera.h b/src/core/Camera.h
index dd78d952..0797db9b 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -348,7 +348,7 @@ public:
bool m_bcutsceneFinished;
bool m_bCullZoneChecksOn;
bool m_bFirstPersonBeingUsed;
- bool m_bJustJumpedOutOf1stPersonBecauseOfTarget;
+ bool m_bUnknown;
bool m_bIdleOn;
bool m_bInATunnelAndABigVehicle;
bool m_bInitialNodeFound;