From: Martin Taibr Date: Wed, 26 Sep 2018 06:43:27 +0000 (+0200) Subject: Merge branch 'master' into martin-t/bullet-trails X-Git-Tag: xonotic-v0.8.5~1797^2~1^2~1 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=791f300d2660d6b75a51c6e7f302d6fa6b64861a Merge branch 'master' into martin-t/bullet-trails --- 791f300d2660d6b75a51c6e7f302d6fa6b64861a diff --cc qcsrc/common/weapons/weapon/shotgun.qc index 1ee969bb8,c31a32de2..eea1165ff --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@@ -6,10 -6,10 +6,9 @@@ void W_Shotgun_Attack(Weapon thiswep, e { W_DecreaseAmmo(thiswep, actor, ammocount, weaponentity); - W_SetupShot(actor, weaponentity, true, 5, SND_SHOTGUN_FIRE, ((isprimary) ? CH_WEAPON_A : CH_WEAPON_SINGLE), damage * bullets, WEP_SHOTGUN.m_id); + W_SetupShot(actor, weaponentity, true, 5, SND_SHOTGUN_FIRE, ((isprimary) ? CH_WEAPON_A : CH_WEAPON_SINGLE), damage * bullets, thiswep.m_id); for(int sc = 0;sc < bullets;sc = sc + 1) - fireBullet(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, WEP_SHOTGUN.m_id, bullet_trail_effect); - fireBullet(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, thiswep.m_id, 0); -- ++ fireBullet(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, thiswep.m_id, bullet_trail_effect); Send_Effect(EFFECT_SHOTGUN_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, ammocount);