From cd25cb4b3a6b1da490b6aca04c79e637727339f0 Mon Sep 17 00:00:00 2001 From: spookerton Date: Mon, 31 Oct 2022 08:57:02 +0000 Subject: [PATCH] correct mixed case QDEL_NULL/qdel_null + behavior --- code/__defines/qdel.dm | 2 +- code/_macros.dm | 2 -- code/_onclick/hud/hud.dm | 2 +- code/_onclick/hud/screen_objects.dm | 12 ++++++------ code/game/machinery/teleporter.dm | 2 +- code/game/objects/effects/mines.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 2 +- code/game/objects/items/devices/suit_cooling.dm | 2 +- code/game/objects/items/uav.dm | 4 ++-- code/game/objects/items/weapons/RPD.dm | 4 ++-- .../objects/structures/crates_lockers/__closets.dm | 2 +- code/modules/client/client procs.dm | 2 +- code/modules/holomap/mapper.dm | 2 +- .../integrated_electronics/subtypes/output.dm | 2 +- .../simple_mob/subtypes/mechanical/mecha/mecha.dm | 2 +- .../modular_computers/hardware/battery_module.dm | 2 +- code/modules/projectiles/guns/launcher/bows.dm | 2 +- 17 files changed, 23 insertions(+), 25 deletions(-) diff --git a/code/__defines/qdel.dm b/code/__defines/qdel.dm index 278a2064db..94725229d1 100644 --- a/code/__defines/qdel.dm +++ b/code/__defines/qdel.dm @@ -25,7 +25,7 @@ //Qdel helper macros. #define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE) #define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME) -#define QDEL_NULL(item) qdel(item); item = null +#define QDEL_NULL(x) if(x) { qdel(x) ; x = null } #define QDEL_NULL_LIST QDEL_LIST_NULL #define QDEL_LIST_NULL(x) if(x) { for(var/y in x) { qdel(y) } ; x = null } #define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); } diff --git a/code/_macros.dm b/code/_macros.dm index 768ab886e2..603b7c45e3 100644 --- a/code/_macros.dm +++ b/code/_macros.dm @@ -37,8 +37,6 @@ #define CanInteract(user, state) (CanUseTopic(user, state) == STATUS_INTERACTIVE) -#define qdel_null(x) if(x) { qdel(x) ; x = null } - #define sequential_id(key) uniqueness_repository.Generate(/datum/uniqueness_generator/id_sequential, key) #define random_id(key,min_id,max_id) uniqueness_repository.Generate(/datum/uniqueness_generator/id_random, key, min_id, max_id) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 0fe471eddc..8ae8a56207 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -196,7 +196,7 @@ var/global/list/global_huds = list( /datum/hud/Destroy() . = ..() - qdel_null(minihuds) + QDEL_NULL(minihuds) grab_intent = null hurt_intent = null disarm_intent = null diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index c1fecc4480..c4c61bb16f 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -680,13 +680,13 @@ /obj/screen/movable/mapper_holder/Destroy() - qdel_null(mask_full) - qdel_null(mask_ping) - qdel_null(bg) + QDEL_NULL(mask_full) + QDEL_NULL(mask_ping) + QDEL_NULL(bg) - qdel_null(frame) - qdel_null(powbutton) - qdel_null(mapbutton) + QDEL_NULL(frame) + QDEL_NULL(powbutton) + QDEL_NULL(mapbutton) extras_holder = null owner = null diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 78f6fae298..a832ce65f2 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -40,7 +40,7 @@ teleport_control.station = station /obj/machinery/computer/teleporter/Destroy() - qdel_null(teleport_control) + QDEL_NULL(teleport_control) return ..() /obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 9151b62b1a..52ede9d2e4 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -29,7 +29,7 @@ unregister_dangerous_to_step() if(trap) QDEL_NULL(trap) - qdel_null(wires) + QDEL_NULL(wires) return ..() /obj/effect/mine/Moved(atom/oldloc) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index e8adcbded9..a2a6b4b88e 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -32,7 +32,7 @@ /obj/item/flashlight/Destroy() STOP_PROCESSING(SSobj, src) - qdel_null(cell) + QDEL_NULL(cell) return ..() /obj/item/flashlight/get_cell() diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 8633dddb43..2b08731098 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -35,7 +35,7 @@ cell = new/obj/item/cell/high(src) //comes not with the crappy default power cell - because this is dedicated EVA equipment /obj/item/suit_cooling_unit/Destroy() - qdel_null(cell) + QDEL_NULL(cell) return ..() /obj/item/suit_cooling_unit/process() diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index 59b760852b..1dfb398bc1 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -52,8 +52,8 @@ ion_trail.stop() /obj/item/uav/Destroy() - qdel_null(cell) - qdel_null(ion_trail) + QDEL_NULL(cell) + QDEL_NULL(ion_trail) LAZYCLEARLIST(masters) STOP_PROCESSING(SSobj, src) return ..() diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index cb771f60b9..e14d49247c 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -58,8 +58,8 @@ first_disposal = GLOB.disposal_pipe_recipes[GLOB.disposal_pipe_recipes[1]][1] /obj/item/pipe_dispenser/Destroy() - qdel_null(spark_system) - qdel_null(tool) + QDEL_NULL(spark_system) + QDEL_NULL(tool) return ..() /obj/item/pipe_dispenser/attack_self(mob/user) diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 8543678601..2407084473 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -80,7 +80,7 @@ /obj/structure/closet/Destroy() . = ..() - qdel_null(door_obj) + QDEL_NULL(door_obj) /obj/structure/closet/examine(mob/user) . = ..() diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 1120243c4e..339c69cd72 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -424,7 +424,7 @@ winset(src, null, "outputwindow.htmloutput.is-visible=false;outputwindow.oldoutput.is-visible=false;outputwindow.chatloadlabel.is-visible=true") //The hard way - qdel_null(src.chatOutput) + QDEL_NULL(src.chatOutput) chatOutput = new /datum/chatOutput(src) //veechat chatOutput.send_resources() spawn() diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm index c64f5baa46..00558059aa 100644 --- a/code/modules/holomap/mapper.dm +++ b/code/modules/holomap/mapper.dm @@ -112,7 +112,7 @@ map_image_cache.Cut() icon_image_cache.Cut() - qdel_null(extras_holder) + QDEL_NULL(extras_holder) return ..() diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index 99c6cdd9cc..6549177e40 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -502,7 +502,7 @@ QDEL_NULL(hologram) // holo_beam.End() -// qdel_null(holo_beam) +// QDEL_NULL(holo_beam) power_draw_idle = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm index 3c1446142a..1dbd1e355f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm @@ -59,7 +59,7 @@ return ..() /mob/living/simple_mob/mechanical/mecha/Destroy() - qdel_null(sparks) + QDEL_NULL(sparks) return ..() /mob/living/simple_mob/mechanical/mecha/death() diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm index 6ef8aba6ba..85e909465c 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -71,7 +71,7 @@ . = ..() /obj/item/computer_hardware/battery_module/Destroy() - qdel_null(battery) + QDEL_NULL(battery) return ..() /obj/item/computer_hardware/battery_module/proc/charge_to_full() diff --git a/code/modules/projectiles/guns/launcher/bows.dm b/code/modules/projectiles/guns/launcher/bows.dm index e2f45a5fc1..84276da7cb 100644 --- a/code/modules/projectiles/guns/launcher/bows.dm +++ b/code/modules/projectiles/guns/launcher/bows.dm @@ -154,7 +154,7 @@ /obj/item/gun/launcher/crossbow/bow/hardlight/unload(mob/user) if(istype(bolt, /obj/item/arrow/energy)) // Let's not delete a Real Arrow^tm - qdel_null(bolt) + QDEL_NULL(bolt) update_icon() else . = ..()