Merge branch 'terencehill/ca_arena_mutators' of git://git.xonotic.org/xonotic/xonotic...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_weaponsystem.qc

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index a84a8a51bd7b2f0fdae6d2681b4ab2485c404de0..a75e2be5af16fee8e3758a60e0590a28f020ad0f 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1049,7 +1049,7 @@ void weapon_thinkf(float fr, float t, void() func)
 
        if((fr == WFRAME_FIRE1 || fr == WFRAME_FIRE2) && t)
        {
-               if(self.weapon == WEP_SHOTGUN && self.BUTTON_ATCK2)
+               if(self.weapon == WEP_SHOTGUN && fr == WFRAME_FIRE2)
                        animdecide_setaction(self, ANIMACTION_MELEE, restartanim);
                else
                        animdecide_setaction(self, ANIMACTION_SHOOT, restartanim);