- Oppositions can't be made during WoE now.

- Fixed a few compiler warnings from VC
- Commented out the Homunculus Skills<->Status Change link which was causing some memory corruptions.
- 


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

1 files changed, 8 insertions, 7 deletions

diff --git a/src/map/guild.c b/src/map/guild.c
index 2515cc4a3..751f2efad 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1401,19 +1401,20 @@ int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd)
 	if( guild_get_alliance_count(g,1)>=3 )	// 敵対数確認

 		clif_guild_oppositionack(sd,1);

 

+	if(agit_flag)	{

+		clif_displaymessage(sd->fd,"You cannot make oppositions during Guild Wars!");

+		return 0;

+	}

+

 	for(i=0;i<MAX_GUILDALLIANCE;i++){	// すでに関係を持っているか確認

 		if(g->alliance[i].guild_id==tsd->status.guild_id){

 			if(g->alliance[i].opposition==1){	// すでに敵対

 				clif_guild_oppositionack(sd,2);

 				return 0;

-			} else { //Change alliance to opposition.

-				if(agit_flag)	{

-					clif_displaymessage(sd->fd,"You cannot break an alliance during Guild Wars!");

-					return 0;

-				}

-				intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,

-					sd->status.account_id,tsd->status.account_id,8 );

 			}

+			//Change alliance to opposition.

+			intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,

+				sd->status.account_id,tsd->status.account_id,8 );

 		}

 	}