Merge pull request #24114 from Cyberboss/addtimerflag

Adds option of unique timers ignoring wait
This commit is contained in:
oranges
2017-02-17 14:32:12 +13:00
committed by GitHub
2 changed files with 8 additions and 1 deletions
+5 -1
View File
@@ -298,7 +298,11 @@ proc/addtimer(datum/callback/callback, wait, flags)
var/hash
if (flags & TIMER_UNIQUE)
var/list/hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags & TIMER_CLIENT_TIME)
var/list/hashlist
if(flags & TIMER_NO_HASH_WAIT)
hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags & TIMER_CLIENT_TIME)
else
hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags & TIMER_CLIENT_TIME)
hashlist += callback.arguments
hash = hashlist.Join("|||||||")