diff options
| author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-09 00:26:36 +0000 |
|---|---|---|
| committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-09 00:26:36 +0000 |
| commit | bfb15e68b763800587fa57727fc4baaa0e5e2800 (patch) | |
| tree | cc8f52cc370b811d5662c6c69fcabb1c94a1207f /src/map/skill.c | |
| parent | 9c8991447ced838c88037dbbf76cf04a970e25dd (diff) | |
| download | hercules-bfb15e68b763800587fa57727fc4baaa0e5e2800.tar.gz hercules-bfb15e68b763800587fa57727fc4baaa0e5e2800.tar.bz2 hercules-bfb15e68b763800587fa57727fc4baaa0e5e2800.tar.xz hercules-bfb15e68b763800587fa57727fc4baaa0e5e2800.zip | |
- Removed backup.pl (for TXT servers) and vs9-to-vs8.php (outdated versions);
- Merged @killmonster2 with @killmonster tid:73632;
- Fixed bugreport:6764, auction code was misplaced;
- Follow up to r16753 (bugreport:6523), fixed bugreport:6673, using Gravitational Field with Safety Wall would keep the character immobilized. Blame myself, thankyou Lunar for the fix;
- Fixed bugreport:6514, @slaveclone wouldn't be targeted by monster. Thanks to zippy;
- Fixed bugreport:6837, some code was duplicated;
- Fixed bugreport:6768, removed some leftovers from TXT removal;
- Fixed bugreport:6868, Unequipping a weapon with Incantation Samurai card will not kill you if you have less than 999 hp and are on a non-pvp map;
- Fixed wrong bit field on ai field in mob_data structure. Credits to Ind.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16881 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 86516e337..7dcfa2552 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11902,8 +11902,8 @@ static int skill_unit_effect (struct block_list* bl, va_list ap) skill_id = group->skill_id; //Target-type check. - if( !(group->bl_flag&bl->type && battle_check_target(&unit->bl,bl,group->target_flag)>0) && (flag&4) ) { - if( group->state.song_dance&0x1 || (group->src_id == bl->id && group->state.song_dance&0x2) ) + if( !(group->bl_flag&bl->type && battle_check_target(&unit->bl,bl,group->target_flag)>0) ) { + if( flag&4 && ((group->src_id == bl->id && group->state.song_dance&0x2) || skill_get_inf2(skill_id)&INF2_SONG_DANCE) ) skill_unit_onleft(skill_id, bl, tick);//Ensemble check to terminate it. } else { if( flag&1 ) |