From 21da0bbf24771c19355482bc3566e09c32756b57 Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 3 Sep 2015 21:56:32 +0200 Subject: [PATCH] Simplify check_access_list --- code/game/jobs/access.dm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 950d6dd3769..ac8874c003d 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -172,20 +172,11 @@ /obj/proc/check_access_list(var/list/L) - if(!src.req_access && !src.req_one_access) return 1 - if(!istype(src.req_access, /list)) return 1 - if(!src.req_access.len && (!src.req_one_access || !src.req_one_access.len)) return 1 + if(!req_access) req_access = list() + if(!req_one_access) req_one_access = list() if(!L) return 0 if(!istype(L, /list)) return 0 - for(var/req in src.req_access) - if(!(req in L)) //doesn't have this access - return 0 - if(src.req_one_access && src.req_one_access.len) - for(var/req in src.req_one_access) - if(req in L) //has an access from the single access list - return 1 - return 0 - return 1 + return has_access(req_access, req_one_access, L) /proc/has_access(var/list/req_access, var/list/req_one_access, var/list/accesses) for(var/req in req_access)