Skip to content

Commit

Permalink
Update client click handling for 514 (#77316)
Browse files Browse the repository at this point in the history
Hey! its 515 time, so i thought we should close up the last compability
change from 514 that slipped thru the cracks.

under 514 the LEFT/RIGHT/MIDDLE mouse button keys to the mouse param
list are set if they are pressed at all, while the `button` param says
which mouse button being clicked triggered that action.

More mouse code likely needs to be changed to account for this, but this
is the most critical path that cared about the distinction between which
buttons are being held and which button triggered the current mouse
action.

Fixes #76836 maybe?
  • Loading branch information
MrStonedOne authored and MarkSuckerberg committed Nov 29, 2023
1 parent d672532 commit aaa5819
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions code/modules/client/client_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -856,11 +856,13 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/ab = FALSE
var/list/modifiers = params2list(params)

var/button_clicked = LAZYACCESS(modifiers, "button")

var/dragged = LAZYACCESS(modifiers, DRAG)
if(dragged && !LAZYACCESS(modifiers, dragged)) //I don't know what's going on here, but I don't trust it
if(dragged && button_clicked != dragged)
return

if (object && object == middragatom && LAZYACCESS(modifiers, LEFT_CLICK))
if (object && object == middragatom && button_clicked == LEFT_CLICK)
ab = max(0, 5 SECONDS-(world.time-middragtime)*0.1)

var/mcl = CONFIG_GET(number/minute_click_limit)
Expand Down

0 comments on commit aaa5819

Please sign in to comment.