From b8a6504be3f1a2792e5abc81190ab0a927522dd0 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Thu, 30 Jan 2014 15:40:58 -0800 Subject: [PATCH] Perform additional checks on qdel(), add some docs. --- code/controllers/garbage.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/controllers/garbage.dm b/code/controllers/garbage.dm index 6ef53e355eb..1a16906a212 100644 --- a/code/controllers/garbage.dm +++ b/code/controllers/garbage.dm @@ -66,5 +66,14 @@ var/global/list/uncollectable_vars=list( Pop() waiting-- -/proc/qdel(var/atom/A) +/** +* NEVER USE THIS FOR ANYTHING OTHER THAN /atom/movable +* OTHER TYPES CANNOT BE QDEL'D BECAUSE THEIR LOC IS LOCKED OR THEY DON'T HAVE ONE. +*/ +/proc/qdel(var/atom/movable/A) + if(!A) return + if(!istype(A)) + warning("qdel passed a [A.type]. qdel() can only handle /atom/movable types.") + del(A) + return garbage.AddTrash(A) \ No newline at end of file