wtf

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_FlippingAnim(pm->ps->legsAnim)/* ||pm->ps->legsAnimTimer<=250 */)
-		&& (!PM_SaberThrowable()||(pm->cmd.buttons&BUTTON_WALKING))
+		&& (!(pm->ps->pm_flags&PMF_ALT_ATTACK_HELD) /* ||PM_SaberInReturn(pm->ps->saberMove) */)
+		// && (!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
@@ -12266,11 +12266,11 @@ void PM_WeaponLightsaber(void)
 		//OR:	Make it so that attacks don't start until 100ms after you
 		//		press the attack button...???
 		if ( (pm->ps->clientNum < MAX_CLIENTS||PM_ControlledByPlayer()) //player
-			&& PM_SaberInReturn( pm->ps->saberMove )//in a saber return move - FIXME: what about transitions?
+			// && PM_SaberInReturn( pm->ps->saberMove )//in a saber return move - FIXME: what about transitions?
 			//&& pm->ps->torsoAnimTimer<=250//towards the end of a saber return anim
 			&& pm->ps->saberBlocked == BLOCKED_NONE//not interacting with any other saber
 			&& !(pm->cmd.buttons&BUTTON_ATTACK)//not trying to swing the saber
-			&& (pm->cmd.forwardmove||pm->cmd.rightmove) )//trying to kick in a specific direction
+			/* && (pm->cmd.forwardmove||pm->cmd.rightmove) */ )//trying to kick in a specific direction
 		{
 			if ( PM_CheckAltKickAttack() )//trying to do a kick
 			{//allow them to do the kick now!

codemp/game/bg_saber.c

@@ -2972,14 +2972,14 @@ void PM_WeaponLightsaber(void)
 		{ //kick instead of doing a throw
 			//if in a saber attack return anim, can interrupt it with a kick
 			if ( pm->ps->weaponTime > 0//can't fire yet
-				&& PM_SaberInReturn( pm->ps->saberMove )//in a saber return move - FIXME: what about transitions?
+				// && PM_SaberInReturn( pm->ps->saberMove )//in a saber return move - FIXME: what about transitions?
 				//&& pm->ps->weaponTime <= 250//should be able to fire soon
 				//&& pm->ps->torsoTimer <= 250//torso almost done
 				&& pm->ps->saberBlocked == BLOCKED_NONE//not interacting with any other saber
 				&& !(pm->cmd.buttons&BUTTON_ATTACK) )//not trying to swing the saber
 			{
-				if ( (pm->cmd.forwardmove||pm->cmd.rightmove)//trying to kick in a specific direction
-					&& PM_CheckAltKickAttack() )//trying to do a kick
+				if ( /* (pm->cmd.forwardmove||pm->cmd.rightmove)//trying to kick in a specific direction
+					&& */ PM_CheckAltKickAttack() )//trying to do a kick
 				{//allow them to do the kick now!
 					int kickMove = PM_KickMoveForConditions();
 					if (kickMove != -1)