Zoom In/Out key binding fixes

[darkdrifter]

Resolves #524

Hello,

This is my first contribution to any open source project, tried to follow the guidelines and coding style but I may have missed some things. Don't hesitate to tell me if I did.

Threes fixes are included in this pull request:

• Fix for the inverted zoom in/out bindings. For some reason, CControllerState RightShoulder2 controls Zoom Out, while the CControllerState LeftShoulder2 controls the Zoom In, I don't know if it's the game behavior on PS2.
• Fix for the Zoom In/Out behavior being also controlled by the Weapon Previous/Next key binds. This behavior isn't present in the base game so it shouldn't be in MTA.
• Thanks to the fix just above, we can remove a hack that disconnected Zoom In/Out behavior using mouse wheel to try and fix zoom being applied twice. I think it was actually due to the fact that Weapon Previous/Next was applied first (if bound on the scroll wheel) and them Zoom In/Out gets applied and adds another zoom on top of it. With that hack removed, we can now bind mouse scroll wheel for the zoom. On master if you try to bind the scroll wheel only on the zoom in/out, you'll observe that the zoom isn't working. (moved into Fix weapon zoom behavior #2769)

Don't mind the first two commits, it was a first try to fix the issue that I reverted after I dug up further and found what I think is a better fix.

[lopezloo]

I think it was actually due to the fact that Weapon Previous/Next was applied first (if bound on the scroll wheel) and them Zoom In/Out gets applied and adds another zoom on top of it.

I haven't tested your PR yet but I have unbinded all keys (via unbind all command) except aim_weapon and I'm still being able to zoom in/out sniper using scroll wheel. (tested on v1.5.9-release-21326)

[darkdrifter]

I tried with unbind all on v1.5.9-release-21331 and I can't zoom using mouse scroll until I bind mouse scrolling to Weapon Next and Weapon Previous
I'm testing in Map Editor in "Full Test" BTW
EDIT: Tried in a online server, same behavior.

[lopezloo]

Looks like it actually depends on single player control settings. I have unbinded it in single player and it doesn't work anymore. It shouldn't work like that.

[darkdrifter]

Yeah indeed when I set the mouse scrolling in single player I get a smooth zoom in/out even with everything unbound in MTA. And if I bind mouse scrolling in MTA I get a jerky "double zoom", probably the thing that the hack tried to fix.
I'll tried on my build with this PR, I don't have the said "double zoom" if I bind the mouse scroll on solo and MTA, though I still have mouse scrolling when I unbind all if I have it set in solo. So it's an improvement but there is still something weird going on.

[darkdrifter]

I found the issue with the scrolling that caused it to be affected by single player. It seems that GTA SA uses Direct Input to get the scroll wheel value when using mouse scroll wheel on zoom. It's probably to have smoother zoom, as now that I have hooked the zoom value on direct input, the single player no longer affects MTA but the scrolling is a bit harsh.
As I described in the comment where I placed the hook, a better option could be to instead give this data only when we want it (when zoom is bound to scroll wheel in MTA) to retain the proper smooth zoom, but it would require also successfully forcing the game to use this data even when it is not bound in single player, but I haven't looked closely at this option yet.

[lopezloo]

That mouse wheel zoom logic is defined in CCam::Process_M16_1stPerson(). It calls CControllerConfigManager::GetMouseButtonAssociatedWithAction(&ControlsManager, PED_SNIPER_ZOOM_IN). The question is - why does it seems to be returning something if it's not defined in MTA binds? We need to investigate it more since it would be nice to have smooth zoom.

[lopezloo]

I suggest to remove that mouse wheel zoom fix and create seperate PR for that instead.

Related issues:

• toggleControl next_weapon and previous_weapon takes sniper zoom with Q and A! #2275
• getPedControlState returns true for zoom_out when zooming in, and vice versa #2570
• Can't unbind wheel (zoom in/out) #515

Jump bind also triggers zoom in (it doesn't happen in single player).

[bum8hj]

Jump bind also triggers zoom in (it doesn't happen in single player).

This is slightly off-topic, but I believe jumping also forcefully re-enables aim_weapon when it's disabled with toggleControl.

[darkdrifter]

Hello, I reverted the last commit that I will move into a WIP PR that will look into the whole zoom behavior issues (to the best of my abilities).
I don't know how to quickly reproduce issue #2275 or #2570 to see if it's still present with this PR, but it would be nice to know if it fixes them indirectly.
@lopezloo we stop this PR with only this fix then and integrate it with its improvements even if some flaws are still present ?

[lopezloo]

@lopezloo we stop this PR with only this fix then and integrate it with its improvements even if some flaws are still present ?

I just would like to merge fix for inverted controls first. Please restore that zoom check which MTA used to have (and then remove this condition in your other PR).

This is slightly off-topic, but I believe jumping also forcefully re-enables aim_weapon when it's disabled with toggleControl.

Unable to reproduce that.

[darkdrifter]

Please restore that zoom check which MTA used to have (and then remove this condition in your other PR).

Done ;)

[lopezloo]

Looks good to me. Thank you.

I have slighty edited first post.