cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert gc from its controller to main controller.

Browse Source
This commit is contained in:
ESwordTheCat
2014-07-03 10:25:54 -08:00
parent b9f08579f2
commit 60f7cbc6dd
8 changed files with 111 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/controllers/master_controller.dm
View File

@@ -15,7 +15,7 @@ var/global/pipe_processing_killed = 0
var/list/machine_profiling=list()
#endif
datum/controller/game_controller
/datum/controller/game_controller
var/breather_ticks = 2 //a somewhat crude attempt to iron over the 'bumps' caused by high-cpu use by letting the MC have a breather for this many ticks after every loop
var/minimum_ticks = 20 //The minimum length of time between MC ticks
@@ -30,12 +30,15 @@ datum/controller/game_controller
var/nano_cost = 0
var/events_cost = 0
var/ticker_cost = 0
var/garbageCollectorCost = 0
var/total_cost = 0
var/last_thing_processed
var/mob/list/expensive_mobs = list()
var/rebuild_active_areas = 0
var/global/datum/garbage_collector/garbageCollector
datum/controller/game_controller/New()
. = ..()
@@ -59,6 +62,9 @@ datum/controller/game_controller/New()
if(!syndicate_code_response) syndicate_code_response = generate_code_phrase()
if(!emergency_shuttle) emergency_shuttle = new /datum/shuttle_controller/emergency_shuttle()
if(global.garbageCollector)
garbageCollector = global.garbageCollector
datum/controller/game_controller/proc/setup()
world.tick_lag = config.Ticklag
@@ -75,8 +81,9 @@ datum/controller/game_controller/proc/setup()
if(!ticker)
ticker = new /datum/controller/gameticker()
if(!garbage)
garbage = new /datum/controller/garbage_collector()
if(!global.garbageCollector)
global.garbageCollector = new
garbageCollector = global.garbageCollector
setup_objects()
setupgenetics()
@@ -232,8 +239,13 @@ datum/controller/game_controller/proc/setup_objects()
ticker.process()
ticker_cost = (world.timeofday - timer) / 10
timer = world.timeofday
last_thing_processed = garbageCollector.type
garbageCollector.process()
garbageCollectorCost = (world.timeofday - timer) / 10
//TIMING
total_cost = air_cost + sun_cost + mobs_cost + diseases_cost + machines_cost + objects_cost + networks_cost + powernets_cost + nano_cost + events_cost + ticker_cost
total_cost = air_cost + sun_cost + mobs_cost + diseases_cost + machines_cost + objects_cost + networks_cost + powernets_cost + nano_cost + events_cost + ticker_cost + garbageCollectorCost
var/end_time = world.timeofday
if(end_time < start_time)