cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

It's re-entrant now

Browse Source
This commit is contained in:
Crazylemon64
2016-07-04 14:52:19 -07:00
parent a44808f195
commit 27ee3c7247
10 changed files with 121 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/helper_datums/map_template.dm
+2 -2
View File
@@ -23,7 +23,7 @@
height = bounds[MAP_MAXY]
return bounds
/datum/map_template/proc/load(turf/T, centered = 0)
/datum/map_template/proc/load(turf/T, centered = 0, delay_init = 0)
var/turf/placement = T
var/min_x = placement.x
var/min_y = placement.y
@@ -43,7 +43,7 @@
// 1 bigger, to update the turf smoothing
var/turf/ST_bot_left = locate(max(1, min_x-1), max(1, min_y-1), placement.z)
var/turf/ST_top_right = locate(min(world.maxx, max_x+1), min(world.maxy, max_y+1), placement.z)
var/list/bounds = maploader.load_map(get_file(), min_x, min_y, placement.z, cropMap = 1)
var/list/bounds = maploader.load_map(get_file(), min_x, min_y, placement.z, cropMap = 1, delay_init = delay_init)
if(!bounds)
return 0
if(bot_left == null || top_right == null)