Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:5618 @summon stuff trap-like skills no longer hit its allies

Browse Source 
removed wrong target-type check on battle.c (its set in skill.c and then passed as its righteous flag to battle_check_target).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16129 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-05-19 07:00:19 +00:00
parent ac0222d130
commit 5e17e36d22
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/map/battle.c
View File

@ -4696,32 +4696,27 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
default: break; //other type doesn't have slave yet default: break; //other type doesn't have slave yet
} }
switch( src->type ) switch( src->type ) { //Checks on actual src type
{ //Checks on actual src type
case BL_PET: case BL_PET:
if (t_bl->type != BL_MOB && flag&BCT_ENEMY) if (t_bl->type != BL_MOB && flag&BCT_ENEMY)
return 0; //Pet may not attack non-mobs. return 0; //Pet may not attack non-mobs.
if (t_bl->type == BL_MOB && ((TBL_MOB*)t_bl)->guardian_data && flag&BCT_ENEMY) if (t_bl->type == BL_MOB && ((TBL_MOB*)t_bl)->guardian_data && flag&BCT_ENEMY)
return 0; //pet may not attack Guardians/Emperium return 0; //pet may not attack Guardians/Emperium
break; break;
case BL_SKILL: case BL_SKILL: {
{
struct skill_unit *su = (struct skill_unit *)src; struct skill_unit *su = (struct skill_unit *)src;
int inf2 = 0;
if (!su->group) if (!su->group)
return 0; return 0;
if( battle_config.vs_traps_bctall && (target->type&battle_config.vs_traps_bctall) &&
(inf2 = skill_get_inf2(su->group->skill_id))&INF2_TRAP &&
map_flag_vs(src->m) )
return 1;//traps may target everyone
if (su->group->src_id == target->id) { if (su->group->src_id == target->id) {
int inf2 = skill_get_inf2(su->group->skill_id);
if (inf2&INF2_NO_TARGET_SELF) if (inf2&INF2_NO_TARGET_SELF)
return -1; return -1;
if (inf2&INF2_TARGET_SELF) if (inf2&INF2_TARGET_SELF)
return 1; return 1;
} }
break;
} }
break;
} }
switch( s_bl->type ) switch( s_bl->type )