From 66d36f74d2d6b3f0e54373017fb9ac72a8937734 Mon Sep 17 00:00:00 2001 From: Wild Bill Date: Tue, 16 Dec 2014 12:29:04 +0200 Subject: [PATCH] Reserve PascalCase inits --- code/controllers/lighting_controller.dm | 2 +- code/datums/helper_datums/teleport.dm | 4 ++-- code/world.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/lighting_controller.dm b/code/controllers/lighting_controller.dm index d4f46b104fe..0ffa34b54f0 100644 --- a/code/controllers/lighting_controller.dm +++ b/code/controllers/lighting_controller.dm @@ -65,7 +65,7 @@ var/datum/controller/lighting/lighting_controller = new () //Does not loop. Should be run prior to process() being called for the first time. //Note: if we get additional z-levels at runtime (e.g. if the gateway thin ever gets finished) we can initialize specific //z-levels with the z_level argument -/datum/controller/lighting/proc/Initialize(var/z_level) +/datum/controller/lighting/proc/initializeLighting(var/z_level) processing = 0 spawn(-1) set background = BACKGROUND_ENABLED diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index c5bff0660e2..4a041256d06 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -17,11 +17,11 @@ /datum/teleport/proc/start(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null) - if(!Init(arglist(args))) + if(!initTeleport(arglist(args))) return 0 return 1 -/datum/teleport/proc/Init(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout) +/datum/teleport/proc/initTeleport(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout) if(!setTeleatom(ateleatom)) return 0 if(!setDestination(adestination)) diff --git a/code/world.dm b/code/world.dm index 82f3817b3c2..c31d225da1d 100644 --- a/code/world.dm +++ b/code/world.dm @@ -89,7 +89,7 @@ master_controller = new /datum/controller/game_controller() spawn(-1) master_controller.setup() - lighting_controller.Initialize() + lighting_controller.initializeLighting() src.update_status()