* Updated most of map-server to 1082

* Removed my own additions for skill delays using aspd
* Adapted skill_range_leniency to jA's code
* Fixed drop rates only limited to multiples of 100's
* Added missing code for castle_defense_rate
* Removed pc_undead_nofreeze
* Updated unrefineable items table
* Added 3 new script commands
* Added SC_SpeedUp0
* Merged itemdb_read for SQL and TXT
* Removed itemdb_read_cardillustnametable limited to TXT only
* Added reading itemslotcounttable.txt from the GRF to auto set number of slots per item
* Added a display message when reading itemslottable from the GRF
* Added options in battle_athena.conf to enable/disable reading the GRF

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

1 files changed, 10 insertions, 3 deletions

diff --git a/src/map/guild.c b/src/map/guild.c
index 83da2a809..7d73692c9 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1191,10 +1191,17 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id
 	int flag,const char *name1,const char *name2)
 {
 	struct guild *g[2];
-	int guild_id[2]={guild_id1,guild_id2};
-	const char *guild_name[2]={name1,name2};
-	struct map_session_data *sd[2]={map_id2sd(account_id1),map_id2sd(account_id2)};
+	int guild_id[2];
+	const char *guild_name[2];
+	struct map_session_data *sd[2];
 	int j,i;
+	
+	guild_id[0] = guild_id1;
+	guild_id[1] = guild_id2;
+	guild_name[0] = name1;
+	guild_name[1] = name2;
+	sd[0] = map_id2sd(account_id1);
+	sd[1] = map_id2sd(account_id2);
 
 	g[0]=guild_search(guild_id1);
 	g[1]=guild_search(guild_id2);