cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 03:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevents infinite loop if a camera takes a picture of an atom with null in either it's overlays or underlays.

Browse Source
This commit is contained in:
mwerezak
2014-12-09 17:12:26 -05:00
parent 62b02025c1
commit 0a6d1f8c81
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/__HELPERS/icons.dm
View File

@@ -699,7 +699,7 @@ proc // Creates a single icon from a given /atom or /image. Only the first argu
while(TRUE) while(TRUE)
if(curIndex<=process.len) if(curIndex<=process.len)
current = process[curIndex] current = process[curIndex]
if(!current) continue if(current)
currentLayer = current:layer currentLayer = current:layer
if(currentLayer<0) // Special case for FLY_LAYER if(currentLayer<0) // Special case for FLY_LAYER
if(currentLayer <= -1000) return flat if(currentLayer <= -1000) return flat
@@ -719,9 +719,7 @@ proc // Creates a single icon from a given /atom or /image. Only the first argu
layers[current]=currentLayer // Place at end layers[current]=currentLayer // Place at end
curIndex++ curIndex++
else if(pSet == 0) // Switch to overlays
if(curIndex>process.len)
if(pSet == 0) // Switch to overlays
curIndex = 1 curIndex = 1
pSet = 1 pSet = 1
process = A.overlays process = A.overlays