summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-07-26 08:54:04 +0200
committerSergeanur <s.anureev@yandex.ua>2021-07-26 08:54:04 +0200
commit371f1be9b3adcb5fb6caeba62a411687c2059316 (patch)
tree98e37faaacafdb691710fe6932f8b507655a4a80 /src/peds
parentFix muzzleflash rotation (diff)
downloadre3-371f1be9b3adcb5fb6caeba62a411687c2059316.tar
re3-371f1be9b3adcb5fb6caeba62a411687c2059316.tar.gz
re3-371f1be9b3adcb5fb6caeba62a411687c2059316.tar.bz2
re3-371f1be9b3adcb5fb6caeba62a411687c2059316.tar.lz
re3-371f1be9b3adcb5fb6caeba62a411687c2059316.tar.xz
re3-371f1be9b3adcb5fb6caeba62a411687c2059316.tar.zst
re3-371f1be9b3adcb5fb6caeba62a411687c2059316.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/PlayerPed.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index d96cb683..1d96ba6d 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -574,8 +574,12 @@ CPlayerPed::DoWeaponSmoothSpray(void)
return -1.0f;
case WEAPONTYPE_CHAINSAW:
- if (GetMeleeStartAnim(weaponInfo) && RpAnimBlendClumpGetAssociation(GetClump(), GetMeleeStartAnim(weaponInfo)))
+ if (GetMeleeStartAnim(weaponInfo) && RpAnimBlendClumpGetAssociation(GetClump(), GetMeleeStartAnim(weaponInfo))) {
+#ifdef FREE_CAM
+ if (TheCamera.Cams[0].Using3rdPersonMouseCam()) return -1.0f;
+#endif
return PI / 128.0f;
+ }
else if (GetFireAnimGround(weaponInfo, false) && RpAnimBlendClumpGetAssociation(GetClump(), GetFireAnimGround(weaponInfo, false)))
return PI / 176.f;
else
@@ -1475,6 +1479,13 @@ CPlayerPed::PlayerControlZelda(CPad *padUsed)
padMoveInGameUnit = CVector2D(leftRight, upDown).Magnitude() / PAD_MOVE_TO_GAME_WORLD_MOVE;
}
+#ifdef FREE_CAM
+ if (TheCamera.Cams[0].Using3rdPersonMouseCam() && smoothSprayRate > 0.0f) {
+ padMoveInGameUnit = 0.0f;
+ smoothSprayWithoutMove = false;
+ }
+#endif
+
if (padMoveInGameUnit > 0.0f || smoothSprayWithoutMove) {
float padHeading = CGeneral::GetRadianAngleBetweenPoints(0.0f, 0.0f, -leftRight, upDown);
float neededTurn = CGeneral::LimitRadianAngle(padHeading - camOrientation);