summaryrefslogtreecommitdiffstats
path: root/src/core/PlayerInfo.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-03-01 21:48:48 +0100
committerGitHub <noreply@github.com>2020-03-01 21:48:48 +0100
commitf72453d03e7758074b9dd388ace6d651b45ec3d9 (patch)
tree9aca5ab7ac4f3631691701a78b2a704cea4a1f6d /src/core/PlayerInfo.cpp
parentMerge pull request #339 from erorcun/erorcun (diff)
parentreview fixes (diff)
downloadre3-f72453d03e7758074b9dd388ace6d651b45ec3d9.tar
re3-f72453d03e7758074b9dd388ace6d651b45ec3d9.tar.gz
re3-f72453d03e7758074b9dd388ace6d651b45ec3d9.tar.bz2
re3-f72453d03e7758074b9dd388ace6d651b45ec3d9.tar.lz
re3-f72453d03e7758074b9dd388ace6d651b45ec3d9.tar.xz
re3-f72453d03e7758074b9dd388ace6d651b45ec3d9.tar.zst
re3-f72453d03e7758074b9dd388ace6d651b45ec3d9.zip
Diffstat (limited to 'src/core/PlayerInfo.cpp')
-rw-r--r--src/core/PlayerInfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index a01c1398..633be810 100644
--- a/src/core/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
@@ -164,7 +164,7 @@ void
CPlayerInfo::MakePlayerSafe(bool toggle)
{
if (toggle) {
- CTheScripts::CountdownToMakePlayerUnsafe = 0;
+ CTheScripts::ResetCountdownToMakePlayerUnsafe();
m_pPed->m_pWanted->m_bIgnoredByEveryone = true;
CWorld::StopAllLawEnforcersInTheirTracks();
CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_20;
@@ -185,7 +185,7 @@ CPlayerInfo::MakePlayerSafe(bool toggle)
CWorld::ExtinguishAllCarFiresInArea(GetPos(), 4000.0f);
CReplay::DisableReplays();
- } else if (!CGame::playingIntro && !CTheScripts::CountdownToMakePlayerUnsafe) {
+ } else if (!CGame::playingIntro && !CTheScripts::IsCountdownToMakePlayerUnsafeOn()) {
m_pPed->m_pWanted->m_bIgnoredByEveryone = false;
CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_20;
m_pPed->bBulletProof = false;