]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Added shotgun melee impact sound
authorz411 <z411@omaera.org>
Sun, 4 Oct 2020 20:06:30 +0000 (17:06 -0300)
committerz411 <z411@omaera.org>
Sun, 4 Oct 2020 20:06:30 +0000 (17:06 -0300)
qcsrc/common/sounds/all.inc
qcsrc/common/weapons/weapon/shotgun.qc

index 55e1da8826ab596888e94c7944bc13f308c080ed..8e90cd799fde9ef1f951fbebc19d72195d954fc1 100644 (file)
@@ -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"));
index dcde58a303554a79794e6c16fd48b0bd8295652b..1bc18846e5e752601eb34f368b603832f647a369 100644 (file)
@@ -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,