From cea7576048a76d53f3e7d487934a9de5610b2093 Mon Sep 17 00:00:00 2001 From: Gene Date: Mon, 1 Jul 2024 14:43:44 -0700 Subject: [PATCH] allow kicks with force focus key --- code/game/bg_pmove.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/bg_pmove.cpp b/code/game/bg_pmove.cpp index 6425afc88b..3df487a5de 100644 --- a/code/game/bg_pmove.cpp +++ b/code/game/bg_pmove.cpp @@ -11164,9 +11164,9 @@ qboolean PM_SaberThrowable( void ) qboolean PM_CheckAltKickAttack( void ) { if ( (pm->cmd.buttons&BUTTON_ALT_ATTACK) - && (!(pm->ps->pm_flags&PMF_ALT_ATTACK_HELD) ||PM_SaberInReturn(pm->ps->saberMove)) + && (!(pm->ps->pm_flags&PMF_ALT_ATTACK_HELD) || (pm->ps->pm_flags&PMF_FORCE_FOCUS_HELD) || PM_SaberInReturn(pm->ps->saberMove)) && (!PM_FlippingAnim(pm->ps->legsAnim)||pm->ps->legsAnimTimer<=250) - && (!PM_SaberThrowable()) + // && (!PM_SaberThrowable()) && pm->ps->SaberActive() && !(pm->ps->saber[0].saberFlags&SFL_NO_KICKS)//okay to do kicks with this saber && (!pm->ps->dualSabers || !(pm->ps->saber[1].saberFlags&SFL_NO_KICKS) )//okay to do kicks with this saber