diff options
| author | aap <aap@papnet.eu> | 2020-05-19 13:26:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 13:26:21 +0200 |
| commit | 6b0b984909fe7ff268e978938e65a91d9bfd7d8c (patch) | |
| tree | 71bf0f31ca1922c89b7996effe6ca87ef4c3a749 /src/core | |
| parent | HandlingMgr (diff) | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-6b0b984909fe7ff268e978938e65a91d9bfd7d8c.tar re3-6b0b984909fe7ff268e978938e65a91d9bfd7d8c.tar.gz re3-6b0b984909fe7ff268e978938e65a91d9bfd7d8c.tar.bz2 re3-6b0b984909fe7ff268e978938e65a91d9bfd7d8c.tar.lz re3-6b0b984909fe7ff268e978938e65a91d9bfd7d8c.tar.xz re3-6b0b984909fe7ff268e978938e65a91d9bfd7d8c.tar.zst re3-6b0b984909fe7ff268e978938e65a91d9bfd7d8c.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/PlayerInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index f4e762c0..37a62adf 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -173,7 +173,6 @@ void CPlayerInfo::MakePlayerSafe(bool toggle) { if (toggle) { - CTheScripts::ResetCountdownToMakePlayerUnsafe(); m_pPed->m_pWanted->m_bIgnoredByEveryone = true; CWorld::StopAllLawEnforcersInTheirTracks(); CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_20; @@ -194,7 +193,8 @@ CPlayerInfo::MakePlayerSafe(bool toggle) CWorld::ExtinguishAllCarFiresInArea(GetPos(), 4000.0f); CReplay::DisableReplays(); - } else if (!CGame::playingIntro && !CTheScripts::IsCountdownToMakePlayerUnsafeOn()) { + } + else { m_pPed->m_pWanted->m_bIgnoredByEveryone = false; CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_20; m_pPed->bBulletProof = false; |