- Optimised the guild aura routine which was wasting cycles by processing every unit on a map (rather than guild members)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15084 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 6 insertions, 15 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index a7e75b6f4..1847ffb86 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2382,27 +2382,18 @@ static int skill_check_unit_range2 (struct block_list *bl, int x, int y, int ski
 		type, skillid);
 }
 
-int skill_guildaura_sub (struct block_list *bl, va_list ap)
+int skill_guildaura_sub (struct map_session_data* sd, int id, int gid, int strvit, int agidex)
 {
-	struct map_session_data *sd;
-	int gid, id, strvit, agidex;
-
-	sd = (struct map_session_data *)bl;
+	nullpo_ret(sd);
 
-	id = va_arg(ap,int);
-	gid = va_arg(ap,int);
-	if (sd->status.guild_id != gid)
+	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;
 
-	strvit = va_arg(ap,int);
-	agidex = va_arg(ap,int);
-
-	if (sd->sc.data[SC_GUILDAURA]) {
+	if( sd->sc.data[SC_GUILDAURA] ) {
 		struct status_change_entry *sce = sd->sc.data[SC_GUILDAURA];
-		if (sce->val3 != strvit || sce->val4 != agidex) {
+		if( sce->val3 != strvit || sce->val4 != agidex ) {
 			sce->val3 = strvit;
 			sce->val4 = agidex;
 			status_calc_bl(&sd->bl, StatusChangeFlagTable[SC_GUILDAURA]);