From 119c76ab0ed9f1e96a853c47021d7732f9573ff4 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 5 Jul 2016 02:40:05 -0400 Subject: [PATCH] Faster Get Turf from VG --- code/__DEFINES/misc.dm | 2 ++ code/__HELPERS/unsorted.dm | 7 ------- code/game/objects/structures/girders.dm | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index e7fd4916c5a..8fb9aeb459a 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -157,6 +157,8 @@ for(type in view(range, dview_mob)) #define END_FOR_DVIEW dview_mob.loc = null +#define get_turf(A) (get_step(A, 0)) + #define MIN_SUPPLIED_LAW_NUMBER 15 #define MAX_SUPPLIED_LAW_NUMBER 50 diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 5ef6646e8cc..596dcda719c 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1010,13 +1010,6 @@ proc/get_mob_with_client_list() else if (zone == "r_foot") return "right foot" else return zone - -/proc/get_turf(atom/A) - if (!istype(A)) - return - for(A, A && !isturf(A), A=A.loc); //semicolon is for the empty statement - return A - //Finds the distance between two atoms, in pixels //centered = 0 counts from turf edge to edge //centered = 1 counts from turf center to turf center diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 1cd49eb9b50..83e6094f33e 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -41,7 +41,7 @@ else if(!anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "\blue Now securing the girder") - if(get_turf(user, 40)) + if(do_after(user, 40, target = src)) to_chat(user, "\blue You secured the girder!") new/obj/structure/girder( src.loc ) qdel(src)