Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 7, 2025
+1 −1
Merged

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

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cddd1cb
Fix ButtonSquare state to account for aiming weapon condition
MohabCodeX Sep 11, 2025
7b03041
Merge branch 'master' into fix/jump-trigger-weapon-zoom
MohabCodeX Sep 11, 2025
e380124
Merge branch 'master' into fix/jump-trigger-weapon-zoom
MohabCodeX Sep 13, 2025
5aa8a11
Merge branch 'master' into fix/jump-trigger-weapon-zoom
MohabCodeX Sep 14, 2025
faa64f2
Merge branch 'master' into fix/jump-trigger-weapon-zoom
Dutchman101 Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Client/core/CKeyBinds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,7 +1950,7 @@ void CKeyBinds::DoPostFramePulse()

// * Enter Exit
// * Change View
cs.ButtonSquare = (!bEnteringVehicle && g_bcControls[11].bState) ? 255 : 0; // Jump
cs.ButtonSquare = (!bEnteringVehicle && !bAimingWeapon && g_bcControls[11].bState) ? 255 : 0; // Jump
cs.ButtonCross = (g_bcControls[12].bState) ? 255 : 0; // Sprint
cs.ShockButtonR = (g_bcControls[13].bState) ? 255 : 0; // Look Behind
cs.ShockButtonL = (g_bcControls[14].bState) ? 255 : 0; // Crouch
Expand Down