Skip to content

Zoom In/Out key binding fixes #2767

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 10 commits into from
Oct 21, 2022
Merged

Zoom In/Out key binding fixes #2767

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc625b5
Fix inverted Zoom In/Out bindings (Fixes #524)
darkdrifter Sep 25, 2022
b106ed7
Revert "Fix inverted Zoom In/Out bindings (Fixes #524)"
darkdrifter Sep 25, 2022
eb527d5
Better fix for inverted Zoom In/Out bindings (Fixes #524), also fixes…
darkdrifter Sep 25, 2022
b0ed88c
Remove now useless HACK that prevents Zoom In/Out to be used with mou…
darkdrifter Sep 25, 2022
504b8f7
Merge branch 'multitheftauto:master' into master
darkdrifter Sep 27, 2022
61125e7
Fix weapon zoom getting affected by single player
darkdrifter Sep 27, 2022
a0199f8
Merge branch 'master' into master
darkdrifter Sep 28, 2022
12026e0
Revert "Fix weapon zoom getting affected by single player"
darkdrifter Sep 28, 2022
ab03099
Merge branch 'multitheftauto:master' into master
darkdrifter Oct 4, 2022
817675c
Revert "Remove now useless HACK that prevents Zoom In/Out to be used …
darkdrifter Oct 4, 2022
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
14 changes: 11 additions & 3 deletions Client/core/CKeyBinds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,9 +1920,17 @@ void CKeyBinds::DoPostFramePulse()
{
if (!bInVehicle)
{
cs.ButtonCircle = (g_bcControls[0].bState && !bHasDetonator) ? 255 : 0; // Fire
cs.RightShoulder2 = (g_bcControls[1].bState || (bAimingWeapon && g_bcControls[7].bState)) ? 255 : 0; // Next Weapon / Zoom In
cs.LeftShoulder2 = (g_bcControls[2].bState || (bAimingWeapon && g_bcControls[8].bState)) ? 255 : 0; // Previous Weapon / Zoom Out
cs.ButtonCircle = (g_bcControls[0].bState && !bHasDetonator) ? 255 : 0; // Fire
if (bAimingWeapon)
{
cs.RightShoulder2 = g_bcControls[8].bState ? 255 : 0; // Zoom Out
cs.LeftShoulder2 = g_bcControls[7].bState ? 255 : 0; // Zoom In
}
else
{
cs.RightShoulder2 = g_bcControls[1].bState ? 255 : 0; // Next Weapon
cs.LeftShoulder2 = g_bcControls[2].bState ? 255 : 0; // Previous Weapon
}

if (!ControlForwardsBackWards(cs))
{
Expand Down