cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 10:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turns events into vars instead of a list, to greatly simplify qdel() cleanup.

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-12-14 13:44:05 +01:00
parent 3996c2a57a
commit 7d7aa4b50b
8 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/devices/hacktool.dm
View File

@@ -17,7 +17,7 @@
/obj/item/device/multitool/hacktool/Destroy()
for(var/T in known_targets)
var/atom/target = T
target.unregister(OBSERVER_EVENT_DESTROY, src)
target.destruction.unregister(src)
known_targets.Cut()
qdel(hack_state)
hack_state = null
@@ -68,7 +68,7 @@
return 0
known_targets.Insert(1, target) // Insert the newly hacked target first,
target.register(OBSERVER_EVENT_DESTROY, src, /obj/item/device/multitool/hacktool/proc/on_target_destroy)
target.destruction.register(src, /obj/item/device/multitool/hacktool/proc/on_target_destroy)
return 1
/obj/item/device/multitool/hacktool/proc/sanity_check()
@@ -77,7 +77,7 @@
if(known_targets.len > max_known_targets)
for(var/i = (max_known_targets + 1) to known_targets.len)
var/atom/A = known_targets[i]
A.unregister(OBSERVER_EVENT_DESTROY, src)
A.destruction.unregister(src)
known_targets.Cut(max_known_targets + 1)
/obj/item/device/multitool/hacktool/proc/on_target_destroy(var/target)

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

@@ -48,13 +48,13 @@
unregister_buffer(buffer_object)
buffer_object = buffer
if(buffer_object)
buffer_object.register(OBSERVER_EVENT_DESTROY, src, /obj/item/device/multitool/proc/unregister_buffer)
buffer_object.destruction.register(src, /obj/item/device/multitool/proc/unregister_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(buffer_to_unregister == buffer_object && buffer_object)
buffer_object.unregister(OBSERVER_EVENT_DESTROY, src)
buffer_object.destruction.unregister(src)
buffer_object = null
/obj/item/device/multitool/resolve_attackby(atom/A, mob/user)

4
code/game/objects/items/weapons/cards_ids_syndicate.dm
View File

@@ -66,13 +66,13 @@
unset_registered_user()
registered_user = user
user.set_id_info(src)
user.register(OBSERVER_EVENT_DESTROY, src, /obj/item/weapon/card/id/syndicate/proc/unset_registered_user)
user.destruction.register(src, /obj/item/weapon/card/id/syndicate/proc/unset_registered_user)
return TRUE
/obj/item/weapon/card/id/syndicate/proc/unset_registered_user(var/mob/user)
if(!registered_user || (user && user != registered_user))
return
registered_user.unregister(OBSERVER_EVENT_DESTROY, src)
registered_user.destruction.unregister(src)
registered_user = null
/obj/item/weapon/card/id/syndicate/CanUseTopic(mob/user)