Revert "Faster Startup"

This commit is contained in:
PJB3005
2016-01-24 20:25:50 +01:00
parent a11840c904
commit bb98cfc487
6 changed files with 15 additions and 36 deletions

View File

@@ -9,7 +9,6 @@
/datum/controller/process/lighting/setup()
name = "lighting"
spawn(20)
create_lighting_overlays()
/datum/controller/process/lighting/doWork()

View File

@@ -189,9 +189,6 @@ datum/controller/game_controller/proc/cachedamageicons()
// last_init_type = object.type
object.initialize()
count++
for(var/turf/T in world)
T.initialize()
turfs += T
log_startup_progress(" Initialized [count] objects in [stop_watch(watch)]s.")
watch = start_watch()

View File

@@ -79,14 +79,12 @@
spawn( 0 )
src.Entered(AM)
return
turfs |= src
var/area/A = loc
if(!dynamic_lighting || !A.lighting_use_dynamic)
luminosity = 1
/turf/proc/initialize()
return
/turf/DblClick()
if(istype(usr, /mob/living/silicon/ai))
return move_camera_by_click()

View File

@@ -52,10 +52,6 @@
if(isfile(file))
maploader.load_map(file)
for(var/x = 1 to world.maxx)
for(var/y = 1 to world.maxy)
turfs += locate(x,y,world.maxz)
for(var/obj/effect/landmark/L in landmarks_list)
if (L.name != "awaystart")
continue

View File

@@ -11,7 +11,7 @@
for(var/turf/T in turfs)
if(T.dynamic_lighting)
A = T.loc // Get the area.
if(A.lighting_use_dynamic && !T.lighting_overlay)
if(A.lighting_use_dynamic)
var/atom/movable/lighting_overlay/O = getFromPool(/atom/movable/lighting_overlay, T)
all_lighting_overlays |= O
T.lighting_overlay = O
@@ -22,7 +22,7 @@
var/turf/T = locate(x, y, zlevel)
if(T.dynamic_lighting)
A = T.loc // Get the area.
if(A.lighting_use_dynamic && !T.lighting_overlay)
if(A.lighting_use_dynamic)
var/atom/movable/lighting_overlay/O = getFromPool(/atom/movable/lighting_overlay, T)
all_lighting_overlays |= O
T.lighting_overlay = O

View File

@@ -33,10 +33,7 @@
/turf/unsimulated/mineral/New()
. = ..()
MineralSpread()
if(ticker)
initialize()
/turf/unsimulated/mineral/initialize()
spawn(1)
var/turf/T
if((istype(get_step(src, NORTH), /turf/simulated/floor)) || (istype(get_step(src, NORTH), /turf/space)) || (istype(get_step(src, NORTH), /turf/simulated/shuttle/floor)))
@@ -502,10 +499,6 @@
if(prob(20))
icon_state = "asteroid[rand(0,12)]"
if(ticker)
initialize()
/turf/unsimulated/floor/asteroid/initialize()
updateMineralOverlays()
/turf/unsimulated/floor/asteroid/ex_act(severity)
@@ -564,17 +557,14 @@
/turf/unsimulated/floor/asteroid/proc/updateMineralOverlays()
src.overlays.len = 0
spawn(1)
for(var/dir in cardinal)
if(istype(get_step(src,dir), /turf/unsimulated/mineral))
switch(dir)
if(NORTH)
if(istype(get_step(src, NORTH), /turf/unsimulated/mineral))
src.overlays += image('icons/turf/walls.dmi', "rock_side_n")
if(SOUTH)
if(istype(get_step(src, SOUTH), /turf/unsimulated/mineral))
src.overlays += image('icons/turf/walls.dmi', "rock_side_s", layer=6)
if(EAST)
if(istype(get_step(src, EAST), /turf/unsimulated/mineral))
src.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
if(WEST)
if(istype(get_step(src, WEST), /turf/unsimulated/mineral))
src.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6)
/turf/unsimulated/floor/asteroid/proc/fullUpdateMineralOverlays()
@@ -1008,7 +998,6 @@
// We can't go a full loop though
next_angle = -next_angle
dir = angle2dir(dir2angle(dir) + next_angle)
/turf/unsimulated/floor/asteroid/cave/proc/SpawnFloor(var/turf/T)
for(var/turf/S in range(2,T))
if(istype(S, /turf/space) || istype(S.loc, /area/mine/explored))