mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 09:42:29 +00:00
[MIRROR] Fixes aiming at the click catcher making you shoot up and right of your target. [MDB IGNORE] (#10831)
* Fixes aiming at the click catcher. (#64147) My PR to fix pixel aiming broke aiming when you were aiming at obscured turfs. The click catcher was properly modifying the click target to be the turf under the click location, but it was passing the `ICON_X` and `ICON_Y` variables on unmodified. This means that instead of being measured from the bottom left corner of the turf you clicked on they were being measured from roughly the bottom left corner of your screen. This makes the click relevant click parsing proc also update the ICON_X and ICON_Y values of the click modifiers. * Fixes aiming at the click catcher making you shoot up and right of your target. * Update fullauto.dm Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
@@ -532,10 +532,10 @@
|
||||
var/mob/living/carbon/C = usr
|
||||
C.swap_hand()
|
||||
else
|
||||
var/turf/T = params_to_turf(LAZYACCESS(modifiers, SCREEN_LOC), get_turf(usr.client ? usr.client.eye : usr), usr.client)
|
||||
params += "&catcher=1"
|
||||
if(T)
|
||||
T.Click(location, control, params)
|
||||
var/turf/click_turf = parse_caught_click_modifiers(modifiers, get_turf(usr.client ? usr.client.eye : usr), usr.client)
|
||||
if (click_turf)
|
||||
modifiers["catcher"] = TRUE
|
||||
click_turf.Click(click_turf, control, list2params(modifiers))
|
||||
. = 1
|
||||
|
||||
/// MouseWheelOn
|
||||
|
||||
Reference in New Issue
Block a user