From 2219250476ea48126167f39326fbfa5164781485 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Thu, 23 May 2019 22:28:01 +0300 Subject: [PATCH 1/3] remove /client/mousemove --- code/_onclick/drag_drop.dm | 13 +------------ code/datums/components/lockon_aiming.dm | 4 ---- code/modules/mob/mob_defines.dm | 2 -- code/modules/projectiles/guns/misc/beam_rifle.dm | 2 -- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index c64f0d7a3ea..75bba177df1 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -102,17 +102,6 @@ /obj/screen/click_catcher/IsAutoclickable() . = 1 -//Please don't roast me too hard -/client/MouseMove(object,location,control,params) - mouseParams = params - mouseLocation = location - mouseObject = object - mouseControlObject = control - if(mob && LAZYLEN(mob.mousemove_intercept_objects)) - for(var/datum/D in mob.mousemove_intercept_objects) - D.onMouseMove(object, location, control, params) - ..() - /datum/proc/onMouseMove(object, location, control, params) return @@ -143,4 +132,4 @@ if (middragatom == src_object) middragtime = 0 middragatom = null - ..() \ No newline at end of file + ..() diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm index bbdbb7dc662..270c5b77ce3 100644 --- a/code/datums/components/lockon_aiming.dm +++ b/code/datums/components/lockon_aiming.dm @@ -47,14 +47,10 @@ if(icon_state) lock_icon_state = icon_state generate_lock_visuals() - var/mob/M = parent - LAZYOR(M.mousemove_intercept_objects, src) START_PROCESSING(SSfastprocess, src) /datum/component/lockon_aiming/Destroy() - var/mob/M = parent clear_visuals() - LAZYREMOVE(M.mousemove_intercept_objects, src) STOP_PROCESSING(SSfastprocess, src) return ..() diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 83d6dcd71a4..3cc734b8f38 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -99,8 +99,6 @@ var/list/progressbars = null //for stacking do_after bars - var/list/mousemove_intercept_objects - var/datum/click_intercept var/registered_z diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm index 81e1b7ffd2f..66ba6d4115d 100644 --- a/code/modules/projectiles/guns/misc/beam_rifle.dm +++ b/code/modules/projectiles/guns/misc/beam_rifle.dm @@ -267,11 +267,9 @@ stop_aiming(current_user) QDEL_NULL(mobhook) if(istype(current_user)) - LAZYREMOVE(current_user.mousemove_intercept_objects, src) current_user = null if(istype(user)) current_user = user - LAZYOR(current_user.mousemove_intercept_objects, src) mobhook = user.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_mob_move))) /obj/item/gun/energy/beam_rifle/onMouseDrag(src_object, over_object, src_location, over_location, params, mob) From 6584dc926f0bc7a3f6f8883e26aaeed9177e32cc Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Fri, 24 May 2019 15:14:42 +0300 Subject: [PATCH 2/3] this too --- code/_onclick/drag_drop.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index 75bba177df1..b048fa224c9 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -102,9 +102,6 @@ /obj/screen/click_catcher/IsAutoclickable() . = 1 -/datum/proc/onMouseMove(object, location, control, params) - return - /client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params) var/list/L = params2list(params) if (L["middle"]) From 0a0fbeef53254ec6015e1ed986842fcf141db01d Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Fri, 24 May 2019 21:47:28 +0300 Subject: [PATCH 3/3] Update lockon_aiming.dm --- code/datums/components/lockon_aiming.dm | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm index 270c5b77ce3..c27b9ce0d60 100644 --- a/code/datums/components/lockon_aiming.dm +++ b/code/datums/components/lockon_aiming.dm @@ -116,27 +116,6 @@ return LAZYREMOVE(immune_weakrefs, A.weak_reference) -/datum/component/lockon_aiming/onMouseMove(object,location,control,params) - var/mob/M = parent - if(!istype(M) || !M.client) - return - var/datum/position/P = mouse_absolute_datum_map_position_from_client(M.client) - if(!P) - return - var/turf/T = P.return_turf() - LAZYINITLIST(last_location) - if(length(last_location) == 3 && last_location[1] == T.x && last_location[2] == T.y && last_location[3] == T.z) - return //Same turf, don't bother. - if(last_location) - last_location.Cut() - else - last_location = list() - last_location.len = 3 - last_location[1] = T.x - last_location[2] = T.y - last_location[3] = T.z - autolock() - /datum/component/lockon_aiming/process() if(update_disabled) return