2 files changed, 9 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index eebfa099..4e9280e6 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -187,6 +187,9 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_queuedSound = SOUND_NO_SOUND;
 	m_objective = OBJECTIVE_NONE;
 	m_prevObjective = OBJECTIVE_NONE;
+#ifdef FIX_BUGS
+	m_objectiveTimer = 0;
+#endif
 	CharCreatedBy = RANDOM_CHAR;
 	m_leader = nil;
 	m_pedInObjective = nil;
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 305c329e..6613ea1b 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -35,6 +35,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();
@@ -46,8 +49,9 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 	m_bSpeedTimerFlag = false;
 	m_pPointGunAt = nil;
 	m_nPedState = 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;
 	field_1367 = 0;