- Added all the missing FIFOHEADs in the login/sql servers (required for TURBO support)

- Fixed the fact that the TURBO code breaks when you attempt to handle more than one connection at a time within the same function. However this broke map-server compilation, therefore, don't use TURBO yet! It needs more fixing (and I need more time to fix it)
- While at it, cleaned a few packet implementations in the char/login servers which were not only ugly, but had some really stupid flaws within (stuff like escaping a string, and then using the non-escaped variable to insert to SQL? T_T) And will someone explain me why the TXT servers are coded much more cleanly, and without such horribly broken code as I find in the SQL ones? T_T;


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

1 files changed, 4 insertions, 1 deletions

diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index 1a1ce718a..81333db16 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -987,6 +987,7 @@ int guild_calcinfo(struct guild *g)
 

 int mapif_guild_created(int fd,int account_id,struct guild *g)

 {

+	WFIFOHEAD(fd, 10);

 	WFIFOW(fd,0)=0x3830;

 	WFIFOL(fd,2)=account_id;

 	if(g != NULL)

@@ -1031,6 +1032,7 @@ int mapif_guild_info(int fd,struct guild *g)
 // ACK member add

 int mapif_guild_memberadded(int fd,int guild_id,int account_id,int char_id,int flag)

 {

+	WFIFOHEAD(fd, 15);

 	WFIFOW(fd,0)=0x3832;

 	WFIFOL(fd,2)=guild_id;

 	WFIFOL(fd,6)=account_id;

@@ -1232,7 +1234,7 @@ int mapif_guild_castle_datasave(int castle_id,int index,int value)      // <Agit
 int mapif_guild_castle_alldataload(int fd) {

 	struct guild_castle* gc = (struct guild_castle *)aMalloc(sizeof(struct guild_castle));

 	int i, len = 4;

-

+	WFIFOHEAD(fd, len + MAX_GUILDCASTLE*sizeof(struct guild_castle));

 	WFIFOW(fd,0) = 0x3842;

 	sprintf(tmp_sql,"SELECT * FROM `%s` ORDER BY `castle_id`", guild_castle_db);

 	if(mysql_query(&mysql_handle, tmp_sql) ) {

@@ -2060,6 +2062,7 @@ int mapif_parse_GuildCheck(int fd,int guild_id,int account_id,int char_id)
 // ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない

 int inter_guild_parse_frommap(int fd)

 {

+	RFIFOHEAD(fd);

 	switch(RFIFOW(fd,0)){

 	case 0x3030: mapif_parse_CreateGuild(fd,RFIFOL(fd,4),(char*)RFIFOP(fd,8),(struct guild_member *)RFIFOP(fd,32)); break;

 	case 0x3031: mapif_parse_GuildInfo(fd,RFIFOL(fd,2)); break;