From: z411 Date: Sun, 4 Oct 2020 20:06:30 +0000 (-0300) Subject: Added shotgun melee impact sound X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0737add0fe068e971787afeb6090a5081a977533;p=xonotic%2Fxonotic-data.pk3dir.git Added shotgun melee impact sound --- diff --git a/qcsrc/common/sounds/all.inc b/qcsrc/common/sounds/all.inc index 55e1da882..8e90cd799 100644 --- a/qcsrc/common/sounds/all.inc +++ b/qcsrc/common/sounds/all.inc @@ -96,6 +96,7 @@ SOUND(SEEKEREXP3, W_Sound("seekerexp3")); SOUND(SEEKER_FIRE, W_Sound("seeker_fire")); SOUND(SHOTGUN_FIRE, W_Sound("shotgun_fire")); SOUND(SHOTGUN_MELEE, W_Sound("shotgun_melee")); +SOUND(SHOTGUN_MELEE_IMPACT, W_Sound("shotgun_melee_impact")); SOUND(STRENGTH_FIRE, W_Sound("strength_fire")); SOUND(TAGEXP1, W_Sound("tagexp1")); SOUND(TAGEXP2, W_Sound("tagexp2")); diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index dcde58a30..1bc18846e 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -105,6 +105,7 @@ void W_Shotgun_Melee_Think(entity this) //print(strcat(this.realowner.netname, " hitting ", target_victim.netname, " with ", strcat(ftos(swing_damage), " damage (factor: ", ftos(swing_factor), ") at "), ftos(time), " seconds.\n")); + sound(target_victim, CH_SHOTS, SND_SHOTGUN_MELEE_IMPACT, VOL_BASE, ATTEN_NORM); Damage(target_victim, this.realowner, this.realowner, swing_damage, WEP_SHOTGUN.m_id | HITTYPE_SECONDARY, this.weaponentity_fld, this.realowner.origin + this.realowner.view_ofs,