From 72af73347b7aa1be8faebda822db20f32df44183 Mon Sep 17 00:00:00 2001 From: "cagerrin@gmail.com" Date: Mon, 14 Feb 2011 08:02:32 +0000 Subject: [PATCH] Fix for unclickable everything. (seems Neo missed a file when reverting) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1041 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/global.dm | 7 +------ code/defines/mob/mob.dm | 1 - code/game/atom_procs.dm | 13 ++++--------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/code/defines/global.dm b/code/defines/global.dm index c9b3f5bfcfd..712d0dc9e14 100644 --- a/code/defines/global.dm +++ b/code/defines/global.dm @@ -200,9 +200,4 @@ var sqllogin = "root" sqlpass = "" - sqllogging = 0 // Should we log deaths, population stats, etc? - - // Changing this will affect on how quickly players are allowed to click on things. - // Measured in 1/10th of a second. Defaults to 10 = 1 sec. -- Skie - // TODO: Make changable by admin command? I dunno. - ClickDelay = 10 + sqllogging = 0 // Should we log deaths, population stats, etc? \ No newline at end of file diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm index d22422ff464..07874221737 100644 --- a/code/defines/mob/mob.dm +++ b/code/defines/mob/mob.dm @@ -94,7 +94,6 @@ var/m_int = null var/m_intent = "run" var/lastDblClick = 0 - var/next_click_queued = 0 // For one UI-click buffer system var/lastKnownIP = null var/obj/stool/buckled = null var/obj/item/weapon/handcuffs/handcuffed = null diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index ea2fed9b025..3a3278d1a03 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -216,7 +216,6 @@ ..() - if(usr.in_throw_mode) return usr:throw_item(src) @@ -258,9 +257,9 @@ // world << "according to dblclick(), t5 is [t5]" if (((t5 || (W && (W.flags & 16))) && !( istype(src, /obj/screen) ))) - if (usr.next_move < world.time) // -- Removed due to Click Queue implementation -- Skie + if (usr.next_move < world.time) usr.prev_move = usr.next_move - usr.next_move = world.time + 1 // Was 10 + usr.next_move = world.time + 10 else return if ((src.loc && (get_dist(src, usr) < 2 || src.loc == usr.loc))) @@ -373,8 +372,8 @@ else if (istype(src, /obj/screen)) usr.prev_move = usr.next_move - if (usr.next_move < world.time) //-- Removed due to Click Queue implementation -- Skie - usr.next_move = world.time + 1 // was 10 + if (usr.next_move < world.time) + usr.next_move = world.time + 10 else return if (!( usr.restrained() )) @@ -404,10 +403,6 @@ return -/atom/DblClick() // Does nothing. - return - - /atom/proc/get_global_map_pos() if(!global_map.len) return var/cur_x = null