X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=a75e2be5af16fee8e3758a60e0590a28f020ad0f;hb=db5c4d5b616a207cc01a6c0a81c574a572ce0426;hp=a84a8a51bd7b2f0fdae6d2681b4ab2485c404de0;hpb=7170086b517c814aa5ea60985993900492c8770a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index a84a8a51b..a75e2be5a 100644 --- 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);