diff options
author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-09 01:25:19 +0000 |
---|---|---|
committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-09 01:25:19 +0000 |
commit | 8bd7cb69b1242ac0bf42a6bb3f77afda516d1fe9 (patch) | |
tree | e8dbfa89bca142b0813f16392a291dcbccc174bb /src/common/timer.h | |
parent | 5487756030da284dd45d9114e6c820154607af6c (diff) | |
download | hercules-8bd7cb69b1242ac0bf42a6bb3f77afda516d1fe9.tar.gz hercules-8bd7cb69b1242ac0bf42a6bb3f77afda516d1fe9.tar.bz2 hercules-8bd7cb69b1242ac0bf42a6bb3f77afda516d1fe9.tar.xz hercules-8bd7cb69b1242ac0bf42a6bb3f77afda516d1fe9.zip |
* Added const to the return value of get_timer.
* Added a maximum timer interval. Avoids server shutdowns being delayed for ~10 seconds under some circumstances on windows.
* Replaced the fake timer heap (ordered array) with a binary min heap.
(actually, this is just a merge and has been in use for months)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12926 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/timer.h')
-rw-r--r-- | src/common/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/timer.h b/src/common/timer.h index 28a792f88..354a71113 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -40,7 +40,7 @@ unsigned int gettick_nocache(void); int add_timer(unsigned int tick, TimerFunc func, int id, intptr data); int add_timer_interval(unsigned int tick, TimerFunc func, int id, intptr data, int interval); -struct TimerData* get_timer(int tid); +const struct TimerData* get_timer(int tid); int delete_timer(int tid, TimerFunc func); int addtick_timer(int tid, unsigned int tick); |