From 7f2432aafc7d09fb7e8d814b253495aea95a01e6 Mon Sep 17 00:00:00 2001
From: shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 13 Dec 2011 05:03:59 +0000
Subject: [PATCH] Follow up r15084, tested and adjusted

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15086 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/skill.c | 4 +---
 src/map/skill.h | 2 +-
 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 56deef1862..973e38bf7a 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 b4e0f209e0..bbcd685490 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 fb283a69bf..0b338e1bc0 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 );
 					}
 				}
 			}