Merge remote-tracking branch 'upstream/miami' into miami

This commit is contained in:
Nikolay Korolev
2020-05-23 20:07:30 +03:00
29 changed files with 489 additions and 305 deletions

View File

@ -624,8 +624,10 @@ CVehicle::InflictDamage(CEntity* damagedBy, eWeaponType weaponType, float damage
case WEAPONTYPE_SILENCED_INGRAM:
case WEAPONTYPE_MP5:
case WEAPONTYPE_SHOTGUN:
case WEAPONTYPE_AK47:
case WEAPONTYPE_M16:
case WEAPONTYPE_SPAS12_SHOTGUN:
case WEAPONTYPE_STUBBY_SHOTGUN:
case WEAPONTYPE_RUGER:
case WEAPONTYPE_M4:
case WEAPONTYPE_SNIPERRIFLE:
case WEAPONTYPE_HELICANNON:
case WEAPONTYPE_UZI_DRIVEBY: