summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2019-06-13 02:58:29 +0200
committerGitHub <noreply@github.com>2019-06-13 02:58:29 +0200
commit91b8de1d3a26327394eaae6dcfdf2377aa54bf33 (patch)
treef6b758692616132f34da18f549d3bb92fd882110 /src
parentUpdate CutsceneMgr.h (diff)
downloadre3-91b8de1d3a26327394eaae6dcfdf2377aa54bf33.tar
re3-91b8de1d3a26327394eaae6dcfdf2377aa54bf33.tar.gz
re3-91b8de1d3a26327394eaae6dcfdf2377aa54bf33.tar.bz2
re3-91b8de1d3a26327394eaae6dcfdf2377aa54bf33.tar.lz
re3-91b8de1d3a26327394eaae6dcfdf2377aa54bf33.tar.xz
re3-91b8de1d3a26327394eaae6dcfdf2377aa54bf33.tar.zst
re3-91b8de1d3a26327394eaae6dcfdf2377aa54bf33.zip
Diffstat (limited to 'src')
-rw-r--r--src/Pad.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Pad.cpp b/src/Pad.cpp
index ebb5a791..a9f67b5e 100644
--- a/src/Pad.cpp
+++ b/src/Pad.cpp
@@ -334,7 +334,7 @@ void CPad::StartShake(Int16 nDur, UInt8 nFreq)
if ( !CMenuManager::m_PrefsUseVibration )
return;
- if ( CCutsceneMgr::ms_running || CGame::playingIntro )
+ if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
return;
if ( nFreq == 0 )
@@ -356,7 +356,7 @@ void CPad::StartShake_Distance(Int16 nDur, UInt8 nFreq, Float fX, Float fY, Floa
if ( !CMenuManager::m_PrefsUseVibration )
return;
- if ( CCutsceneMgr::ms_running || CGame::playingIntro )
+ if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
return;
Float fDist = ( TheCamera.GetPosition() - CVector(fX, fY, fZ) ).Magnitude();
@@ -383,7 +383,7 @@ void CPad::StartShake_Train(Float fX, Float fY)
if ( !CMenuManager::m_PrefsUseVibration )
return;
- if ( CCutsceneMgr::ms_running || CGame::playingIntro )
+ if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
return;
if (FindPlayerVehicle() != NULL && FindPlayerVehicle()->IsTrain() )
@@ -2056,4 +2056,4 @@ STARTPATCHES
//InjectHook(0x494EB0, sub_494EB0, PATCH_JUMP);
//InjectHook(0x494ED0, &CPad::~CPad, PATCH_JUMP);
//InjectHook(0x494EE0, &CPad::CPad, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
+ENDPATCHES