Commit 4cd831a

committed

Synchronize changes from 1.6 master branch [ci skip]

8f85924 Fix jump control triggering weapon zoom while aiming (#2798) (#4454)

2 parents bf51098 + 8f85924 commit 4cd831aCopy full SHA for 4cd831a

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1950,7 +1950,7 @@ void CKeyBinds::DoPostFramePulse()`
`1950`	`1950`
`1951`	`1951`	`// * Enter Exit`
`1952`	`1952`	`// * Change View`
`1953`		`- cs.ButtonSquare = (!bEnteringVehicle && g_bcControls[11].bState) ? 255 : 0; // Jump`
	`1953`	`+ cs.ButtonSquare = (!bEnteringVehicle && !bAimingWeapon && g_bcControls[11].bState) ? 255 : 0; // Jump`
`1954`	`1954`	`cs.ButtonCross = (g_bcControls[12].bState) ? 255 : 0; // Sprint`
`1955`	`1955`	`cs.ShockButtonR = (g_bcControls[13].bState) ? 255 : 0; // Look Behind`
`1956`	`1956`	`cs.ShockButtonL = (g_bcControls[14].bState) ? 255 : 0; // Crouch`

Comments

(0)