cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bitflag returns from component signals (#33186)

Browse Source 
* For more useful returns from sendsignal

* removes a needless else/indentation

* cleanup
This commit is contained in:
Emmett Gaines
2017-12-01 14:09:25 -05:00
committed by Jordan Brown
parent 0cf2bc2da4
commit d56a47253e
10 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/_component.dm
+8 -7
View File
@@ -164,24 +164,24 @@
/datum/proc/SendSignal(sigtype, ...)
var/list/comps = datum_components
if(!comps)
return FALSE
return NONE
var/list/arguments = args.Copy()
arguments.Cut(1, 2)
var/target = comps[/datum/component]
if(!length(target))
var/datum/component/C = target
if(!C.enabled)
return FALSE
return NONE
var/list/sps = C.signal_procs
var/datum/callback/CB = LAZYACCESS(sps, sigtype)
if(!CB)
return FALSE
return NONE
. = CB.InvokeAsync(arglist(arguments))
if(.)
if(. & COMPONENT_ACTIVATED)
ComponentActivated(C)
C.AfterComponentActivated()
else
. = FALSE
. = NONE
for(var/I in target)
var/datum/component/C = I
if(!C.enabled)
@@ -190,10 +190,11 @@
var/datum/callback/CB = LAZYACCESS(sps, sigtype)
if(!CB)
continue
if(CB.InvokeAsync(arglist(arguments)))
var/retval = CB.InvokeAsync(arglist(arguments))
. |= retval
if(retval & COMPONENT_ACTIVATED)
ComponentActivated(C)
C.AfterComponentActivated()
. = TRUE
/datum/proc/ComponentActivated(datum/component/C)
set waitfor = FALSE