cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the mc not running paused dwait systems properly

Browse Source 
Basically, when atmos (or another dwait subsystem) pauses as it runs to the end of a tick, its suppose to be ran again next mc tick as long as nothing else needs to run. (non-dwait subsystems run next tick regardless, rather than checking for other subsystems first)

The issue is the mc won't run it again, because it was ran less then 75% of SS.wait ago. (a safety I added to prevent lag compounding from trying to make up missed ticks caused by, back in august)

This fixes that, and fixes another issue where if say atmos takes 3ds to process everything, it's next process would be in 5 ds, not 2 ds like it's suppose to be.
This commit is contained in:
Kyle Spier-Swenson
2016-04-27 17:09:42 -07:00
parent d9bc4e0040
commit a7a32f3d69
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/master.dm
View File

@@ -162,7 +162,7 @@ var/global/datum/controller/master/Master = new()
else
priority_queue -= SS
if(SS.can_fire > 0)
if(priorityrunning || ((SS.next_fire <= world.time) && (SS.last_fire + (SS.wait * 0.75) <= world.time)))
if(priorityrunning || ((SS.next_fire <= world.time) && (SS.last_fire + (SS.wait * 0.75) <= world.time || SS.paused)))
if(!priorityrunning && (world.tick_usage + SS.tick_usage > TICK_LIMIT_TO_RUN) && (SS.last_fire + (SS.wait*1.25) > world.time))
if(!SS.dynamic_wait)
priority_queue += SS
@@ -174,7 +174,8 @@ var/global/datum/controller/master/Master = new()
ran_subsystems = 1
timer = world.timeofday
last_type_processed = SS.type
SS.last_fire = world.time
if (!paused) //only set this when we aren't resuming
SS.last_fire = world.time
var/tick_usage = world.tick_usage
SS.fire(paused) // Fire the subsystem
@@ -198,7 +199,7 @@ var/global/datum/controller/master/Master = new()
if(SS.paused)
SS.next_fire = world.time //run it next tick if we can, but don't priority queue it, as we are a dynamic wait subsystem
else //not paused, it ran all the way thru, normal wait time
SS.next_fire = world.time + SS.wait
SS.next_fire = SS.last_fire + SS.wait //we use last_fire so that its next fire is based off when it started this fire, not when it finished.
else
if(!paused)
SS.next_fire += SS.wait