diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-13 05:03:59 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-13 05:03:59 +0000 |
| commit | 9d694d82b4861271193535f0a7f77349482ac84e (patch) | |
| tree | 000143c0abba6d0119258ccda9351d47367fb1ad | |
| parent | 6b4bb61343f4c08e881228e569c95507e0250a1a (diff) | |
| download | hercules-9d694d82b4861271193535f0a7f77349482ac84e.tar.gz hercules-9d694d82b4861271193535f0a7f77349482ac84e.tar.bz2 hercules-9d694d82b4861271193535f0a7f77349482ac84e.tar.xz hercules-9d694d82b4861271193535f0a7f77349482ac84e.zip | |
Follow up r15084, tested and adjusted
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15086 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/skill.c | 4 | ||||
| -rw-r--r-- | src/map/skill.h | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 56deef186..973e38bf7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2394,12 +2394,10 @@ static int skill_check_unit_range2 (struct block_list *bl, int x, int y, int ski 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); - if( sd->status.guild_id != gid ) - return 0; if( id == sd->bl.id && battle_config.guild_aura&16 ) return 0; diff --git a/src/map/skill.h b/src/map/skill.h index b4e0f209e..bbcd68549 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -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 ); // 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); diff --git a/src/map/unit.c b/src/map/unit.c index fb283a69b..0b338e1bc 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -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) ) {// 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 ); } } } |