From fa6319d52d8fe943ea2ee9089240bdde30ae8cba Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 27 Sep 2015 13:18:18 +0200 Subject: [PATCH] Turf initialization tweaking. Removes the need for a spawn() in New(). --- code/game/turfs/initialization/init.dm | 5 +++-- code/game/turfs/simulated.dm | 5 ++++- code/modules/multiz/turf.dm | 9 ++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/game/turfs/initialization/init.dm b/code/game/turfs/initialization/init.dm index 3590275831..eda55c47ae 100644 --- a/code/game/turfs/initialization/init.dm +++ b/code/game/turfs/initialization/init.dm @@ -6,6 +6,7 @@ /area/initialize() ..() - if(turf_initializer) - for(var/turf/simulated/T in src) + for(var/turf/simulated/T in src) + T.initialize() + if(turf_initializer) turf_initializer.initialize(T) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index c8262146e7..e1e65e6b2d 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -20,12 +20,15 @@ holy = 1 levelupdate() +/turf/simulated/proc/initialize() + return + /turf/simulated/proc/AddTracks(var/typepath,var/bloodDNA,var/comingdir,var/goingdir,var/bloodcolor="#A10808") var/obj/effect/decal/cleanable/blood/tracks/tracks = locate(typepath) in src if(!tracks) tracks = new typepath(src) tracks.AddTracks(bloodDNA,comingdir,goingdir,bloodcolor) - + /turf/simulated/proc/update_dirt() dirt = min(dirt++, 101) var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, src) diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index 27bdc8ec62..b358cd0fbb 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -11,11 +11,10 @@ var/list/underlay_references var/global/overlay_map = list() -/turf/simulated/open/New() - . = ..() - spawn(1) - below = GetBelow(src) - ASSERT(HasBelow(z)) +/turf/simulated/open/initialize() + ..() + below = GetBelow(src) + ASSERT(HasBelow(z)) /turf/simulated/open/Entered(var/atom/movable/mover) // only fall down in defined areas (read: areas with artificial gravitiy)