summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2020-12-20 23:15:40 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2020-12-20 23:15:40 +0100
commit26aed6611e00ce70d9ec6ec8d06092d113f365e9 (patch)
treea6e32df596bec7e42dc62cc854056ad23de4255c /src/peds
parentFix free cam aiming 2 (diff)
downloadre3-26aed6611e00ce70d9ec6ec8d06092d113f365e9.tar
re3-26aed6611e00ce70d9ec6ec8d06092d113f365e9.tar.gz
re3-26aed6611e00ce70d9ec6ec8d06092d113f365e9.tar.bz2
re3-26aed6611e00ce70d9ec6ec8d06092d113f365e9.tar.lz
re3-26aed6611e00ce70d9ec6ec8d06092d113f365e9.tar.xz
re3-26aed6611e00ce70d9ec6ec8d06092d113f365e9.tar.zst
re3-26aed6611e00ce70d9ec6ec8d06092d113f365e9.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/PedAI.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp
index d5705a2f..364e18d8 100644
--- a/src/peds/PedAI.cpp
+++ b/src/peds/PedAI.cpp
@@ -5899,17 +5899,21 @@ CPed::Duck(void)
ClearDuck();
else if (bIsDucking && bCrouchWhenShooting) {
CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
- CAnimBlendAssociation *attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
- if (!attackAssoc) {
+ CAnimBlendAssociation *crouchAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
+ if (!crouchAnim) {
if(GetCrouchFireAnim(weapon))
- attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weapon));
+ crouchAnim = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weapon));
}
- if (!attackAssoc) {
+ if (!crouchAnim) {
if(GetCrouchReloadAnim(weapon))
- attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(weapon));
+ crouchAnim = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(weapon));
}
- if (!attackAssoc) {
+ if (!crouchAnim) {
bIsDucking = false;
+#if defined FIX_BUGS || defined FREE_CAM
+ if (IsPlayer())
+ bCrouchWhenShooting = false;
+#endif
}
}
}