From bb98cfc4874fbb23f115ab0c3cf8cc70003632b2 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Sun, 24 Jan 2016 20:25:50 +0100 Subject: [PATCH] Revert "Faster Startup" --- code/controllers/Processes/lighting.dm | 3 +-- code/controllers/master_controller.dm | 3 --- code/game/turfs/turf.dm | 4 +-- code/modules/awaymissions/zlevel.dm | 4 --- code/modules/lighting/lighting_system.dm | 6 ++--- code/modules/mining/mine_turfs.dm | 31 ++++++++---------------- 6 files changed, 15 insertions(+), 36 deletions(-) diff --git a/code/controllers/Processes/lighting.dm b/code/controllers/Processes/lighting.dm index 3d875adfe53..11a642a914d 100644 --- a/code/controllers/Processes/lighting.dm +++ b/code/controllers/Processes/lighting.dm @@ -9,8 +9,7 @@ /datum/controller/process/lighting/setup() name = "lighting" - spawn(20) - create_lighting_overlays() + create_lighting_overlays() /datum/controller/process/lighting/doWork() // Counters diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index f679eed83dc..707b9663c2c 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -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() diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 302d57e3139..caafef9f7fc 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -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() diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index de21bf21b15..ad700fd09c6 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -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 diff --git a/code/modules/lighting/lighting_system.dm b/code/modules/lighting/lighting_system.dm index 5905a403f7c..a8ad8f7adf9 100644 --- a/code/modules/lighting/lighting_system.dm +++ b/code/modules/lighting/lighting_system.dm @@ -1,5 +1,5 @@ /var/list/lighting_update_lights = list() // List of light sources queued for update. -/var/list/lighting_update_overlays = list() // List of ligting overlays queued for update. +/var/list/lighting_update_overlays = list() // List of ligting overlays queued for update. /var/list/all_lighting_overlays = list() // Global list of lighting overlays. /area/var/lighting_use_dynamic = 1 // Disabling this variable on an area disables dynamic lighting. @@ -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 diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index e4154eae64f..551f50613e2 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -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,18 +557,15 @@ /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) - src.overlays += image('icons/turf/walls.dmi', "rock_side_n") - if(SOUTH) - src.overlays += image('icons/turf/walls.dmi', "rock_side_s", layer=6) - if(EAST) - src.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6) - if(WEST) - src.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6) + + if(istype(get_step(src, NORTH), /turf/unsimulated/mineral)) + src.overlays += image('icons/turf/walls.dmi', "rock_side_n") + if(istype(get_step(src, SOUTH), /turf/unsimulated/mineral)) + src.overlays += image('icons/turf/walls.dmi', "rock_side_s", layer=6) + if(istype(get_step(src, EAST), /turf/unsimulated/mineral)) + src.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6) + 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() var/turf/unsimulated/floor/asteroid/A @@ -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)) @@ -1057,4 +1046,4 @@ return BUILD_IGNORE if(locate(/obj/structure/lattice) in contents) return BUILD_SUCCESS - return BUILD_FAILURE \ No newline at end of file + return BUILD_FAILURE