Skip to content
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.

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

Common - Fix Gesture mutex for scroll-wheel reloads #8142

Merged
merged 2 commits into from
Mar 3, 2021

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented Feb 27, 2021

  • Starting loadout
    [["SMG_05_F","","acc_pointer_IR","optic_Aco",["30Rnd_9x21_Mag_SMG_02",30],[],""],[],[],[],["V_PlateCarrier1_rgr",[["ACRE_PRC343_ID_1",1],["30Rnd_9x21_Mag_SMG_02_Tracer_Green",1,30],["30Rnd_9x21_Mag_SMG_02_Tracer_Red",1,30]]],[],"","",[],["ItemMap","","ItemRadioAcreFlagged","ItemCompass","ItemWatch",""]]

  • Use scrollwheel to reload green tracers

  • Point at something with ace_finger or use ace_gesutres

  • Ending loadout
    [["SMG_05_F","","acc_pointer_IR","optic_Aco",["30Rnd_9x21_Mag_SMG_02",30],[],""],[],[],[],["V_PlateCarrier1_rgr",[["ACRE_PRC343_ID_1",1],["30Rnd_9x21_Mag_SMG_02_Tracer_Red",1,30]]],[],"","",[],["ItemMap","","ItemRadioAcreFlagged","ItemCompass","ItemWatch",""]]

  • reload is interrupted and 30Rnd_9x21_Mag_SMG_02_Tracer_Green magazine has vanished

This uses loadout EH to detect when magazine count drop by 1
It will have false postives for simply dropping ammo on the ground or "pass magazine" action but it will simply block gesutres for a short time, which is far better than losing magazines

Edit: This also supports inventory menu drag-drop reloads

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Feb 27, 2021
@PabstMirror PabstMirror added this to the 3.13.6 milestone Feb 27, 2021
@PabstMirror
Copy link
Contributor Author

Should also fix #4178

Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hard to look diff, but looks okay I think.

@PabstMirror PabstMirror merged commit 22faa51 into master Mar 3, 2021
@PabstMirror PabstMirror deleted the reloadMutexScrollWheel branch March 3, 2021 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants