Merge pull request #6411 from wild-billy/master

Reserve PascalCase inits
This commit is contained in:
Cheridan
2014-12-18 02:30:08 -06:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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))
+1 -1
View File
@@ -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()