diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-08 17:55:37 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-08 17:55:37 +0000 |
| commit | 0d24db22f0c4aeef985588da3b852078045cdda2 (patch) | |
| tree | 7fe7c1ddd32f2ab21ddfd690a2de9f97dca4b0fc /src/map/skill.c | |
| parent | 67560f093d726077d558479cee4e46af2c26d91d (diff) | |
| download | hercules-0d24db22f0c4aeef985588da3b852078045cdda2.tar.gz hercules-0d24db22f0c4aeef985588da3b852078045cdda2.tar.bz2 hercules-0d24db22f0c4aeef985588da3b852078045cdda2.tar.xz hercules-0d24db22f0c4aeef985588da3b852078045cdda2.zip | |
- Casting Kaensin will clear out Suiton and viceversa now.
- Fixed drop-rates (@whodrops) getting duplicates when you use @reloadmobdb
- Fixed unjailing not sending characters to Prontera.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8188 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 530d0ee99..2b3301547 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2732,8 +2732,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int break; case TK_JUMPKICK: - if (skillid == TK_JUMPKICK) - skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag); + skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag); if (unit_movepos(src, bl->x, bl->y, 0, 0)) clif_slide(src,bl->x,bl->y); break; @@ -6661,7 +6660,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid, if (sd) val1 = sd->status.child; break; case NJ_KAENSIN: - skill_clear_group(src, 4); //Delete previous Kaensins + skill_clear_group(src, 1); //Delete previous Kaensins/Suitons val2 = (skilllv+1)/2 + 4; break; @@ -9162,11 +9161,8 @@ int skill_clear_group (struct block_list *bl, int flag) case SA_VIOLENTGALE: case SA_LANDPROTECTOR: case NJ_SUITON: - if (flag&1) - group[count++]= ud->skillunit[i]; - break; case NJ_KAENSIN: - if (flag&4) + if (flag&1) group[count++]= ud->skillunit[i]; break; default: @@ -9876,9 +9872,7 @@ int skill_unit_timer_sub (struct block_list *bl, va_list ap) struct skill_unit_group *group; unsigned int tick; - nullpo_retr(0, bl); - nullpo_retr(0, ap); - nullpo_retr(0, unit=(struct skill_unit *)bl); + unit=(struct skill_unit *)bl; tick=va_arg(ap,unsigned int); if(!unit->alive) |