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

Fix bad reference management in object overlay circuit (#81338)

Browse Source 
## About The Pull Request

`/obj/item/circuit_component/object_overlay` handled the wrong
references when implementing `Destroy`.

## Changelog

🆑 Melbert
fix: The object overlay circuit component will no longer take things
with it.
/🆑
This commit is contained in:
MrMelbert
2024-02-08 08:43:30 +13:00
committed by GitHub
parent 6949120a36
commit 3978e6ffd7
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/components/bci/hud/object_overlay.dm
+16 -19
View File
@@ -27,8 +27,12 @@
var/datum/port/input/signal_on
var/datum/port/input/signal_off
/// Reference to the BCI we're implanted inside
var/obj/item/organ/internal/cyberimp/bci/bci
/// Assoc list of REF to the target atom to the overlay alt appearance it is using
var/list/active_overlays = list()
var/list/options_map
/obj/item/circuit_component/object_overlay/populate_ports()
@@ -42,8 +46,7 @@
image_rotation = add_input_port("Overlay Rotation", PORT_TYPE_NUMBER)
/obj/item/circuit_component/object_overlay/Destroy()
for(var/active_overlay in active_overlays)
QDEL_NULL(active_overlay)
QDEL_LIST_ASSOC_VAL(active_overlays)
return ..()
/obj/item/circuit_component/object_overlay/populate_options()
@@ -78,26 +81,24 @@
var/mob/living/owner = bci.owner
var/atom/target_atom = target.value
if(!owner || !istype(owner) || !owner.client || !target_atom)
if(!istype(owner) || !owner.client || isnull(target_atom))
return
if(COMPONENT_TRIGGERED_BY(signal_on, port))
show_to_owner(target_atom, owner)
if(COMPONENT_TRIGGERED_BY(signal_off, port) && (target_atom in active_overlays))
var/datum/weakref/overlay_ref = active_overlays[target_atom]
var/datum/atom_hud/overlay = overlay_ref?.resolve()
QDEL_NULL(overlay)
active_overlays.Remove(target_atom)
var/datum/atom_hud/existing_overlay = active_overlays[REF(target_atom)]
if(COMPONENT_TRIGGERED_BY(signal_off, port) && !isnull(existing_overlay))
qdel(existing_overlay)
active_overlays -= REF(target_atom)
/obj/item/circuit_component/object_overlay/proc/show_to_owner(atom/target_atom, mob/living/owner)
if(LAZYLEN(active_overlays) >= OBJECT_OVERLAY_LIMIT)
if(length(active_overlays) >= OBJECT_OVERLAY_LIMIT)
return
if(active_overlays[target_atom])
var/datum/weakref/overlay_ref = active_overlays[target_atom]
var/datum/atom_hud/overlay = overlay_ref?.resolve()
QDEL_NULL(overlay)
var/datum/atom_hud/existing_overlay = active_overlays[REF(target_atom)]
if(!isnull(existing_overlay))
qdel(existing_overlay)
var/image/cool_overlay = image(icon = 'icons/hud/screen_bci.dmi', loc = target_atom, icon_state = options_map[object_overlay_options.value], layer = RIPPLE_LAYER)
SET_PLANE_EXPLICIT(cool_overlay, ABOVE_LIGHTING_PLANE, target_atom)
@@ -121,15 +122,11 @@
)
alt_appearance.show_to(owner)
active_overlays[target_atom] = WEAKREF(alt_appearance)
active_overlays[REF(target_atom)] = alt_appearance
/obj/item/circuit_component/object_overlay/proc/on_organ_removed(datum/source, mob/living/carbon/owner)
SIGNAL_HANDLER
for(var/atom/target_atom in active_overlays)
var/datum/weakref/overlay_ref = active_overlays[target_atom]
var/datum/atom_hud/overlay = overlay_ref?.resolve()
QDEL_NULL(overlay)
active_overlays.Remove(target_atom)
QDEL_LIST_ASSOC_VAL(active_overlays)
#undef OBJECT_OVERLAY_LIMIT