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

Revert "Lag removal, try 2 (#7553)" (#7985)

Browse Source 
This reverts commit 1504d2c784.
This commit is contained in:
MCHSL
2020-03-16 09:03:34 +01:00
committed by GitHub
parent 3e93e8b123
commit fa23507568
5 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
byond-extools.dll
View File

Binary file not shown.

4
code/__DEFINES/_tick.dm
View File

@@ -1,6 +1,4 @@
#define MAPTICK_MC_MIN_RESERVE 20 //Percentage of tick to leave for master controller to run #define TICK_LIMIT_RUNNING 80
#define MAPTICK_LAST_INTERNAL_TICK_USAGE ((GLOB.internal_tick_usage / world.tick_lag) * 100) //internal_tick_usage is updated every tick by extools
#define TICK_LIMIT_RUNNING (max(90 - MAPTICK_LAST_INTERNAL_TICK_USAGE, MAPTICK_MC_MIN_RESERVE))
#define TICK_LIMIT_TO_RUN 70 #define TICK_LIMIT_TO_RUN 70
#define TICK_LIMIT_MC 70 #define TICK_LIMIT_MC 70
#define TICK_LIMIT_MC_INIT_DEFAULT 98 #define TICK_LIMIT_MC_INIT_DEFAULT 98

2
code/_globalvars/misc.dm
View File

@@ -27,5 +27,3 @@ GLOBAL_VAR(bible_icon_state)
GLOBAL_VAR(bible_item_state) GLOBAL_VAR(bible_item_state)
GLOBAL_VAR(holy_weapon_type) GLOBAL_VAR(holy_weapon_type)
GLOBAL_VAR(holy_armor_type) GLOBAL_VAR(holy_armor_type)
GLOBAL_VAR_INIT(internal_tick_usage, 0.2 * world.tick_lag) //This var is updated every tick by a DLL if present, used to reduce lag

4
code/controllers/master.dm
View File

@@ -595,8 +595,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if(!statclick) if(!statclick)
statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
stat("Byond:", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%)) (Internal Tick Usage: [round(MAPTICK_LAST_INTERNAL_TICK_USAGE,0.1)]%)") stat("Byond:", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%))")
stat("Master Controller:", statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration]) (TickLimit: [round(Master.current_ticklimit, 0.1)])")) stat("Master Controller:", statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration])"))
/datum/controller/master/StartLoadingMap() /datum/controller/master/StartLoadingMap()
//disallow more than one map to load at once, multithreading it will just cause race conditions //disallow more than one map to load at once, multithreading it will just cause race conditions

2
code/game/world.dm
View File

@@ -11,8 +11,6 @@ GLOBAL_VAR(restart_counter)
//So subsystems globals exist, but are not initialised //So subsystems globals exist, but are not initialised
/world/New() /world/New()
enable_debugger() //This does nothing if you aren't trying to debug enable_debugger() //This does nothing if you aren't trying to debug
if(fexists("byond-extools.dll"))
call("byond-extools.dll", "maptick_initialize")()
log_world("World loaded at [time_stamp()]!") log_world("World loaded at [time_stamp()]!")
SetupExternalRSC() SetupExternalRSC()