From 8e7d21da2c1a5f8701f3abde89c8dc4fa7da5100 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Mon, 20 Jul 2020 18:57:09 +1000 Subject: [PATCH] Restore trailing tab to fix merge conflict --- qcsrc/common/weapons/weapon/shotgun.qc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index c21519c2a5..f7c29a26e4 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -18,7 +18,7 @@ void W_Shotgun_Attack(Weapon thiswep, entity actor, .entity weaponentity, float for(int sc = 0;sc < bullets;sc = sc + 1) fireBullet_antilag(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, thiswep.m_id, bullet_trail_effect, false); - + if(lag && bullets > 0) antilag_restore_all(actor); -- 2.39.2