diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-05-19 16:46:18 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-05-19 16:46:18 +0200 |
| commit | 99574ebfc61a79b34f4681eaa2debefbae174875 (patch) | |
| tree | a3edae2913a4af9682f7ecfec53367a484c2975c /src/core/PlayerInfo.cpp | |
| parent | Melee weapons(half-working), Ped and Hud bits (diff) | |
| parent | Merge pull request #564 from Xinerki/miami (diff) | |
| download | re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.gz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.bz2 re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.lz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.xz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.zst re3-99574ebfc61a79b34f4681eaa2debefbae174875.zip | |
Diffstat (limited to 'src/core/PlayerInfo.cpp')
| -rw-r--r-- | src/core/PlayerInfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index adf98701..37a62adf 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -140,6 +140,7 @@ CPlayerInfo::Clear(void) m_nUpsideDownCounter = 0; m_bInfiniteSprint = false; m_bFastReload = false; + m_nMaxHealth = m_nMaxArmour = 100; m_bGetOutOfJailFree = false; m_bGetOutOfHospitalFree = false; m_bDriveByAllowed = true; @@ -172,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; @@ -193,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; |