Overhauls and 2/28 sync (#244)

* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
2017-02-28 09:30:49 -06:00
parent 93782cf716
commit 0bca862419
544 changed files with 309981 additions and 81206 deletions
@@ -40,20 +40,18 @@ var/datum/subsystem/timer/SStimer
 	..("B:[bucket_count] P:[length(processing)] H:[length(hashes)] C:[length(clienttime_timers)]")

 /datum/subsystem/timer/fire(resumed = FALSE)
-	if (length(clienttime_timers))
-		for (var/thing in clienttime_timers)
-			var/datum/timedevent/ctime_timer = thing
-			if (ctime_timer.spent)
-				qdel(ctime_timer)
-				continue
-			if (ctime_timer.timeToRun <= REALTIMEOFDAY)
-				var/datum/callback/callBack = ctime_timer.callBack
-				ctime_timer.spent = TRUE
-				callBack.InvokeAsync()
-				qdel(ctime_timer)
-
-			if (MC_TICK_CHECK)
-				return
+	while(length(clienttime_timers))
+		var/datum/timedevent/ctime_timer = clienttime_timers[clienttime_timers.len]
+		if (ctime_timer.timeToRun <= REALTIMEOFDAY)
+			--clienttime_timers.len
+			var/datum/callback/callBack = ctime_timer.callBack
+			ctime_timer.spent = TRUE
+			callBack.InvokeAsync()
+			qdel(ctime_timer)
+		else
+			break	//None of the rest are ready to run
+		if (MC_TICK_CHECK)
+			return

 	var/static/list/spent = list()
 	var/static/datum/timedevent/timer
@@ -208,11 +206,24 @@ var/datum/subsystem/timer/SStimer
 		SStimer.timer_id_dict["timerid[id]"] = src

 	if (callBack.object != GLOBAL_PROC)
-		LAZYINITLIST(callBack.object.active_timers)
-		callBack.object.active_timers += src
+		LAZYADD(callBack.object.active_timers, src)

 	if (flags & TIMER_CLIENT_TIME)
-		SStimer.clienttime_timers += src
+		//sorted insert
+		var/list/ctts = SStimer.clienttime_timers
+		var/cttl = length(ctts)
+		if(cttl)
+			var/datum/timedevent/Last = ctts[cttl]
+			if(Last.timeToRun >= timeToRun)
+				ctts += src
+			else if(cttl > 1)
+				for(var/I in cttl to 1)
+					var/datum/timedevent/E = ctts[I]
+					if(E.timeToRun <= timeToRun)
+						ctts.Insert(src, I)
+						break
+		else
+			ctts += src	
 		return

 	//get the list of buckets
@@ -345,4 +356,4 @@ proc/addtimer(datum/callback/callback, wait, flags)


 #undef BUCKET_LEN
-#undef BUCKET_POS
+#undef BUCKET_POS