diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-06-07 04:15:10 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-06-07 04:15:10 +0300 |
| commit | 1c0189979965cb237aa5fb300a5522e1408123ac (patch) | |
| tree | 791f188c7d4f87111bf3235b87f4b74e2fbebf9e /src/peds/PlayerPed.cpp | |
| parent | 5711159e684e0612739ee66d3cd7e4444c7dc72d (diff) | |
| parent | 552205dfbaea70628df56a4966d269a81a97d28e (diff) | |
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/Frontend.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Train.cpp
Diffstat (limited to 'src/peds/PlayerPed.cpp')
| -rw-r--r-- | src/peds/PlayerPed.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 38ba2bf9..08f79c7e 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -40,6 +40,9 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1) { m_fMoveSpeed = 0.0f; SetModelIndex(MI_PLAYER); +#ifdef FIX_BUGS + m_fCurrentStamina = m_fMaxStamina = 150.0f; +#endif SetInitialState(); m_pWanted = new CWanted(); @@ -56,8 +59,9 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1) m_pPointGunAt = nil; SetPedState(PED_IDLE); - m_fMaxStamina = 150.0f; - m_fCurrentStamina = m_fMaxStamina; +#ifndef FIX_BUGS + m_fCurrentStamina = m_fMaxStamina = 150.0f; +#endif m_fStaminaProgress = 0.0f; m_nEvadeAmount = 0; m_pEvadingFrom = nil; |