cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Fixes

Browse Source
This commit is contained in:
Unknown
2019-12-10 20:57:04 -05:00
parent a859ed8fac
commit 73cd8c0a09
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/controllers/subsystems/timer.dm
View File

@@ -71,7 +71,6 @@ SUBSYSTEM_DEF(timer)
for(var/I in second_queue) for(var/I in second_queue)
log_world(get_timer_debug_string(I)) log_world(get_timer_debug_string(I))
var/cut_start_index = 1
var/next_clienttime_timer_index = 0 var/next_clienttime_timer_index = 0
var/len = length(clienttime_timers) var/len = length(clienttime_timers)
@@ -101,7 +100,7 @@ SUBSYSTEM_DEF(timer)
if (next_clienttime_timer_index) if (next_clienttime_timer_index)
clienttime_timers.Cut(cut_start_index,next_clienttime_timer_index+1) clienttime_timers.Cut(1, next_clienttime_timer_index+1)
if (MC_TICK_CHECK) if (MC_TICK_CHECK)
return return
@@ -259,7 +258,7 @@ SUBSYSTEM_DEF(timer)
if (!length(alltimers)) if (!length(alltimers))
return return
sortTim(alltimers, .proc/cmp_timer) sortTim(alltimers, /proc/cmp_timer)
var/datum/timedevent/head = alltimers[1] var/datum/timedevent/head = alltimers[1]
@@ -342,8 +341,8 @@ SUBSYSTEM_DEF(timer)
if (flags & TIMER_STOPPABLE) if (flags & TIMER_STOPPABLE)
id = num2text(nextid, 100) id = num2text(nextid, 100)
if (nextid >= SHORT_REAL_LIMIT) if (nextid >= TIMER_ID_MAX)
nextid += min(1, 2**round(nextid/SHORT_REAL_LIMIT)) nextid += min(1, 2**round(nextid/TIMER_ID_MAX))
else else
nextid++ nextid++
SStimer.timer_id_dict[id] = src SStimer.timer_id_dict[id] = src
@@ -519,4 +518,4 @@ SUBSYSTEM_DEF(timer)
#undef BUCKET_LEN #undef BUCKET_LEN
#undef BUCKET_POS #undef BUCKET_POS
#undef TIMER_MAX #undef TIMER_MAX
#undef TIMER_ID_MAX #undef TIMER_ID_MAX