From b871285655a51f4f2f16533b4935ffdb01805f98 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Thu, 29 Mar 2018 02:41:41 -0700 Subject: [PATCH 1/2] Fix 512-only code in recent conveyor belt fix --- code/__HELPERS/_lists.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 91eee45b4d..640966edc9 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -10,10 +10,16 @@ */ #define LAZYINITLIST(L) if (!L) L = list() -#define UNSETEMPTY(L) if (L && !L.len) L = null -#define LAZYREMOVE(L, I) if(L) { L -= I; if(!L.len) { L = null; } } +#define UNSETEMPTY(L) if (L && !length(L)) L = null +#define LAZYREMOVE(L, I) if(L) { L -= I; if(!length(L)) { L = null; } } #define LAZYADD(L, I) if(!L) { L = list(); } L += I; +<<<<<<< HEAD #define LAZYACCESS(L, I) (L ? (isnum(I) ? (I > 0 && I <= L.len ? L[I] : null) : L[I]) : null) +======= +#define LAZYOR(L, I) if(!L) { L = list(); } L |= I; +#define LAZYFIND(L, V) L ? L.Find(V) : 0 +#define LAZYACCESS(L, I) (L ? (isnum(I) ? (I > 0 && I <= length(L) ? L[I] : null) : L[I]) : null) +>>>>>>> 255f899... Fix 512-only code in recent conveyor belt fix (#36722) #define LAZYSET(L, K, V) if(!L) { L = list(); } L[K] = V; #define LAZYLEN(L) length(L) #define LAZYCLEARLIST(L) if(L) L.Cut() From f9d963a6343114b7fd73ca285f935e4f71075496 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 1 Apr 2018 04:40:47 -0500 Subject: [PATCH 2/2] Update _lists.dm --- code/__HELPERS/_lists.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 640966edc9..a8bddf8eed 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -13,13 +13,9 @@ #define UNSETEMPTY(L) if (L && !length(L)) L = null #define LAZYREMOVE(L, I) if(L) { L -= I; if(!length(L)) { L = null; } } #define LAZYADD(L, I) if(!L) { L = list(); } L += I; -<<<<<<< HEAD -#define LAZYACCESS(L, I) (L ? (isnum(I) ? (I > 0 && I <= L.len ? L[I] : null) : L[I]) : null) -======= #define LAZYOR(L, I) if(!L) { L = list(); } L |= I; #define LAZYFIND(L, V) L ? L.Find(V) : 0 #define LAZYACCESS(L, I) (L ? (isnum(I) ? (I > 0 && I <= length(L) ? L[I] : null) : L[I]) : null) ->>>>>>> 255f899... Fix 512-only code in recent conveyor belt fix (#36722) #define LAZYSET(L, K, V) if(!L) { L = list(); } L[K] = V; #define LAZYLEN(L) length(L) #define LAZYCLEARLIST(L) if(L) L.Cut()