diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-23 08:27:26 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-23 08:27:26 +0000 |
| commit | 0352df880b0e71766ce0c3886355e285e329429d (patch) | |
| tree | e8e0b75a6d6c711e9bbab3c7856ee3886114d73e /src/map/skill.c | |
| parent | 1cea8ffc2a3d8f3d8eb8245df0042122436fff17 (diff) | |
| download | hercules-0352df880b0e71766ce0c3886355e285e329429d.tar.gz hercules-0352df880b0e71766ce0c3886355e285e329429d.tar.bz2 hercules-0352df880b0e71766ce0c3886355e285e329429d.tar.xz hercules-0352df880b0e71766ce0c3886355e285e329429d.zip | |
Follow up r15777, reworked skill_icewall_block so that it stops any attacks against anyone who got blocked off the wall, not only caster. Modified iw block algorithim on mob_ai_sub_hard_activesearch
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15779 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 2fe268eaa..c8dbd1d5f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9389,22 +9389,20 @@ static bool skill_dance_switch(struct skill_unit* unit, int flag) * Upon Ice Wall cast it checks all nearby mobs to find any who may be blocked by the IW **/ static int skill_icewall_block(struct block_list *bl,va_list ap) { - struct block_list *src; + struct block_list *target = NULL; struct mob_data *md = ((TBL_MOB*)bl); nullpo_ret(bl); - - src = va_arg(ap,struct block_list *); - - nullpo_ret(src); nullpo_ret(md); + if( !md->target_id ) + return 0; + nullpo_ret( ( target = map_id2bl(md->target_id) ) ); - if( md->target_id != src->id - || check_distance_bl(bl, src, status_get_range(bl) ) - || path_search_long(NULL,bl->m,bl->x,bl->y,src->x,src->y,CELL_CHKICEWALL) ) + if( path_search_long(NULL,bl->m,bl->x,bl->y,target->x,target->y,CELL_CHKICEWALL) ) return 0; - mob_unlocktarget(md,gettick()); + if( !check_distance_bl(bl, target, status_get_range(bl) ) ) + mob_unlocktarget(md,gettick()); return 0; } @@ -9820,8 +9818,8 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, short skilli //success, unit created. switch( skillid ) { - case WZ_ICEWALL: //Store number of tiles. - map_foreachinrange(skill_icewall_block, src, AREA_SIZE, BL_MOB, src); + case WZ_ICEWALL: + map_foreachinrange(skill_icewall_block, src, AREA_SIZE, BL_MOB); break; case NJ_TATAMIGAESHI: //Store number of tiles. group->val1 = group->alive_count; |