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

Follow up r15084, tested and adjusted

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15086 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2011-12-13 05:03:59 +00:00
parent 19672a472a
commit 7f2432aafc
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/skill.c
View File

@ -2394,12 +2394,10 @@ static int skill_check_unit_range2 (struct block_list *bl, int x, int y, int ski
type, skillid); type, skillid);
} }
int skill_guildaura_sub (struct map_session_data* sd, int id, int gid, int strvit, int agidex) int skill_guildaura_sub (struct map_session_data* sd, int id, int strvit, int agidex)
{ {
nullpo_ret(sd); nullpo_ret(sd);
if( sd->status.guild_id != gid )
return 0;
if( id == sd->bl.id && battle_config.guild_aura&16 ) if( id == sd->bl.id && battle_config.guild_aura&16 )
return 0; return 0;

2
src/map/skill.h
View File

@ -309,7 +309,7 @@ int skill_unit_move_unit_group( struct skill_unit_group *group, int m,int dx,int
struct skill_unit_group *skill_check_dancing( struct block_list *src ); struct skill_unit_group *skill_check_dancing( struct block_list *src );
// Guild skills [celest] // Guild skills [celest]
int skill_guildaura_sub (struct map_session_data* sd, int id, int gid, int strvit, int agidex); int skill_guildaura_sub (struct map_session_data* sd, int id, int strvit, int agidex);
// 詠唱キャンセル // 詠唱キャンセル
int skill_castcancel(struct block_list *bl,int type); int skill_castcancel(struct block_list *bl,int type);

2
src/map/unit.c
View File

@ -192,7 +192,7 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data
{ {
if( g->member[i].online && g->member[i].sd && check_distance_bl(&sd->bl, &g->member[i].sd->bl, 2) ) if( g->member[i].online && g->member[i].sd && check_distance_bl(&sd->bl, &g->member[i].sd->bl, 2) )
{// perform the aura on the member as appropriate {// perform the aura on the member as appropriate
skill_guildaura_sub( g->member[i].sd, g->member[i].sd->bl.id, sd->status.guild_id, strvit, agidex ); skill_guildaura_sub( g->member[i].sd, sd->bl.id, strvit, agidex );
} }
} }
} }