diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-29 04:33:00 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-29 04:33:00 +0000 |
| commit | e7d01f7b12e109ac54dcc29f9d368e20512c57e6 (patch) | |
| tree | dfdd2ac4d8db3cec19a455d9fe9bb8542664d95e /src/map/unit.c | |
| parent | df3489bd7cd6da79c1654d97600aa7f3ba213fd3 (diff) | |
| download | hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.gz hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.bz2 hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.xz hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.zip | |
* Kaahi heals no matter if attack connects. (bugreport:2440)
* Fixed a typo causing skillitem always resets skill delay. (bugreport:3431)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13977 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 1adfe16c6..4fce9b2d7 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1074,7 +1074,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh if( casttime <= 0 ) ud->state.skillcastcancel = 0; - if( !sd || sd->skillitem != ud->skillid || skill_get_cast(skill_num,skill_lv) ) + if( !sd || sd->skillitem != skill_num || skill_get_cast(skill_num,skill_lv) ) ud->canact_tick = tick + casttime + 100; if( sd ) { @@ -1180,7 +1180,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh casttime = skill_castfix_sc(src, casttime); ud->state.skillcastcancel = castcancel&&casttime>0?1:0; - if( !sd || sd->skillitem != ud->skillid || skill_get_cast(skill_num,skill_lv) ) + if( !sd || sd->skillitem != skill_num || skill_get_cast(skill_num,skill_lv) ) ud->canact_tick = tick + casttime + 100; // if( sd ) // { |