summaryrefslogtreecommitdiffstats
path: root/src/peds/PlayerPed.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-06-04 05:03:12 +0200
committereray orçunus <erayorcunus@gmail.com>2020-06-04 05:03:12 +0200
commit016ebc0b00905c35ca16dcbd22c41fb4602c3e37 (patch)
tree5c08c95450e72b97934c20cf537a4b0d42189e71 /src/peds/PlayerPed.cpp
parentPedChat & PedDebug (diff)
downloadre3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar
re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.gz
re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.bz2
re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.lz
re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.xz
re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.tar.zst
re3-016ebc0b00905c35ca16dcbd22c41fb4602c3e37.zip
Diffstat (limited to '')
-rw-r--r--src/peds/PlayerPed.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index eb4ac09e..305c329e 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -1058,6 +1058,9 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
}
#ifdef FREE_CAM
+ static int8 changedHeadingRate = 0;
+ if (changedHeadingRate == 2) changedHeadingRate = 1;
+
// Rotate player/arm when shooting. We don't have auto-rotation anymore
if (CCamera::m_bUseMouse3rdPerson && CCamera::bFreeCam &&
m_nSelectedWepSlot == m_currentWeapon && m_nMoveState != PEDMOVE_SPRINT) {
@@ -1081,6 +1084,7 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
#endif
} else {
m_fRotationDest = limitedCam;
+ changedHeadingRate = 2;
m_headingRate = 50.0f;
// Anim. fix for shotgun, ak47 and m16 (we must finish rot. it quickly)
@@ -1099,10 +1103,12 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
}
} else if (weaponInfo->m_bCanAimWithArm)
ClearPointGunAt();
- else
- RestoreHeadingRate();
}
}
+ if (changedHeadingRate == 1) {
+ changedHeadingRate = 0;
+ RestoreHeadingRate();
+ }
#endif
if (padUsed->GetTarget() && m_nSelectedWepSlot == m_currentWeapon && m_nMoveState != PEDMOVE_SPRINT) {
@@ -1347,7 +1353,7 @@ CPlayerPed::ProcessControl(void)
case PED_WANDER_PATH:
case PED_PURSUE:
case PED_FOLLOW_PATH:
- case PED_ROCKET_ODE:
+ case PED_ROCKET_MODE:
case PED_DUMMY:
case PED_PAUSE:
case PED_FACE_PHONE: