diff --git a/code/__DEFINES/input.dm b/code/__DEFINES/input.dm index 57fb22a81e9..7ec645990d7 100644 --- a/code/__DEFINES/input.dm +++ b/code/__DEFINES/input.dm @@ -1,2 +1,2 @@ ///if the running average click latency is above this amount then clicks will never queue and will execute immediately -#define MAXIMUM_CLICK_LATENCY (20 MILLISECONDS) +#define MAXIMUM_CLICK_LATENCY (0.5 DECISECONDS) diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index 3cbceaa0d17..c39712771be 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -53,7 +53,7 @@ VERB_MANAGER_SUBSYSTEM_DEF(input) if(control != "mapwindow.map") return FALSE - if(average_click_delay >= MAXIMUM_CLICK_LATENCY || !..()) + if(average_click_delay > MAXIMUM_CLICK_LATENCY || !..()) current_clicks++ average_click_delay = MC_AVG_FAST_UP_SLOW_DOWN(average_click_delay, 0) return FALSE @@ -82,7 +82,7 @@ VERB_MANAGER_SUBSYSTEM_DEF(input) stack_trace("non /datum/callback/verb_callback instance inside SSinput's verb_queue!") continue - average_click_delay = MC_AVG_FAST_UP_SLOW_DOWN(average_click_delay, TICKS2DS((DS2TICKS(world.time) - queued_click.creation_time)) SECONDS) + average_click_delay = MC_AVG_FAST_UP_SLOW_DOWN(average_click_delay, TICKS2DS((DS2TICKS(world.time) - queued_click.creation_time))) queued_click.InvokeAsync() current_clicks++ @@ -96,5 +96,5 @@ VERB_MANAGER_SUBSYSTEM_DEF(input) /datum/controller/subsystem/verb_manager/input/stat_entry(msg) . = ..() - . += "M/S:[round(movements_per_second,0.01)] | C/S:[round(clicks_per_second,0.01)] ([round(delayed_clicks_per_second,0.01)] | CD: [round(average_click_delay,0.01)])" + . += "M/S:[round(movements_per_second,0.01)] | C/S:[round(clicks_per_second,0.01)] ([round(delayed_clicks_per_second,0.01)] | CD: [round(average_click_delay / (1 SECONDS),0.01)])"