diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-04 10:51:36 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-04 10:51:36 +0000 |
| commit | 6c2c7c5cda67bf6a6484f3fcc2c97c35e86bab3e (patch) | |
| tree | 585779e90cf05511ea625d1dad914082344b1535 | |
| parent | af2b53402574753a76e39c09e514118a06d9420f (diff) | |
| download | hercules-6c2c7c5cda67bf6a6484f3fcc2c97c35e86bab3e.tar.gz hercules-6c2c7c5cda67bf6a6484f3fcc2c97c35e86bab3e.tar.bz2 hercules-6c2c7c5cda67bf6a6484f3fcc2c97c35e86bab3e.tar.xz hercules-6c2c7c5cda67bf6a6484f3fcc2c97c35e86bab3e.zip | |
- Timer set to -1 soon, previous to timer deletion :O
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12911 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/unit.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 1da28c9e7..d836a01e5 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1521,11 +1521,7 @@ int unit_skillcastcancel(struct block_list *bl,int type) } ud->canact_tick = tick; - ud->skilltimer = -1; - if( sd && pc_checkskill(sd,SA_FREECAST) > 0 ) - status_calc_bl(&sd->bl, SCB_SPEED); - if(type&1 && sd) skill = sd->skillid_old; else @@ -1537,7 +1533,12 @@ int unit_skillcastcancel(struct block_list *bl,int type) ret=delete_timer( ud->skilltimer, skill_castend_id ); if(ret<0) ShowError("delete timer error : skillid : %d\n",ret); - + + ud->skilltimer = -1; + + if( sd && pc_checkskill(sd,SA_FREECAST) > 0 ) + status_calc_bl(&sd->bl, SCB_SPEED); + if(bl->type==BL_MOB) ((TBL_MOB*)bl)->skillidx = -1; clif_skillcastcancel(bl); |