cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Multi-z infinite loop fixes (#30996)" (#31000)" (#31002)

Browse Source 
This reverts commit 07e41392ef.
This commit is contained in:
kane-f
2021-10-07 01:36:15 +01:00
committed by GitHub
parent a600a1694a
commit 1c63d87b37
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/configuration.dm
View File

@@ -76,6 +76,7 @@
var/multiz_render_cap = 8 //how far down open spaces will render var/multiz_render_cap = 8 //how far down open spaces will render
var/multiz_bottom_cap = 16 //how far down open spaces will detect for a bottom
// BSQL things // BSQL things
var/bsql_debug = 0 var/bsql_debug = 0
@@ -583,6 +584,8 @@
if("multiz_render_cap") if("multiz_render_cap")
multiz_render_cap = text2num(value) multiz_render_cap = text2num(value)
if("multiz_bottom_cap")
multiz_bottom_cap = text2num(value)
if("media_base_url") if("media_base_url")
media_base_url = value media_base_url = value

8
code/modules/multiz/basic.dm
View File

@@ -25,8 +25,12 @@
/proc/GetConnectedZlevels(z) /proc/GetConnectedZlevels(z)
. = list(z) . = list(z)
for(var/level = z, HasBelow(level), level = map.zLevels[level].z_below) for(var/level = z, HasBelow(level), level = map.zLevels[level].z_below)
if((level != z) && (level in .)) // No infinite loops
break
. |= level . |= level
for(var/level = z, HasAbove(level), level = map.zLevels[level].z_above) for(var/level = z, HasAbove(level), level = map.zLevels[level].z_above)
if((level != z) && (level in .)) // No infinite loops
break
. |= level . |= level
/proc/AreConnectedZLevels(var/zA, var/zB) /proc/AreConnectedZLevels(var/zA, var/zB)
@@ -38,8 +42,12 @@
return list() return list()
. = list(turf.z) . = list(turf.z)
for(var/level = turf.z, HasBelow(level) && isvisiblespace(GetBelow(locate(turf.x,turf.y,level))), level = map.zLevels[level].z_below) for(var/level = turf.z, HasBelow(level) && isvisiblespace(GetBelow(locate(turf.x,turf.y,level))), level = map.zLevels[level].z_below)
if((level != turf.z) && (level in .)) // No infinite loops
break
. |= level . |= level
for(var/level = turf.z, HasAbove(level) && isvisiblespace(GetAbove(locate(turf.x,turf.y,level))), level = map.zLevels[level].z_above) for(var/level = turf.z, HasAbove(level) && isvisiblespace(GetAbove(locate(turf.x,turf.y,level))), level = map.zLevels[level].z_above)
if((level != turf.z) && (level in .)) // No infinite loops
break
. |= level . |= level
/proc/AreOpenConnectedZLevels(var/zA, var/zB) /proc/AreOpenConnectedZLevels(var/zA, var/zB)

8
code/modules/multiz/falling.dm
View File

@@ -31,7 +31,11 @@
return return
var/turf/bottom = null var/turf/bottom = null
var/depth = 0
for(bottom = GetBelow(src); isopenspace(bottom); bottom = GetBelow(bottom)) for(bottom = GetBelow(src); isopenspace(bottom); bottom = GetBelow(bottom))
depth++
if(depth > config.multiz_bottom_cap) // To stop getting caught on this in infinite loops
break
if(istype(bottom,/turf/space)) if(istype(bottom,/turf/space))
return return
@@ -64,7 +68,11 @@
return return
bottom = null bottom = null
depth = 0
for(bottom = GetBelow(src); isopenspace(bottom); bottom = GetBelow(bottom)) for(bottom = GetBelow(src); isopenspace(bottom); bottom = GetBelow(bottom))
depth++
if(depth > config.multiz_bottom_cap) // To stop getting caught on this in infinite loops
break
if(istype(bottom,/turf/space)) if(istype(bottom,/turf/space))
return return

5
config-example/config.txt
View File

@@ -368,4 +368,7 @@ BSQL_THREAD_LIMIT 50
#BSQL_DEBUG #BSQL_DEBUG
## The maximum number of z-levels rendered above or below in multi-z ## The maximum number of z-levels rendered above or below in multi-z
MULTIZ_RENDER_CAP 8 MULTIZ_RENDER_CAP 8
## The maximum number of z-levels checked below in multi-z
MULTIZ_BOTTOM_CAP 16