always allow kicks

TwelveEyes · Jul 2, 2024 · f562dc6 · f562dc6
1 parent 63da281
commit f562dc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/code/game/bg_pmove.cpp b/code/game/bg_pmove.cpp
@@ -11165,11 +11165,11 @@ 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_FlippingAnim(pm->ps->legsAnim)/* ||pm->ps->legsAnimTimer<=250 */)
+		&& (!PM_FlippingAnim(pm->ps->legsAnim)||pm->ps->legsAnimTimer<=250)
 		&& (!PM_SaberThrowable()||(pm->cmd.buttons&BUTTON_WALKING))
 		// && 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
+		// && !(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
 		)
 	{
 		return qtrue;

diff --git a/codemp/game/bg_saber.c b/codemp/game/bg_saber.c
@@ -2690,7 +2690,7 @@ qboolean PM_CanDoKata( void )
 
 qboolean PM_CheckAltKickAttack( void )
 {
-	if ( pm->ps->weapon == WP_SABER )
+	/* if ( pm->ps->weapon == WP_SABER )
 	{
 		saberInfo_t *saber = BG_MySaber( pm->ps->clientNum, 0 );
 		if ( saber
@@ -2704,10 +2704,10 @@ qboolean PM_CheckAltKickAttack( void )
 		{
 			return qfalse;
 		}
-	}
+	} */
 	if ( (pm->cmd.buttons&BUTTON_ALT_ATTACK)
 		//&& (!(pm->ps->pm_flags&PMF_ALT_ATTACK_HELD)||PM_SaberInReturn(pm->ps->saberMove))
-		&& (!BG_FlippingAnim(pm->ps->legsAnim)/* ||pm->ps->legsTimer<=250 */)
+		&& (!BG_FlippingAnim(pm->ps->legsAnim)||pm->ps->legsTimer<=250)
 		// && (pm->ps->fd.saberAnimLevel == SS_STAFF/*||!pm->ps->saber[0].throwable*/) && !pm->ps->saberHolstered
 		)
 	{