- cbasetypes now assumes that Mingwin does defines ssize_t

- Modified the guild master change ack packet to return the aid/cid of the new guild master instead of the index where it was, the previous method could cause problems in situations where the order of guild members would not match exactly between char/map servers.
- Updated the Soul Linker's Rogue Spirit Stealth's speed bonus to +60%, according to forum infor from ragnagate.


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

1 files changed, 5 insertions, 4 deletions

diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index 8232608c1..4ad3ea070 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -1199,13 +1199,14 @@ int mapif_guild_emblem(struct guild *g)
 	return 0;
 }
 
-int mapif_guild_master_changed(struct guild *g, int position)
+int mapif_guild_master_changed(struct guild *g, int aid, int cid)
 {
 	unsigned char buf[10];
 	WBUFW(buf,0)=0x3843;
 	WBUFL(buf,2)=g->guild_id;
-	WBUFL(buf,6)=position;
-	mapif_sendall(buf,10);
+	WBUFL(buf,6)=aid;
+	WBUFL(buf,10)=cid;
+	mapif_sendall(buf,14);
 	return 0;
 }
 
@@ -2043,7 +2044,7 @@ int mapif_parse_GuildMasterChange(int fd, int guild_id, const char* name, int le
 
 	ShowInfo("int_guild: Guildmaster Changed to %s (Guild %d - %s)\n",g->master, guild_id, g->name);
 	g->save_flag |= (GS_BASIC|GS_MEMBER); //Save main data and member data.
-	return mapif_guild_master_changed(g, pos);
+	return mapif_guild_master_changed(g, g->member[0].account_id, g->member[0].char_id);
 }
 
 // ギルドチェック要求