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/map/skill.c | |
| 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/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index ece5ca0af..1ed9b8268 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6907,7 +6907,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns int sec = skill_get_time2(sg->skill_id,sg->skill_lv); if (status_change_start(bl,type,10000,sg->skill_lv,sg->group_id,0,0,sec, 8)) { - struct TimerData* td = tsc->data[type]?get_timer(tsc->data[type]->timer):NULL; + const struct TimerData* td = tsc->data[type]?get_timer(tsc->data[type]->timer):NULL; if (td) sec = DIFF_TICK(td->tick, tick); map_moveblock(bl, src->bl.x, src->bl.y, tick); clif_fixpos(bl); |