From bcb283d696d5ec4d7b6a2dfd2ba52cf2a3011fb4 Mon Sep 17 00:00:00 2001 From: zephyrus Date: Thu, 14 Feb 2008 01:18:19 +0000 Subject: - Added some new config settings: homunculus_autoloot, idle_no_autoloot, max_guild_alliance. - Added a code to activate a Kill Steal protection and the required mapflags. * (I will explain this later on forums). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12203 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/guild.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/map/guild.c') diff --git a/src/map/guild.c b/src/map/guild.c index a9670400a..e591fc838 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1250,11 +1250,11 @@ int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd) if(sd->status.guild_id == tsd->status.guild_id) return 0; - if( guild_get_alliance_count(g[0],0)>=3 ) { + if( guild_get_alliance_count(g[0],0) >= battle_config.max_guild_alliance ) { clif_guild_allianceack(sd,4); return 0; } - if( guild_get_alliance_count(g[1],0)>=3 ) { + if( guild_get_alliance_count(g[1],0) >= battle_config.max_guild_alliance ) { clif_guild_allianceack(sd,3); return 0; } @@ -1300,12 +1300,12 @@ int guild_reply_reqalliance(struct map_session_data *sd,int account_id,int flag) g=guild_search(sd->status.guild_id); tg=guild_search(tsd->status.guild_id); - if(g==NULL || guild_get_alliance_count(g,0)>=3){ + if(g==NULL || guild_get_alliance_count(g,0) >= battle_config.max_guild_alliance){ clif_guild_allianceack(sd,4); clif_guild_allianceack(tsd,3); return 0; } - if(tg==NULL || guild_get_alliance_count(tg,0)>=3){ + if(tg==NULL || guild_get_alliance_count(tg,0) >= battle_config.max_guild_alliance){ clif_guild_allianceack(sd,3); clif_guild_allianceack(tsd,4); return 0; @@ -1367,7 +1367,7 @@ int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd) if(sd->status.guild_id == tsd->status.guild_id) return 0; - if( guild_get_alliance_count(g,1)>=3 ) { + if( guild_get_alliance_count(g,1) >= battle_config.max_guild_alliance ) { clif_guild_oppositionack(sd,1); return 0; } -- cgit v1.2.3-60-g2f50