Introducing Slot Change feature

Special Thanks to Yommy for providing the packet structure/data.

Signed-off-by: shennetsind <ind@henn.et>

1 files changed, 598 insertions, 529 deletions

diff --git a/src/char/char.c b/src/char/char.c
index a059d08ea..1745c061f 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -454,7 +454,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		(p->pet_id != cp->pet_id) || (p->weapon != cp->weapon) || (p->hom_id != cp->hom_id) ||
 		(p->ele_id != cp->ele_id) || (p->shield != cp->shield) || (p->head_top != cp->head_top) ||
 		(p->head_mid != cp->head_mid) || (p->head_bottom != cp->head_bottom) || (p->delete_date != cp->delete_date) ||
-		(p->rename != cp->rename) || (p->robe != cp->robe)
+		(p->rename != cp->rename) || (p->slotchange != cp->slotchange) || (p->robe != cp->robe)
 	)
 	{	//Save status
 		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `base_level`='%d', `job_level`='%d',"
@@ -464,7 +464,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 			"`option`='%d',`party_id`='%d',`guild_id`='%d',`pet_id`='%d',`homun_id`='%d',`elemental_id`='%d',"
 			"`weapon`='%d',`shield`='%d',`head_top`='%d',`head_mid`='%d',`head_bottom`='%d',"
 			"`last_map`='%s',`last_x`='%d',`last_y`='%d',`save_map`='%s',`save_x`='%d',`save_y`='%d', `rename`='%d',"
-			"`delete_date`='%lu',`robe`='%d'"
+			"`delete_date`='%lu',`robe`='%d',`slotchange`='%d'"
 			" WHERE  `account_id`='%d' AND `char_id` = '%d'",
 			char_db, p->base_level, p->job_level,
 			p->base_exp, p->job_exp, p->zeny,
@@ -475,7 +475,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 			mapindex_id2name(p->last_point.map), p->last_point.x, p->last_point.y,
 			mapindex_id2name(p->save_point.map), p->save_point.x, p->save_point.y, p->rename,
 			(unsigned long)p->delete_date,  // FIXME: platform-dependent size
-			p->robe,
+			p->robe,p->slotchange,
 			p->account_id, p->char_id) )
 		{
 			Sql_ShowDebug(sql_handle);
@@ -998,7 +998,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 		"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
 		"`status_point`,`skill_point`,`option`,`karma`,`manner`,`hair`,`hair_color`,"
 		"`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`rename`,`delete_date`,"
-		"`robe`"
+		"`robe`,`slotchange`"
 		" FROM `%s` WHERE `account_id`='%d' AND `char_num` < '%d'", char_db, sd->account_id, MAX_CHARS)
 	||	SQL_ERROR == SqlStmt_Execute(stmt)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0,  SQLDT_INT,    &p.char_id, 0, NULL, NULL)
@@ -1034,9 +1034,10 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 30, SQLDT_SHORT,  &p.head_mid, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 31, SQLDT_SHORT,  &p.head_bottom, 0, NULL, NULL)
 	||  SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_STRING, &last_map, sizeof(last_map), NULL, NULL)
-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_SHORT,	&p.rename, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_USHORT,	&p.rename, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 34, SQLDT_UINT32, &p.delete_date, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 35, SQLDT_SHORT,  &p.robe, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 36, SQLDT_USHORT, &p.slotchange, 0, NULL, NULL)
 	)
 	{
 		SqlStmt_ShowDebug(stmt);
@@ -1046,7 +1047,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	for( i = 0; i < MAX_CHARS && SQL_SUCCESS == SqlStmt_NextRow(stmt); i++ )
 	{
 		p.last_point.map = mapindex_name2id(last_map);
-		sd->found_char[i] = p.char_id;
+		sd->found_char[p.slot] = p.char_id;
 		j += mmo_char_tobuf(WBUFP(buf, j), &p);
 	}
 	for( ; i < MAX_CHARS; i++ )
@@ -1095,7 +1096,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 		"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
 		"`status_point`,`skill_point`,`option`,`karma`,`manner`,`party_id`,`guild_id`,`pet_id`,`homun_id`,`elemental_id`,`hair`,"
 		"`hair_color`,`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`last_x`,`last_y`,"
-		"`save_map`,`save_x`,`save_y`,`partner_id`,`father`,`mother`,`child`,`fame`,`rename`,`delete_date`,`robe`"
+		"`save_map`,`save_x`,`save_y`,`partner_id`,`father`,`mother`,`child`,`fame`,`rename`,`delete_date`,`robe`,`slotchange`"
 		" FROM `%s` WHERE `char_id`=? LIMIT 1", char_db)
 	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
 	||	SQL_ERROR == SqlStmt_Execute(stmt)
@@ -1148,9 +1149,10 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 46, SQLDT_INT,    &p->mother, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 47, SQLDT_INT,    &p->child, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 48, SQLDT_INT,    &p->fame, 0, NULL, NULL)
-	||  SQL_ERROR == SqlStmt_BindColumn(stmt, 49, SQLDT_SHORT,	&p->rename, 0, NULL, NULL)
+	||  SQL_ERROR == SqlStmt_BindColumn(stmt, 49, SQLDT_USHORT,	&p->rename, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 50, SQLDT_UINT32, &p->delete_date, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 51, SQLDT_SHORT,  &p->robe, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 52, SQLDT_USHORT, &p->slotchange, 0, NULL, NULL)
 	)
 	{
 		SqlStmt_ShowDebug(stmt);
@@ -1345,6 +1347,54 @@ int mmo_char_sql_init(void)
 
 	return 0;
 }
+/* [Ind/Hercules] - special thanks to Yommy for providing the packet structure/data */
+bool char_slotchange(struct char_session_data *sd, int fd, unsigned short from, unsigned short to) {
+	struct mmo_charstatus char_dat;
+	int from_id = 0;
+
+	if( from > MAX_CHARS || to > MAX_CHARS || ( sd->char_slots && to > sd->char_slots ) || sd->found_char[from] <= 0 )
+		return false;
+
+	if( !mmo_char_fromsql(sd->found_char[from], &char_dat, false) ) // Only the short data is needed.
+		return false;
+
+	if( char_dat.slotchange == 0 )
+		return false;
+
+	from_id = sd->found_char[from];
+	
+	if( sd->found_char[to] > 0 ) {/* moving char to occupied slot */
+		bool result = false;
+		/* update both at once */
+		if( SQL_SUCCESS != Sql_QueryStr(sql_handle, "START TRANSACTION")
+		   ||  SQL_SUCCESS != Sql_Query(sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d' LIMIT 1", char_db, from, sd->found_char[to])
+		   ||  SQL_SUCCESS != Sql_Query(sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d' LIMIT 1", char_db, to, sd->found_char[from]) )
+			Sql_ShowDebug(sql_handle);
+		else
+			result = true;
+		
+		if( SQL_ERROR == Sql_QueryStr(sql_handle, (result == true) ? "COMMIT" : "ROLLBACK") ) {
+			Sql_ShowDebug(sql_handle);
+			result = false;
+		}
+		if( !result )
+			return false;
+		
+	} else {/* slot is free. */
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d' LIMIT 1", char_db, to, sd->found_char[from] ) ) {
+			Sql_ShowDebug(sql_handle);
+			return false;
+		}
+	}
+	
+	/* update count */
+	if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `slotchange`=`slotchange`-1 WHERE `char_id`='%d' LIMIT 1", char_db, from_id ) ) {
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+	
+	return true;
+}
 
 //-----------------------------------
 // Function to change chararcter's names
@@ -1818,7 +1868,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 #endif
 #if PACKETVER != 20111116 //2011-11-16 wants 136, ask gravity.
 	#if PACKETVER >= 20110928
-		WBUFL(buf,132) = 0;  // change slot feature (0 = disabled, otherwise enabled)
+	WBUFL(buf,132) = ( p->slotchange > 0 ) ? 1 : 0;  // change slot feature (0 = disabled, otherwise enabled)
 		offset += 4;
 	#endif
 	#if PACKETVER >= 20111025
@@ -3638,602 +3688,621 @@ int parse_char(int fd)
 		return 0;
 	}
 
-	while( RFIFOREST(fd) >= 2 )
-	{
+	while( RFIFOREST(fd) >= 2 ) {
 		//For use in packets that depend on an sd being present [Skotlex]
 		#define FIFOSD_CHECK(rest) { if(RFIFOREST(fd) < rest) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,rest); return 0; } }
 
 		cmd = RFIFOW(fd,0);
-		switch( cmd )
-		{
-
-		// request to connect
-		// 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
-		case 0x65:
-			if( RFIFOREST(fd) < 17 )
-				return 0;
-		{
-			struct auth_node* node;
+		switch( cmd ) {
 
-			int account_id = RFIFOL(fd,2);
-			uint32 login_id1 = RFIFOL(fd,6);
-			uint32 login_id2 = RFIFOL(fd,10);
-			int sex = RFIFOB(fd,16);
-			RFIFOSKIP(fd,17);
-
-			ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", account_id, login_id1, login_id2);
+			// request to connect
+			// 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
+			case 0x65:
+				if( RFIFOREST(fd) < 17 )
+					return 0;
+			{
+				struct auth_node* node;
 
-			if (sd) {
-				//Received again auth packet for already authentified account?? Discard it.
-				//TODO: Perhaps log this as a hack attempt?
-				//TODO: and perhaps send back a reply?
-				break;
-			}
+				int account_id = RFIFOL(fd,2);
+				uint32 login_id1 = RFIFOL(fd,6);
+				uint32 login_id2 = RFIFOL(fd,10);
+				int sex = RFIFOB(fd,16);
+				RFIFOSKIP(fd,17);
 
-			CREATE(session[fd]->session_data, struct char_session_data, 1);
-			sd = (struct char_session_data*)session[fd]->session_data;
-			sd->account_id = account_id;
-			sd->login_id1 = login_id1;
-			sd->login_id2 = login_id2;
-			sd->sex = sex;
-			sd->auth = false; // not authed yet
+				ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", account_id, login_id1, login_id2);
 
-			// send back account_id
-			WFIFOHEAD(fd,4);
-			WFIFOL(fd,0) = account_id;
-			WFIFOSET(fd,4);
+				if (sd) {
+					//Received again auth packet for already authentified account?? Discard it.
+					//TODO: Perhaps log this as a hack attempt?
+					//TODO: and perhaps send back a reply?
+					break;
+				}
 
-			if( runflag != CHARSERVER_ST_RUNNING )
-			{
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6c;
-				WFIFOB(fd,2) = 0;// rejected from server
-				WFIFOSET(fd,3);
-				break;
-			}
+				CREATE(session[fd]->session_data, struct char_session_data, 1);
+				sd = (struct char_session_data*)session[fd]->session_data;
+				sd->account_id = account_id;
+				sd->login_id1 = login_id1;
+				sd->login_id2 = login_id2;
+				sd->sex = sex;
+				sd->auth = false; // not authed yet
+
+				// send back account_id
+				WFIFOHEAD(fd,4);
+				WFIFOL(fd,0) = account_id;
+				WFIFOSET(fd,4);
 
-			// search authentification
-			node = (struct auth_node*)idb_get(auth_db, account_id);
-			if( node != NULL &&
-			    node->account_id == account_id &&
-				node->login_id1  == login_id1 &&
-				node->login_id2  == login_id2 /*&&
-				node->ip         == ipl*/ )
-			{// authentication found (coming from map server)
-				idb_remove(auth_db, account_id);
-				char_auth_ok(fd, sd);
-			}
-			else
-			{// authentication not found (coming from login server)
-				if (login_fd > 0) { // don't send request if no login-server
-					WFIFOHEAD(login_fd,23);
-					WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
-					WFIFOL(login_fd,2) = sd->account_id;
-					WFIFOL(login_fd,6) = sd->login_id1;
-					WFIFOL(login_fd,10) = sd->login_id2;
-					WFIFOB(login_fd,14) = sd->sex;
-					WFIFOL(login_fd,15) = htonl(ipl);
-					WFIFOL(login_fd,19) = fd;
-					WFIFOSET(login_fd,23);
-				} else { // if no login-server, we must refuse connection
+				if( runflag != CHARSERVER_ST_RUNNING )
+				{
 					WFIFOHEAD(fd,3);
 					WFIFOW(fd,0) = 0x6c;
-					WFIFOB(fd,2) = 0;
+					WFIFOB(fd,2) = 0;// rejected from server
 					WFIFOSET(fd,3);
+					break;
+				}
+
+				// search authentification
+				node = (struct auth_node*)idb_get(auth_db, account_id);
+				if( node != NULL &&
+					node->account_id == account_id &&
+					node->login_id1  == login_id1 &&
+					node->login_id2  == login_id2 /*&&
+					node->ip         == ipl*/ )
+				{// authentication found (coming from map server)
+					idb_remove(auth_db, account_id);
+					char_auth_ok(fd, sd);
+				}
+				else
+				{// authentication not found (coming from login server)
+					if (login_fd > 0) { // don't send request if no login-server
+						WFIFOHEAD(login_fd,23);
+						WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
+						WFIFOL(login_fd,2) = sd->account_id;
+						WFIFOL(login_fd,6) = sd->login_id1;
+						WFIFOL(login_fd,10) = sd->login_id2;
+						WFIFOB(login_fd,14) = sd->sex;
+						WFIFOL(login_fd,15) = htonl(ipl);
+						WFIFOL(login_fd,19) = fd;
+						WFIFOSET(login_fd,23);
+					} else { // if no login-server, we must refuse connection
+						WFIFOHEAD(fd,3);
+						WFIFOW(fd,0) = 0x6c;
+						WFIFOB(fd,2) = 0;
+						WFIFOSET(fd,3);
+					}
 				}
 			}
-		}
-		break;
+			break;
 
-		// char select
-		case 0x66:
-			FIFOSD_CHECK(3);
-		{
-			struct mmo_charstatus char_dat;
-			struct mmo_charstatus *cd;
-			char* data;
-			int char_id;
-			uint32 subnet_map_ip;
-			struct auth_node* node;
+			// char select
+			case 0x66:
+				FIFOSD_CHECK(3);
+			{
+				struct mmo_charstatus char_dat;
+				struct mmo_charstatus *cd;
+				char* data;
+				int char_id;
+				uint32 subnet_map_ip;
+				struct auth_node* node;
 
-			int slot = RFIFOB(fd,2);
-			RFIFOSKIP(fd,3);
+				int slot = RFIFOB(fd,2);
+				RFIFOSKIP(fd,3);
+
+				if( *pincode->enabled ){ // hack check
+					struct online_char_data* character;	
+					character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
+					if( character && character->pincode_enable == -1){
+						WFIFOHEAD(fd,3);
+						WFIFOW(fd,0) = 0x6c;
+						WFIFOB(fd,2) = 0;
+						WFIFOSET(fd,3);
+						break;
+					}
+				}
 
-			if( *pincode->enabled ){ // hack check
-				struct online_char_data* character;	
-				character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
-				if( character && character->pincode_enable == -1){
+				if ( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `char_id` FROM `%s` WHERE `account_id`='%d' AND `char_num`='%d'", char_db, sd->account_id, slot)
+				  || SQL_SUCCESS != Sql_NextRow(sql_handle)
+				  || SQL_SUCCESS != Sql_GetData(sql_handle, 0, &data, NULL) )
+				{	//Not found?? May be forged packet.
+					Sql_ShowDebug(sql_handle);
+					Sql_FreeResult(sql_handle);
 					WFIFOHEAD(fd,3);
 					WFIFOW(fd,0) = 0x6c;
-					WFIFOB(fd,2) = 0;
+					WFIFOB(fd,2) = 0; // rejected from server
 					WFIFOSET(fd,3);
 					break;
 				}
-			}
 
-			if ( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `char_id` FROM `%s` WHERE `account_id`='%d' AND `char_num`='%d'", char_db, sd->account_id, slot)
-			  || SQL_SUCCESS != Sql_NextRow(sql_handle)
-			  || SQL_SUCCESS != Sql_GetData(sql_handle, 0, &data, NULL) )
-			{	//Not found?? May be forged packet.
-				Sql_ShowDebug(sql_handle);
+				char_id = atoi(data);
 				Sql_FreeResult(sql_handle);
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6c;
-				WFIFOB(fd,2) = 0; // rejected from server
-				WFIFOSET(fd,3);
-				break;
-			}
-
-			char_id = atoi(data);
-			Sql_FreeResult(sql_handle);
-			
-			/* set char as online prior to loading its data so 3rd party applications will realise the sql data is not reliable */
-			set_char_online(-2,char_id,sd->account_id);
-			if( !mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
-				set_char_offline(char_id, sd->account_id);
-				/* failed to load something. REJECT! */
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6c;
-				WFIFOB(fd,2) = 0;
-				WFIFOSET(fd,3);
-				break;/* jump off this boat */
-			}
+				
+				/* set char as online prior to loading its data so 3rd party applications will realise the sql data is not reliable */
+				set_char_online(-2,char_id,sd->account_id);
+				if( !mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
+					set_char_offline(char_id, sd->account_id);
+					/* failed to load something. REJECT! */
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x6c;
+					WFIFOB(fd,2) = 0;
+					WFIFOSET(fd,3);
+					break;/* jump off this boat */
+				}
 
-			//Have to switch over to the DB instance otherwise data won't propagate [Kevin]
-			cd = (struct mmo_charstatus *)idb_get(char_db_, char_id);
-			cd->sex = sd->sex;
+				//Have to switch over to the DB instance otherwise data won't propagate [Kevin]
+				cd = (struct mmo_charstatus *)idb_get(char_db_, char_id);
+				cd->sex = sd->sex;
 
-			if (log_char) {
-				char esc_name[NAME_LENGTH*2+1];
+				if (log_char) {
+					char esc_name[NAME_LENGTH*2+1];
 
-				Sql_EscapeStringLen(sql_handle, esc_name, char_dat.name, strnlen(char_dat.name, NAME_LENGTH));
-				if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
-					charlog_db, sd->account_id, slot, esc_name) )
-					Sql_ShowDebug(sql_handle);
-			}
-			ShowInfo("Selected char: (Account %d: %d - %s)\n", sd->account_id, slot, char_dat.name);
-
-			// searching map server
-			i = search_mapserver(cd->last_point.map, -1, -1);
-
-			// if map is not found, we check major cities
-			if (i < 0 || !cd->last_point.map) {
-				unsigned short j;
-				//First check that there's actually a map server online.
-				ARR_FIND( 0, ARRAYLENGTH(server), j, server[j].fd >= 0 && server[j].map[0] );
-				if (j == ARRAYLENGTH(server)) {
-					ShowInfo("Connection Closed. No map servers available.\n");
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x81;
-					WFIFOB(fd,2) = 1; // 01 = Server closed
-					WFIFOSET(fd,3);
-					break;
+					Sql_EscapeStringLen(sql_handle, esc_name, char_dat.name, strnlen(char_dat.name, NAME_LENGTH));
+					if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
+						charlog_db, sd->account_id, slot, esc_name) )
+						Sql_ShowDebug(sql_handle);
 				}
-				if ((i = search_mapserver((j=mapindex_name2id(MAP_PRONTERA)),-1,-1)) >= 0) {
-					cd->last_point.x = 273;
-					cd->last_point.y = 354;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_GEFFEN)),-1,-1)) >= 0) {
-					cd->last_point.x = 120;
-					cd->last_point.y = 100;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_MORROC)),-1,-1)) >= 0) {
-					cd->last_point.x = 160;
-					cd->last_point.y = 94;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_ALBERTA)),-1,-1)) >= 0) {
-					cd->last_point.x = 116;
-					cd->last_point.y = 57;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_PAYON)),-1,-1)) >= 0) {
-					cd->last_point.x = 87;
-					cd->last_point.y = 117;
-				} else if ((i = search_mapserver((j=mapindex_name2id(MAP_IZLUDE)),-1,-1)) >= 0) {
-					cd->last_point.x = 94;
-					cd->last_point.y = 103;
-				} else {
-					ShowInfo("Connection Closed. No map server available that has a major city, and unable to find map-server for '%s'.\n", mapindex_id2name(cd->last_point.map));
+				ShowInfo("Selected char: (Account %d: %d - %s)\n", sd->account_id, slot, char_dat.name);
+
+				// searching map server
+				i = search_mapserver(cd->last_point.map, -1, -1);
+
+				// if map is not found, we check major cities
+				if (i < 0 || !cd->last_point.map) {
+					unsigned short j;
+					//First check that there's actually a map server online.
+					ARR_FIND( 0, ARRAYLENGTH(server), j, server[j].fd >= 0 && server[j].map[0] );
+					if (j == ARRAYLENGTH(server)) {
+						ShowInfo("Connection Closed. No map servers available.\n");
+						WFIFOHEAD(fd,3);
+						WFIFOW(fd,0) = 0x81;
+						WFIFOB(fd,2) = 1; // 01 = Server closed
+						WFIFOSET(fd,3);
+						break;
+					}
+					if ((i = search_mapserver((j=mapindex_name2id(MAP_PRONTERA)),-1,-1)) >= 0) {
+						cd->last_point.x = 273;
+						cd->last_point.y = 354;
+					} else if ((i = search_mapserver((j=mapindex_name2id(MAP_GEFFEN)),-1,-1)) >= 0) {
+						cd->last_point.x = 120;
+						cd->last_point.y = 100;
+					} else if ((i = search_mapserver((j=mapindex_name2id(MAP_MORROC)),-1,-1)) >= 0) {
+						cd->last_point.x = 160;
+						cd->last_point.y = 94;
+					} else if ((i = search_mapserver((j=mapindex_name2id(MAP_ALBERTA)),-1,-1)) >= 0) {
+						cd->last_point.x = 116;
+						cd->last_point.y = 57;
+					} else if ((i = search_mapserver((j=mapindex_name2id(MAP_PAYON)),-1,-1)) >= 0) {
+						cd->last_point.x = 87;
+						cd->last_point.y = 117;
+					} else if ((i = search_mapserver((j=mapindex_name2id(MAP_IZLUDE)),-1,-1)) >= 0) {
+						cd->last_point.x = 94;
+						cd->last_point.y = 103;
+					} else {
+						ShowInfo("Connection Closed. No map server available that has a major city, and unable to find map-server for '%s'.\n", mapindex_id2name(cd->last_point.map));
+						WFIFOHEAD(fd,3);
+						WFIFOW(fd,0) = 0x81;
+						WFIFOB(fd,2) = 1; // 01 = Server closed
+						WFIFOSET(fd,3);
+						break;
+					}
+					ShowWarning("Unable to find map-server for '%s', sending to major city '%s'.\n", mapindex_id2name(cd->last_point.map), mapindex_id2name(j));
+					cd->last_point.map = j;
+				}
+
+				//Send NEW auth packet [Kevin]
+				//FIXME: is this case even possible? [ultramage]
+				if ((map_fd = server[i].fd) < 1 || session[map_fd] == NULL)
+				{
+					ShowError("parse_char: Attempting to write to invalid session %d! Map Server #%d disconnected.\n", map_fd, i);
+					server[i].fd = -1;
+					memset(&server[i], 0, sizeof(struct mmo_map_server));
+					//Send server closed.
 					WFIFOHEAD(fd,3);
 					WFIFOW(fd,0) = 0x81;
 					WFIFOB(fd,2) = 1; // 01 = Server closed
 					WFIFOSET(fd,3);
 					break;
 				}
-				ShowWarning("Unable to find map-server for '%s', sending to major city '%s'.\n", mapindex_id2name(cd->last_point.map), mapindex_id2name(j));
-				cd->last_point.map = j;
-			}
 
-			//Send NEW auth packet [Kevin]
-			//FIXME: is this case even possible? [ultramage]
-			if ((map_fd = server[i].fd) < 1 || session[map_fd] == NULL)
-			{
-				ShowError("parse_char: Attempting to write to invalid session %d! Map Server #%d disconnected.\n", map_fd, i);
-				server[i].fd = -1;
-				memset(&server[i], 0, sizeof(struct mmo_map_server));
-				//Send server closed.
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x81;
-				WFIFOB(fd,2) = 1; // 01 = Server closed
-				WFIFOSET(fd,3);
-				break;
+				//Send player to map
+				WFIFOHEAD(fd,28);
+				WFIFOW(fd,0) = 0x71;
+				WFIFOL(fd,2) = cd->char_id;
+				mapindex_getmapname_ext(mapindex_id2name(cd->last_point.map), (char*)WFIFOP(fd,6));
+				subnet_map_ip = lan_subnetcheck(ipl); // Advanced subnet check [LuzZza]
+				WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : server[i].ip);
+				WFIFOW(fd,26) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
+				WFIFOSET(fd,28);
+
+				// create temporary auth entry
+				CREATE(node, struct auth_node, 1);
+				node->account_id = sd->account_id;
+				node->char_id = cd->char_id;
+				node->login_id1 = sd->login_id1;
+				node->login_id2 = sd->login_id2;
+				node->sex = sd->sex;
+				node->expiration_time = sd->expiration_time;
+				node->group_id = sd->group_id;
+				node->ip = ipl;
+				idb_put(auth_db, sd->account_id, node);
+
 			}
+			break;
 
-			//Send player to map
-			WFIFOHEAD(fd,28);
-			WFIFOW(fd,0) = 0x71;
-			WFIFOL(fd,2) = cd->char_id;
-			mapindex_getmapname_ext(mapindex_id2name(cd->last_point.map), (char*)WFIFOP(fd,6));
-			subnet_map_ip = lan_subnetcheck(ipl); // Advanced subnet check [LuzZza]
-			WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : server[i].ip);
-			WFIFOW(fd,26) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
-			WFIFOSET(fd,28);
-
-			// create temporary auth entry
-			CREATE(node, struct auth_node, 1);
-			node->account_id = sd->account_id;
-			node->char_id = cd->char_id;
-			node->login_id1 = sd->login_id1;
-			node->login_id2 = sd->login_id2;
-			node->sex = sd->sex;
-			node->expiration_time = sd->expiration_time;
-			node->group_id = sd->group_id;
-			node->ip = ipl;
-			idb_put(auth_db, sd->account_id, node);
+			// create new char
+	#if PACKETVER >= 20120307
+			// S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
+			case 0x970:
+				FIFOSD_CHECK(31);
+	#else
+			// S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
+			case 0x67:
+				FIFOSD_CHECK(37);
+	#endif
 
-		}
-		break;
+				if( !char_new ) //turn character creation on/off [Kevin]
+					i = -2;
+				else
+	#if PACKETVER >= 20120307
+					i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
+	#else
+					i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
+	#endif
 
-		// create new char
-#if PACKETVER >= 20120307
-		// S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
-		case 0x970:
-			FIFOSD_CHECK(31);
-#else
-		// S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
-		case 0x67:
-			FIFOSD_CHECK(37);
-#endif
+				//'Charname already exists' (-1), 'Char creation denied' (-2) and 'You are underaged' (-3)
+				if (i < 0) {
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x6e;
+					/* Others I found [Ind] */
+					/* 0x02 = Symbols in Character Names are forbidden */
+					/* 0x03 = You are not elegible to open the Character Slot. */
+					switch (i) {
+						case -1: WFIFOB(fd,2) = 0x00; break;
+						case -2: WFIFOB(fd,2) = 0xFF; break;
+						case -3: WFIFOB(fd,2) = 0x01; break;
+						case -4: WFIFOB(fd,2) = 0x03; break;
+					}
+					WFIFOSET(fd,3);
+				} else {
+					int len;
+					// retrieve data
+					struct mmo_charstatus char_dat;
+					mmo_char_fromsql(i, &char_dat, false); //Only the short data is needed.
+
+					// send to player
+					WFIFOHEAD(fd,2+MAX_CHAR_BUF);
+					WFIFOW(fd,0) = 0x6d;
+					len = 2 + mmo_char_tobuf(WFIFOP(fd,2), &char_dat);
+					WFIFOSET(fd,len);
+
+					// add new entry to the chars list
+					ARR_FIND( 0, MAX_CHARS, ch, sd->found_char[ch] == -1 );
+					if( ch < MAX_CHARS )
+						sd->found_char[ch] = i; // the char_id of the new char
+				}
+	#if PACKETVER >= 20120307
+				RFIFOSKIP(fd,31);
+	#else
+				RFIFOSKIP(fd,37);
+	#endif
+			break;
 
-			if( !char_new ) //turn character creation on/off [Kevin]
-				i = -2;
-			else
-#if PACKETVER >= 20120307
-				i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
-#else
-				i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
-#endif
+			// delete char
+			case 0x68:
+			// 2004-04-19aSakexe+ langtype 12 char deletion packet
+			case 0x1fb:
+				if (cmd == 0x68) FIFOSD_CHECK(46);
+				if (cmd == 0x1fb) FIFOSD_CHECK(56);
+			{
+				int cid = RFIFOL(fd,2);
 
-			//'Charname already exists' (-1), 'Char creation denied' (-2) and 'You are underaged' (-3)
-			if (i < 0) {
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6e;
-				/* Others I found [Ind] */
-				/* 0x02 = Symbols in Character Names are forbidden */
-				/* 0x03 = You are not elegible to open the Character Slot. */
-				switch (i) {
-					case -1: WFIFOB(fd,2) = 0x00; break;
-					case -2: WFIFOB(fd,2) = 0xFF; break;
-					case -3: WFIFOB(fd,2) = 0x01; break;
-					case -4: WFIFOB(fd,2) = 0x03; break;
+				if( *pincode->enabled ){ // hack check
+					struct online_char_data* character;	
+					character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
+					if( character && character->pincode_enable == -1 ){
+						WFIFOHEAD(fd,3);
+						WFIFOW(fd,0) = 0x6c;
+						WFIFOB(fd,2) = 0;
+						WFIFOSET(fd,3);
+						break;
+					}
 				}
-				WFIFOSET(fd,3);
-			} else {
-				int len;
-				// retrieve data
-				struct mmo_charstatus char_dat;
-				mmo_char_fromsql(i, &char_dat, false); //Only the short data is needed.
-
-				// send to player
-				WFIFOHEAD(fd,2+MAX_CHAR_BUF);
-				WFIFOW(fd,0) = 0x6d;
-				len = 2 + mmo_char_tobuf(WFIFOP(fd,2), &char_dat);
-				WFIFOSET(fd,len);
-
-				// add new entry to the chars list
-				ARR_FIND( 0, MAX_CHARS, ch, sd->found_char[ch] == -1 );
-				if( ch < MAX_CHARS )
-					sd->found_char[ch] = i; // the char_id of the new char
-			}
-#if PACKETVER >= 20120307
-			RFIFOSKIP(fd,31);
-#else
-			RFIFOSKIP(fd,37);
-#endif
-		break;
 
-		// delete char
-		case 0x68:
-		// 2004-04-19aSakexe+ langtype 12 char deletion packet
-		case 0x1fb:
-			if (cmd == 0x68) FIFOSD_CHECK(46);
-			if (cmd == 0x1fb) FIFOSD_CHECK(56);
-		{
-			int cid = RFIFOL(fd,2);
+				ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
+				memcpy(email, RFIFOP(fd,6), 40);
+				RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
 
-			if( *pincode->enabled ){ // hack check
-				struct online_char_data* character;	
-				character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
-				if( character && character->pincode_enable == -1 ){
+				// Check if e-mail is correct
+				if(strcmpi(email, sd->email) && //email does not matches and
+				(
+					strcmp("a@a.com", sd->email) || //it is not default email, or
+					(strcmp("a@a.com", email) && strcmp("", email)) //email sent does not matches default
+				)) {	//Fail
 					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x6c;
-					WFIFOB(fd,2) = 0;
+					WFIFOW(fd,0) = 0x70;
+					WFIFOB(fd,2) = 0; // 00 = Incorrect Email address
 					WFIFOSET(fd,3);
 					break;
 				}
-			}
-
-			ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
-			memcpy(email, RFIFOP(fd,6), 40);
-			RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
-
-			// Check if e-mail is correct
-			if(strcmpi(email, sd->email) && //email does not matches and
-			(
-				strcmp("a@a.com", sd->email) || //it is not default email, or
-				(strcmp("a@a.com", email) && strcmp("", email)) //email sent does not matches default
-			)) {	//Fail
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x70;
-				WFIFOB(fd,2) = 0; // 00 = Incorrect Email address
-				WFIFOSET(fd,3);
-				break;
-			}
-
-			// check if this char exists
-			ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
-			if( i == MAX_CHARS )
-			{ // Such a character does not exist in the account
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x70;
-				WFIFOB(fd,2) = 0;
-				WFIFOSET(fd,3);
-				break;
-			}
-
-			// remove char from list and compact it
-			for(ch = i; ch < MAX_CHARS-1; ch++)
-				sd->found_char[ch] = sd->found_char[ch+1];
-			sd->found_char[MAX_CHARS-1] = -1;
-
-			/* Delete character */
-			if(delete_char_sql(cid)<0){
-				//can't delete the char
-				//either SQL error or can't delete by some CONFIG conditions
-				//del fail
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd, 0) = 0x70;
-				WFIFOB(fd, 2) = 0;
-				WFIFOSET(fd, 3);
-				break;
-			}
-			/* Char successfully deleted.*/
-			WFIFOHEAD(fd,2);
-			WFIFOW(fd,0) = 0x6f;
-			WFIFOSET(fd,2);
-		}
-		break;
 
-		// client keep-alive packet (every 12 seconds)
-		// R 0187 <account ID>.l
-		case 0x187:
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			RFIFOSKIP(fd,6);
-		break;
-		// char rename request
-		// R 08fc <char ID>.l <new name>.24B
-		case 0x8fc:
-			FIFOSD_CHECK(30);
-			{
-				int i, cid =RFIFOL(fd,2);
-				char name[NAME_LENGTH];
-				char esc_name[NAME_LENGTH*2+1];
-				safestrncpy(name, (char *)RFIFOP(fd,6), NAME_LENGTH);
-				RFIFOSKIP(fd,30);
-				
+				// check if this char exists
 				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
 				if( i == MAX_CHARS )
+				{ // Such a character does not exist in the account
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x70;
+					WFIFOB(fd,2) = 0;
+					WFIFOSET(fd,3);
 					break;
-				
-				normalize_name(name,TRIM_CHARS);
-				Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-				if( !check_char_name(name,esc_name) ) {
-					i = 1;
-					safestrncpy(sd->new_name, name, NAME_LENGTH);
-				} else
-					i = 0;
-				
-				WFIFOHEAD(fd, 4);
-				WFIFOW(fd,0) = 0x28e;
-				WFIFOW(fd,2) = i;
-				WFIFOSET(fd,4);
-			}
-			break;
+				}
 
-		// char rename request
-		// R 028d <account ID>.l <char ID>.l <new name>.24B
-		case 0x28d:
-			FIFOSD_CHECK(34);
-			{
-				int i, aid = RFIFOL(fd,2), cid =RFIFOL(fd,6);
-				char name[NAME_LENGTH];
- 				char esc_name[NAME_LENGTH*2+1];
-				safestrncpy(name, (char *)RFIFOP(fd,10), NAME_LENGTH);
-				RFIFOSKIP(fd,34);
+				// remove char from list and compact it
+				for(ch = i; ch < MAX_CHARS-1; ch++)
+					sd->found_char[ch] = sd->found_char[ch+1];
+				sd->found_char[MAX_CHARS-1] = -1;
 
-				if( aid != sd->account_id )
-					break;
-				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
-				if( i == MAX_CHARS )
+				/* Delete character */
+				if(delete_char_sql(cid)<0){
+					//can't delete the char
+					//either SQL error or can't delete by some CONFIG conditions
+					//del fail
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd, 0) = 0x70;
+					WFIFOB(fd, 2) = 0;
+					WFIFOSET(fd, 3);
 					break;
-
-				normalize_name(name,TRIM_CHARS);
-				Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-				if( !check_char_name(name,esc_name) )
-				{
-					i = 1;
-					safestrncpy(sd->new_name, name, NAME_LENGTH);
 				}
-				else
-					i = 0;
-
-				WFIFOHEAD(fd, 4);
-				WFIFOW(fd,0) = 0x28e;
-				WFIFOW(fd,2) = i;
-				WFIFOSET(fd,4);
+				/* Char successfully deleted.*/
+				WFIFOHEAD(fd,2);
+				WFIFOW(fd,0) = 0x6f;
+				WFIFOSET(fd,2);
 			}
 			break;
-		//Confirm change name.
-		// 0x28f <char_id>.L
-		case 0x28f:
-			// 0: Sucessfull
-			// 1: This character's name has already been changed. You cannot change a character's name more than once.
-			// 2: User information is not correct.
-			// 3: You have failed to change this character's name.
-			// 4: Another user is using this character name, so please select another one.
-			FIFOSD_CHECK(6);
-			{
-				int i;
-				int cid = RFIFOL(fd,2);
+
+			// client keep-alive packet (every 12 seconds)
+			// R 0187 <account ID>.l
+			case 0x187:
+				if (RFIFOREST(fd) < 6)
+					return 0;
 				RFIFOSKIP(fd,6);
+			break;
+			// char rename request
+			// R 08fc <char ID>.l <new name>.24B
+			case 0x8fc:
+				FIFOSD_CHECK(30);
+				{
+					int i, cid =RFIFOL(fd,2);
+					char name[NAME_LENGTH];
+					char esc_name[NAME_LENGTH*2+1];
+					safestrncpy(name, (char *)RFIFOP(fd,6), NAME_LENGTH);
+					RFIFOSKIP(fd,30);
+					
+					ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+					if( i == MAX_CHARS )
+						break;
+					
+					normalize_name(name,TRIM_CHARS);
+					Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+					if( !check_char_name(name,esc_name) ) {
+						i = 1;
+						safestrncpy(sd->new_name, name, NAME_LENGTH);
+					} else
+						i = 0;
+					
+					WFIFOHEAD(fd, 4);
+					WFIFOW(fd,0) = 0x28e;
+					WFIFOW(fd,2) = i;
+					WFIFOSET(fd,4);
+				}
+				break;
 
-				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
-				if( i == MAX_CHARS )
-					break;
-				i = rename_char_sql(sd, cid);
+			// char rename request
+			// R 028d <account ID>.l <char ID>.l <new name>.24B
+			case 0x28d:
+				FIFOSD_CHECK(34);
+				{
+					int i, aid = RFIFOL(fd,2), cid =RFIFOL(fd,6);
+					char name[NAME_LENGTH];
+					char esc_name[NAME_LENGTH*2+1];
+					safestrncpy(name, (char *)RFIFOP(fd,10), NAME_LENGTH);
+					RFIFOSKIP(fd,34);
+
+					if( aid != sd->account_id )
+						break;
+					ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+					if( i == MAX_CHARS )
+						break;
+
+					normalize_name(name,TRIM_CHARS);
+					Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+					if( !check_char_name(name,esc_name) )
+					{
+						i = 1;
+						safestrncpy(sd->new_name, name, NAME_LENGTH);
+					}
+					else
+						i = 0;
 
-				WFIFOHEAD(fd, 4);
-				WFIFOW(fd,0) = 0x290;
-				WFIFOW(fd,2) = i;
-				WFIFOSET(fd,4);
-			}
+					WFIFOHEAD(fd, 4);
+					WFIFOW(fd,0) = 0x28e;
+					WFIFOW(fd,2) = i;
+					WFIFOSET(fd,4);
+				}
+				break;
+			//Confirm change name.
+			// 0x28f <char_id>.L
+			case 0x28f:
+				// 0: Sucessfull
+				// 1: This character's name has already been changed. You cannot change a character's name more than once.
+				// 2: User information is not correct.
+				// 3: You have failed to change this character's name.
+				// 4: Another user is using this character name, so please select another one.
+				FIFOSD_CHECK(6);
+				{
+					int i;
+					int cid = RFIFOL(fd,2);
+					RFIFOSKIP(fd,6);
+
+					ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+					if( i == MAX_CHARS )
+						break;
+					i = rename_char_sql(sd, cid);
+
+					WFIFOHEAD(fd, 4);
+					WFIFOW(fd,0) = 0x290;
+					WFIFOW(fd,2) = i;
+					WFIFOSET(fd,4);
+				}
+				break;
+
+			// captcha code request (not implemented)
+			// R 07e5 <?>.w <aid>.l
+			case 0x7e5:
+				WFIFOHEAD(fd,5);
+				WFIFOW(fd,0) = 0x7e9;
+				WFIFOW(fd,2) = 5;
+				WFIFOB(fd,4) = 1;
+				WFIFOSET(fd,5);
+				RFIFOSKIP(fd,8);
+				break;
+
+			// captcha code check (not implemented)
+			// R 07e7 <len>.w <aid>.l <code>.b10 <?>.b14
+			case 0x7e7:
+				WFIFOHEAD(fd,5);
+				WFIFOW(fd,0) = 0x7e9;
+				WFIFOW(fd,2) = 5;
+				WFIFOB(fd,4) = 1;
+				WFIFOSET(fd,5);
+				RFIFOSKIP(fd,32);
 			break;
 
-		// captcha code request (not implemented)
-		// R 07e5 <?>.w <aid>.l
-		case 0x7e5:
-			WFIFOHEAD(fd,5);
-			WFIFOW(fd,0) = 0x7e9;
-			WFIFOW(fd,2) = 5;
-			WFIFOB(fd,4) = 1;
-			WFIFOSET(fd,5);
-			RFIFOSKIP(fd,8);
+			// deletion timer request
+			case 0x827:
+				FIFOSD_CHECK(6);
+				char_delete2_req(fd, sd);
+				RFIFOSKIP(fd,6);
 			break;
 
-		// captcha code check (not implemented)
-		// R 07e7 <len>.w <aid>.l <code>.b10 <?>.b14
-		case 0x7e7:
-			WFIFOHEAD(fd,5);
-			WFIFOW(fd,0) = 0x7e9;
-			WFIFOW(fd,2) = 5;
-			WFIFOB(fd,4) = 1;
-			WFIFOSET(fd,5);
-			RFIFOSKIP(fd,32);
-		break;
+			// deletion accept request
+			case 0x829:
+				FIFOSD_CHECK(12);
+				char_delete2_accept(fd, sd);
+				RFIFOSKIP(fd,12);
+			break;
 
-		// deletion timer request
-		case 0x827:
-			FIFOSD_CHECK(6);
-			char_delete2_req(fd, sd);
-			RFIFOSKIP(fd,6);
-		break;
+			// deletion cancel request
+			case 0x82b:
+				FIFOSD_CHECK(6);
+				char_delete2_cancel(fd, sd);
+				RFIFOSKIP(fd,6);
+			break;
 
-		// deletion accept request
-		case 0x829:
-			FIFOSD_CHECK(12);
-			char_delete2_accept(fd, sd);
-			RFIFOSKIP(fd,12);
-		break;
+			// login as map-server
+			case 0x2af8:
+				if (RFIFOREST(fd) < 60)
+					return 0;
+			{
+				char* l_user = (char*)RFIFOP(fd,2);
+				char* l_pass = (char*)RFIFOP(fd,26);
+				l_user[23] = '\0';
+				l_pass[23] = '\0';
+				ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd <= 0 );
+				if( runflag != CHARSERVER_ST_RUNNING ||
+					i == ARRAYLENGTH(server) ||
+					strcmp(l_user, userid) != 0 ||
+					strcmp(l_pass, passwd) != 0 )
+				{
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x2af9;
+					WFIFOB(fd,2) = 3;
+					WFIFOSET(fd,3);
+				} else {
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x2af9;
+					WFIFOB(fd,2) = 0;
+					WFIFOSET(fd,3);
 
-		// deletion cancel request
-		case 0x82b:
-			FIFOSD_CHECK(6);
-			char_delete2_cancel(fd, sd);
-			RFIFOSKIP(fd,6);
-		break;
+					server[i].fd = fd;
+					server[i].ip = ntohl(RFIFOL(fd,54));
+					server[i].port = ntohs(RFIFOW(fd,58));
+					server[i].users = 0;
+					memset(server[i].map, 0, sizeof(server[i].map));
+					session[fd]->func_parse = parse_frommap;
+					session[fd]->flag.server = 1;
+					realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+					char_mapif_init(fd);
+				}
 
-		// login as map-server
-		case 0x2af8:
-			if (RFIFOREST(fd) < 60)
-				return 0;
-		{
-			char* l_user = (char*)RFIFOP(fd,2);
-			char* l_pass = (char*)RFIFOP(fd,26);
-			l_user[23] = '\0';
-			l_pass[23] = '\0';
-			ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd <= 0 );
-			if( runflag != CHARSERVER_ST_RUNNING ||
-				i == ARRAYLENGTH(server) ||
-				strcmp(l_user, userid) != 0 ||
-				strcmp(l_pass, passwd) != 0 )
-			{
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x2af9;
-				WFIFOB(fd,2) = 3;
-				WFIFOSET(fd,3);
-			} else {
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x2af9;
-				WFIFOB(fd,2) = 0;
-				WFIFOSET(fd,3);
-
-				server[i].fd = fd;
-				server[i].ip = ntohl(RFIFOL(fd,54));
-				server[i].port = ntohs(RFIFOW(fd,58));
-				server[i].users = 0;
-				memset(server[i].map, 0, sizeof(server[i].map));
-				session[fd]->func_parse = parse_frommap;
-				session[fd]->flag.server = 1;
-				realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-				char_mapif_init(fd);
+				RFIFOSKIP(fd,60);
 			}
+			return 0; // avoid processing of followup packets here
 
-			RFIFOSKIP(fd,60);
-		}
-		return 0; // avoid processing of followup packets here
-
-		// checks the entered pin
-		case 0x8b8:
-			if( RFIFOREST(fd) < 10 )
-				return 0;
-			
-			if( RFIFOL(fd,2) == sd->account_id )
-				pincode->check( fd, sd );
+			// checks the entered pin
+			case 0x8b8:
+				if( RFIFOREST(fd) < 10 )
+					return 0;
 				
-			RFIFOSKIP(fd,10);
-		break;
+				if( RFIFOL(fd,2) == sd->account_id )
+					pincode->check( fd, sd );
+					
+				RFIFOSKIP(fd,10);
+			break;
+				
+			// request for PIN window
+			case 0x8c5:
+				if( RFIFOREST(fd) < 6 )
+					return 0;
+				if( RFIFOL(fd,2) == sd->account_id )
+					pincode->sendstate( fd, sd, PINCODE_NOTSET );
+							
+				RFIFOSKIP(fd,6);
+			break;
+				
+			// pincode change request
+			case 0x8be:
+				if( RFIFOREST(fd) < 14 )
+					return 0;
+				if( RFIFOL(fd,2) == sd->account_id )
+					pincode->change( fd, sd );
+				
+				RFIFOSKIP(fd,14);
+			break;
+				
+			// activate PIN system and set first PIN
+			case 0x8ba:
+				if( RFIFOREST(fd) < 10 )
+					return 0;
+				if( RFIFOL(fd,2) == sd->account_id )
+					pincode->setnew( fd, sd );
+				RFIFOSKIP(fd,10);
+			break;
 			
-		// request for PIN window
-		case 0x8c5:
-			if( RFIFOREST(fd) < 6 )
-				return 0;
-			if( RFIFOL(fd,2) == sd->account_id )
-				pincode->sendstate( fd, sd, PINCODE_NOTSET );
+			/* 0x8d4 <from>.W <to>.W <unused>.W (2+2+2+2) */
+			case 0x8d4:
+				if( RFIFOREST(fd) < 8 )
+					return 0;
+				else {
+					bool ret;
+					ret = char_slotchange(sd, fd, RFIFOW(fd, 2), RFIFOW(fd, 4));
+					WFIFOHEAD(fd, 8);
+					WFIFOW(fd, 0) = 0x8d5;
+					WFIFOW(fd, 2) = 8;
+					WFIFOW(fd, 4) = ret?0:1;
+					WFIFOW(fd, 6) = 0;/* we enforce it elsewhere, go 0 */
+					WFIFOSET(fd, 8);
+					/* for some stupid reason it requires the char data again (gravity -_-) */
+					if( ret )
+						mmo_char_send006b( fd, sd );
 						
-			RFIFOSKIP(fd,6);
-		break;
-			
-		// pincode change request
-		case 0x8be:
-			if( RFIFOREST(fd) < 14 )
-				return 0;
-			if( RFIFOL(fd,2) == sd->account_id )
-				pincode->change( fd, sd );
-			
-			RFIFOSKIP(fd,14);
-		break;
-			
-		// activate PIN system and set first PIN
-		case 0x8ba:
-			if( RFIFOREST(fd) < 10 )
+					RFIFOSKIP(fd, 8);
+				}
+			break;
+					
+			// unknown packet received
+			default:
+				ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
+				set_eof(fd);
 				return 0;
-			if( RFIFOL(fd,2) == sd->account_id )
-				pincode->setnew( fd, sd );
-			RFIFOSKIP(fd,10);
-		break;
-				
-		// unknown packet received
-		default:
-			ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
-			set_eof(fd);
-			return 0;
-		}
+			}
 	}
 
 	RFIFOFLUSH(fd);