archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-03 01:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source 
# Conflicts:
#	src/renderer/Hud.cpp
This commit is contained in:
Sergeanur
2021-07-25 21:01:00 +03:00
parent 1619d2395e 5032d24ad8
commit d83b8cf940
5 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/peds/PedFight.cpp
View File

@ -354,6 +354,14 @@ CPed::SetAttack(CEntity *victim)
SetAimFlag(m_fRotationCur);
}
}
#ifdef FIX_BUGS
// fix aiming for flamethrower and minigun while using PC controls
else if (curWeapon->m_AnimToPlay == ASSOCGRP_FLAMETHROWER && TheCamera.Cams[0].Using3rdPersonMouseCam() && this == FindPlayerPed())
{
SetAimFlag(m_fRotationCur);
((CPlayerPed*)this)->m_fFPSMoveHeading = TheCamera.Find3rdPersonQuickAimPitch();
}
#endif
if (m_nPedState == PED_ATTACK) {
bIsAttacking = true;
return;