cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-10 15:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames click intercept method to avoid collision with ClickOn

Browse Source
This commit is contained in:
AnturK
2016-02-20 13:33:51 +01:00
parent 0c55904f2a
commit 77ee2ded62
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/ai.dm
+2 -2
View File
@@ -11,7 +11,7 @@
*/
/mob/living/silicon/ai/DblClickOn(var/atom/A, params)
if(client.click_intercept)
if(call(client.click_intercept, "ClickOn")(src, params, A))
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
return
if(control_disabled || stat) return
@@ -28,7 +28,7 @@
next_click = world.time + 1
if(client.click_intercept)
if(call(client.click_intercept, "ClickOn")(src, params, A))
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
return
if(control_disabled || stat)
code/_onclick/click.dm
+1 -1
View File
@@ -54,7 +54,7 @@
next_click = world.time + 1
if(client.click_intercept)
if(call(client.click_intercept, "ClickOn")(src, params, A))
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
return
var/list/modifiers = params2list(params)
code/_onclick/cyborg.dm
+1 -1
View File
@@ -12,7 +12,7 @@
next_click = world.time + 1
if(client.click_intercept)
if(call(client.click_intercept,"ClickOn")(src,params,A))
if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
return
if(stat || lockcharge || weakened || stunned || paralysis)
code/_onclick/observer.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/mob/dead/observer/DblClickOn(var/atom/A, var/params)
if(client.click_intercept)
if(call(client.click_intercept,"ClickOn")(src,params,A))
if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
return
if(can_reenter_corpse && mind && mind.current)
@@ -19,7 +19,7 @@
/mob/dead/observer/ClickOn(var/atom/A, var/params)
if(client.click_intercept)
if(call(client.click_intercept,"ClickOn")(src,params,A))
if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
return
var/list/modifiers = params2list(params)
code/modules/admin/verbs/buildmode.dm
+1 -1
View File
@@ -232,7 +232,7 @@
log_admin("[key_name(usr)] has entered build mode.")
/datum/buildmode/proc/ClickOn(user,params,atom/object) //Click Intercept
/datum/buildmode/proc/InterceptClickOn(user,params,atom/object) //Click Intercept
var/list/pa = params2list(params)
var/right_click = pa.Find("right")
var/left_click = pa.Find("left")
code/modules/client/client defines.dm
+1 -1
View File
@@ -4,7 +4,7 @@
//ADMIN THINGS//
////////////////
var/datum/admins/holder = null
var/datum/click_intercept = null // Needs to implement ClickOn(user,params,atom) proc
var/datum/click_intercept = null // Needs to implement InterceptClickOn(user,params,atom) proc
var/AI_Interact = 0
var/jobbancache = null //Used to cache this client's jobbans to save on DB queries