- Fixed the login-sql server replying to the change-sex packet with the wrong gender, causing the char-server to screw-up job-change updates.

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

3 files changed, 5 insertions, 3 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 7f7421d42..cac227cfa 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2735,6 +2735,7 @@ int parse_frommap(int fd) {
 		case 0x2aff:

 			if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))

 				return 0;

+			//TODO: When data mismatches memory, update guild/party online/offline states.

 			server[id].users = RFIFOW(fd,4);

 			// add online players in the list by [Yor], adapted to use dbs by [Skotlex]

 			j = 0;

diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 4ab63f14c..3a42f7556 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -2582,6 +2582,7 @@ int parse_frommap(int fd) {
 			if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))

 				return 0;

 		{

+			//TODO: When data mismatches memory, update guild/party online/offline states.

 			int i, aid, cid;

 			struct online_char_data* character;

 

diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 78f7da3ca..4c9393bc8 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -1242,10 +1242,10 @@ int parse_fromchar(int fd){
 			}

 

 			if (strcmpi(sql_row[0], "M") == 0)

-				sex = 1;

+				sex = 0; //Change to female

 			else

-				sex = 0;

-			sprintf(tmpsql,"UPDATE `%s` SET `sex` = '%c' WHERE `%s` = '%d'", login_db, (sex==0?'M':'F'), login_db_account_id, acc);

+				sex = 1; //Change to make

+			sprintf(tmpsql,"UPDATE `%s` SET `sex` = '%c' WHERE `%s` = '%d'", login_db, (sex?'M':'F'), login_db_account_id, acc);

 			//query

 			if(mysql_query(&mysql_handle, tmpsql)) {

 				ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));