Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/modelinfo/PedModelInfo.cpp
This commit is contained in:
Sergeanur
2021-04-09 04:31:46 +03:00
16 changed files with 194 additions and 91 deletions

View File

@ -1066,7 +1066,11 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
if ( info->m_nFiringRate >= 50 || !(++counter & 1) )
{
#ifdef FIX_BUGS
AddGunFlashBigGuns(*fireSource, target);
#else
AddGunFlashBigGuns(*fireSource, *fireSource + target);
#endif
CVector gunshellPos = *fireSource;
gunshellPos -= CVector(0.65f*ahead.x, 0.65f*ahead.y, 0.0f);