Skip to content

Commit 426ad3f

Browse files
committed
Fix #366 for all possible problematic functions
1 parent 4c4c97c commit 426ad3f

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

Client/mods/deathmatch/logic/CClientPed.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,7 @@ void CClientPed::Spawn(const CVector& vecPosition, float fRotation, unsigned sho
717717
m_fHealth = GetMaxHealth();
718718
m_pPlayerPed->SetHealth(m_fHealth);
719719
m_bUsesCollision = true;
720+
m_pPlayerPed->SetLanding(false);
720721
}
721722
else
722723
{
@@ -1383,6 +1384,8 @@ void CClientPed::WarpIntoVehicle(CClientVehicle* pVehicle, unsigned int uiSeat)
13831384

13841385
if (m_pPlayerPed)
13851386
{
1387+
m_pPlayerPed->SetLanding(false);
1388+
13861389
// Fall tasks
13871390
KillTask(TASK_PRIORITY_EVENT_RESPONSE_TEMP);
13881391
// Swim tasks
@@ -1848,6 +1851,8 @@ void CClientPed::Kill(eWeaponType weaponType, unsigned char ucBodypart, bool bSt
18481851
pTask->MakeAbortable(m_pPlayerPed, ABORT_PRIORITY_URGENT, NULL);
18491852
}
18501853

1854+
m_pPlayerPed->SetLanding(false);
1855+
18511856
// Make sure to remove the jetpack task before setting death tasks (Issue #7860)
18521857
if (HasJetPack())
18531858
{
@@ -3605,6 +3610,7 @@ void CClientPed::_CreateModel()
36053610
}
36063611

36073612
// Restore any settings
3613+
m_pPlayerPed->SetLanding(false);
36083614
m_pPlayerPed->SetMatrix(&m_Matrix);
36093615
m_pPlayerPed->SetCurrentRotation(m_fCurrentRotation);
36103616
m_pPlayerPed->SetTargetRotation(m_fTargetRotation);
@@ -3719,6 +3725,8 @@ void CClientPed::_CreateLocalModel()
37193725
m_pPlayerPed->SetModelIndex(m_ulModel);
37203726
}
37213727

3728+
m_pPlayerPed->SetLanding(false);
3729+
37223730
// Give him the default fighting style
37233731
m_pPlayerPed->SetFightingStyle(m_FightingStyle, 6);
37243732
m_pPlayerPed->SetMoveAnim(m_MoveAnim);
@@ -4317,6 +4325,8 @@ void CClientPed::SetChoking(bool bChoking)
43174325
// His not choking. Make him choke if that's what we're supposed to do.
43184326
if (bChoking)
43194327
{
4328+
m_pPlayerPed->SetLanding(false);
4329+
43204330
// Remove jetpack now so it doesn't stay on (#9522#c25612)
43214331
if (HasJetPack())
43224332
SetHasJetPack(false);
@@ -5193,6 +5203,8 @@ void CClientPed::Respawn(CVector* pvecPosition, bool bRestoreState, bool bCamera
51935203
m_pPlayerPed->Respawn(pvecPosition, bCameraCut);
51945204
SetPosition(*pvecPosition);
51955205

5206+
m_pPlayerPed->SetLanding(false);
5207+
51965208
if (bRestoreState)
51975209
{
51985210
// Jax: restore all the things we saved

0 commit comments

Comments
 (0)