From d0a14830ee00dbf3f5dff1011add684e7676c24d Mon Sep 17 00:00:00 2001 From: SandPoot Date: Mon, 12 Aug 2024 19:52:51 -0300 Subject: [PATCH 1/2] push --- code/_onclick/hud/action_button.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index b347a5c55a..562f304f24 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -76,6 +76,9 @@ if(old_object) old_object.MouseExited(over_location, over_control, params) + if(QDELETED(over_location)) + last_hovored_ref = null + return last_hovored_ref = WEAKREF(over_object) over_object.MouseEntered(over_location, over_control, params) @@ -113,6 +116,7 @@ our_hud.position_action_relative(src, button) save_position() return + . = ..() our_hud.position_action(src, screen_loc) save_position() From e4ecebe0985234ab55fa71ecb1be9ab3e9830380 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Mon, 12 Aug 2024 19:57:35 -0300 Subject: [PATCH 2/2] typecast it in the arguments ffs --- code/_onclick/hud/action_button.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 562f304f24..f5826579c8 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -59,7 +59,7 @@ // Entered and Exited won't fire while you're dragging something, because you're still "holding" it // Very much byond logic, but I want nice behavior, so we fake it with drag -/atom/movable/screen/movable/action_button/MouseDrag(atom/over_object, src_location, over_location, src_control, over_control, params) +/atom/movable/screen/movable/action_button/MouseDrag(atom/over_object, atom/src_location, atom/over_location, src_control, over_control, params) . = ..() if(!can_use(usr)) return