cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11669 from PsiOmegaDelta/151212-DestroyDestroy

Browse Source 
Observer fixups.
This commit is contained in:
Chinsky
2015-12-12 14:42:05 +03:00
parent e1c7e1da93 f74bd5e1d9
commit 0bd13d5617
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/controllers/observer_listener/datum/observer.dm
View File

@@ -4,28 +4,38 @@
var/list/observer_events
/datum/Destroy()
var/list/destroy_listeners = get_listener_list_from_event(OBSERVER_EVENT_DESTROY)
if(destroy_listeners)
for(var/destroy_listener in destroy_listeners)
call(destroy_listener, destroy_listeners[destroy_listener])(src)
raise_event(OBSERVER_EVENT_DESTROY, list(src))
for(var/list/listeners in observer_events)
listeners.Cut()
return ..()
/datum/proc/register(var/event, var/procOwner, var/proc_call)
var/list/listeners = get_listener_list_from_event(event)
var/list/listeners = get_listener_list_from_event(event, TRUE)
listeners[procOwner] = proc_call
/datum/proc/unregister(var/event, var/procOwner)
var/list/listeners = get_listener_list_from_event(event)
var/list/listeners = get_listener_list_from_event(event, FALSE)
listeners -= procOwner
/datum/proc/get_listener_list_from_event(var/observer_event)
if(!observer_events) observer_events = list()
/datum/proc/raise_event(var/event, var/list/args = list())
var/list/listeners = get_listener_list_from_event(event, FALSE)
if(listeners)
for(var/listener in listeners)
call(listener, listeners[listener])(arglist(args))
/datum/proc/get_listener_list_from_event(var/observer_event, var/create_list)
if(!observer_events)
if(create_list)
observer_events = list()
else
return
var/list/listeners = observer_events[observer_event]
if(!listeners)
listeners = list()
observer_events[observer_event] = listeners
if(create_list)
listeners = list()
observer_events[observer_event] = listeners
else
return
return listeners

14
code/game/objects/items/devices/multitool.dm
View File

@@ -23,6 +23,10 @@
var/buffer_name
var/atom/buffer_object
/obj/item/device/multitool/Destroy()
unregister_buffer(buffer_object)
return ..()
/obj/item/device/multitool/proc/get_buffer(var/typepath)
// Only allow clearing the buffer name when someone fetches the buffer.
// Means you cannot be sure the source hasn't been destroyed until the very moment it's needed.
@@ -41,16 +45,16 @@
if(!buffer || istype(buffer))
buffer_name = buffer ? buffer.name : null
if(buffer != buffer_object)
if(buffer_object)
buffer_object.unregister(OBSERVER_EVENT_DESTROY, src)
unregister_buffer(buffer_object)
buffer_object = buffer
if(buffer_object)
buffer_object.register(OBSERVER_EVENT_DESTROY, src, /obj/item/device/multitool/proc/on_buffer_destroyed)
buffer_object.register(OBSERVER_EVENT_DESTROY, src, /obj/item/device/multitool/proc/unregister_buffer)
/obj/item/device/multitool/proc/on_buffer_destroyed(var/atom/destroyed_buffer)
/obj/item/device/multitool/proc/unregister_buffer(var/atom/buffer_to_unregister)
// Only remove the buffered object, don't reset the name
// This means one cannot know if the buffer has been destroyed until one attempts to use it.
if(destroyed_buffer == buffer_object)
if(buffer_to_unregister == buffer_object && buffer_object)
buffer_object.unregister(OBSERVER_EVENT_DESTROY, src)
buffer_object = null
/obj/item/device/multitool/resolve_attackby(atom/A, mob/user)