Merge pull request #388 from 4144/charplugins

char server plugins

1 files changed, 2663 insertions, 2057 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 60ef11397..0dd7aaa79 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -16,13 +16,20 @@
 #include <time.h>
 
 #include "HPMchar.h"
+#include "geoip.h"
+#include "int_auction.h"
 #include "int_elemental.h"
 #include "int_guild.h"
 #include "int_homun.h"
+#include "int_mail.h"
 #include "int_mercenary.h"
 #include "int_party.h"
+#include "int_pet.h"
+#include "int_quest.h"
 #include "int_storage.h"
 #include "inter.h"
+#include "loginif.h"
+#include "mapif.h"
 #include "pincode.h"
 #include "../common/HPM.h"
 #include "../common/cbasetypes.h"
@@ -80,11 +87,11 @@ char acc_reg_str_db[32] = "acc_reg_str_db";
 char char_reg_str_db[32] = "char_reg_str_db";
 char char_reg_num_db[32] = "char_reg_num_db";
 
+struct char_interface char_s;
+
 // show loading/saving messages
 int save_log = 1;
 
-static DBMap* char_db_; // int char_id -> struct mmo_charstatus*
-
 char db_path[1024] = "db";
 
 int db_use_sql_item_db;
@@ -100,7 +107,6 @@ struct mmo_map_server {
 	unsigned short maps;
 } server[MAX_MAP_SERVERS];
 
-int char_fd=-1;
 char userid[24];
 char passwd[24];
 char server_name[20];
@@ -130,7 +136,7 @@ int char_del_delay = 86400;
 int log_char = 1;	// logging char or not [devil]
 int log_inter = 1;	// logging inter or not [devil]
 
-int char_aegis_delete = 0; // Verify if char is in guild/party or char and reacts as Aegis does (doesn't allow deletion), see char_delete2_req for more information
+int char_aegis_delete = 0; // Verify if char is in guild/party or char and reacts as Aegis does (doesn't allow deletion), see chr->delete2_req for more information
 
 // Advanced subnet check [LuzZza]
 struct s_subnet {
@@ -172,31 +178,16 @@ unsigned short skillid2idx[MAX_SKILL_ID];
 //-----------------------------------------------------
 #define AUTH_TIMEOUT 30000
 
-struct auth_node {
-	int account_id;
-	int char_id;
-	uint32 login_id1;
-	uint32 login_id2;
-	uint32 ip;
-	int sex;
-	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-	int group_id;
-	unsigned changing_mapservers : 1;
-};
-
-static DBMap* auth_db; // int account_id -> struct auth_node*
+static DBMap* auth_db; // int account_id -> struct char_auth_node*
 
 //-----------------------------------------------------
 // Online User Database
 //-----------------------------------------------------
 
-static int chardb_waiting_disconnect(int tid, int64 tick, int id, intptr_t data);
-int delete_char_sql(int char_id);
-
 /**
  * @see DBCreateData
  */
-static DBData create_online_char_data(DBKey key, va_list args)
+static DBData char_create_online_char_data(DBKey key, va_list args)
 {
 	struct online_char_data* character;
 	CREATE(character, struct online_char_data, 1);
@@ -209,11 +200,27 @@ static DBData create_online_char_data(DBKey key, va_list args)
 	return DB->ptr2data(character);
 }
 
-void set_char_charselect(int account_id)
+void char_set_account_online(int account_id)
+{
+	WFIFOHEAD(chr->login_fd,6);
+	WFIFOW(chr->login_fd,0) = 0x272b;
+	WFIFOL(chr->login_fd,2) = account_id;
+	WFIFOSET(chr->login_fd,6);
+}
+
+void char_set_account_offline(int account_id)
+{
+	WFIFOHEAD(chr->login_fd,6);
+	WFIFOW(chr->login_fd,0) = 0x272c;
+	WFIFOL(chr->login_fd,2) = account_id;
+	WFIFOSET(chr->login_fd,6);
+}
+
+void char_set_char_charselect(int account_id)
 {
 	struct online_char_data* character;
 
-	character = (struct online_char_data*)idb_ensure(online_char_db, account_id, create_online_char_data);
+	character = (struct online_char_data*)idb_ensure(chr->online_char_db, account_id, chr->create_online_char_data);
 
 	if( character->server > -1 )
 		if( server[character->server].users > 0 ) // Prevent this value from going negative.
@@ -225,36 +232,30 @@ void set_char_charselect(int account_id)
 		character->pincode_enable = *pincode->charselect + *pincode->enabled;
 
 	if(character->waiting_disconnect != INVALID_TIMER) {
-		timer->delete(character->waiting_disconnect, chardb_waiting_disconnect);
+		timer->delete(character->waiting_disconnect, chr->waiting_disconnect);
 		character->waiting_disconnect = INVALID_TIMER;
 	}
 
-	if (login_fd > 0 && !session[login_fd]->flag.eof)
-	{
-		WFIFOHEAD(login_fd,6);
-		WFIFOW(login_fd,0) = 0x272b;
-		WFIFOL(login_fd,2) = account_id;
-		WFIFOSET(login_fd,6);
-	}
-
+	if (chr->login_fd > 0 && !session[chr->login_fd]->flag.eof)
+		chr->set_account_online(account_id);
 }
 
-void set_char_online(int map_id, int char_id, int account_id)
+void char_set_char_online(int map_id, int char_id, int account_id)
 {
 	struct online_char_data* character;
 	struct mmo_charstatus *cp;
 
 	//Update DB
-	if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `online`='1' WHERE `char_id`='%d' LIMIT 1", char_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `online`='1' WHERE `char_id`='%d' LIMIT 1", char_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	//Check to see for online conflicts
-	character = (struct online_char_data*)idb_ensure(online_char_db, account_id, create_online_char_data);
+	character = (struct online_char_data*)idb_ensure(chr->online_char_db, account_id, chr->create_online_char_data);
 	if( character->char_id != -1 && character->server > -1 && character->server != map_id )
 	{
-		ShowNotice("set_char_online: Character %d:%d marked in map server %d, but map server %d claims to have (%d:%d) online!\n",
+		ShowNotice("chr->set_char_online: Character %d:%d marked in map server %d, but map server %d claims to have (%d:%d) online!\n",
 			character->account_id, character->char_id, character->server, map_id, account_id, char_id);
-		mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
+		mapif->disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
 	}
 
 	//Update state data
@@ -266,52 +267,47 @@ void set_char_online(int map_id, int char_id, int account_id)
 
 	//Get rid of disconnect timer
 	if(character->waiting_disconnect != INVALID_TIMER) {
-		timer->delete(character->waiting_disconnect, chardb_waiting_disconnect);
+		timer->delete(character->waiting_disconnect, chr->waiting_disconnect);
 		character->waiting_disconnect = INVALID_TIMER;
 	}
 
 	//Set char online in guild cache. If char is in memory, use the guild id on it, otherwise seek it.
-	cp = (struct mmo_charstatus*)idb_get(char_db_,char_id);
-	inter_guild_CharOnline(char_id, cp?cp->guild_id:-1);
+	cp = (struct mmo_charstatus*)idb_get(chr->char_db_,char_id);
+	inter_guild->CharOnline(char_id, cp?cp->guild_id:-1);
 
 	//Notify login server
-	if (login_fd > 0 && !session[login_fd]->flag.eof)
-	{
-		WFIFOHEAD(login_fd,6);
-		WFIFOW(login_fd,0) = 0x272b;
-		WFIFOL(login_fd,2) = account_id;
-		WFIFOSET(login_fd,6);
-	}
+	if (chr->login_fd > 0 && !session[chr->login_fd]->flag.eof)
+		chr->set_account_online(account_id);
 }
 
-void set_char_offline(int char_id, int account_id)
+void char_set_char_offline(int char_id, int account_id)
 {
 	struct online_char_data* character;
 
 	if ( char_id == -1 )
 	{
-		if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `online`='0' WHERE `account_id`='%d'", char_db, account_id) )
-			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `online`='0' WHERE `account_id`='%d'", char_db, account_id) )
+			Sql_ShowDebug(inter->sql_handle);
 	}
 	else
 	{
-		struct mmo_charstatus* cp = (struct mmo_charstatus*)idb_get(char_db_,char_id);
-		inter_guild_CharOffline(char_id, cp?cp->guild_id:-1);
+		struct mmo_charstatus* cp = (struct mmo_charstatus*)idb_get(chr->char_db_,char_id);
+		inter_guild->CharOffline(char_id, cp?cp->guild_id:-1);
 		if (cp)
-			idb_remove(char_db_,char_id);
+			idb_remove(chr->char_db_,char_id);
 
-		if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `online`='0' WHERE `char_id`='%d' LIMIT 1", char_db, char_id) )
-			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `online`='0' WHERE `char_id`='%d' LIMIT 1", char_db, char_id) )
+			Sql_ShowDebug(inter->sql_handle);
 	}
 
-	if ((character = (struct online_char_data*)idb_get(online_char_db, account_id)) != NULL)
+	if ((character = (struct online_char_data*)idb_get(chr->online_char_db, account_id)) != NULL)
 	{	//We don't free yet to avoid aCalloc/aFree spamming during char change. [Skotlex]
 		if( character->server > -1 )
 			if( server[character->server].users > 0 ) // Prevent this value from going negative.
 				server[character->server].users--;
 
 		if(character->waiting_disconnect != INVALID_TIMER){
-			timer->delete(character->waiting_disconnect, chardb_waiting_disconnect);
+			timer->delete(character->waiting_disconnect, chr->waiting_disconnect);
 			character->waiting_disconnect = INVALID_TIMER;
 		}
 
@@ -326,13 +322,8 @@ void set_char_offline(int char_id, int account_id)
 	}
 
 	//Remove char if 1- Set all offline, or 2- character is no longer connected to char-server.
-	if (login_fd > 0 && !session[login_fd]->flag.eof && (char_id == -1 || character == NULL || character->fd == -1))
-	{
-		WFIFOHEAD(login_fd,6);
-		WFIFOW(login_fd,0) = 0x272c;
-		WFIFOL(login_fd,2) = account_id;
-		WFIFOSET(login_fd,6);
-	}
+	if (chr->login_fd > 0 && !session[chr->login_fd]->flag.eof && (char_id == -1 || character == NULL || character->fd == -1))
+		chr->set_account_offline(account_id);
 }
 
 /**
@@ -346,7 +337,7 @@ static int char_db_setoffline(DBKey key, DBData *data, va_list ap)
 		character->char_id = -1;
 		character->server = -1;
 		if(character->waiting_disconnect != INVALID_TIMER){
-			timer->delete(character->waiting_disconnect, chardb_waiting_disconnect);
+			timer->delete(character->waiting_disconnect, chr->waiting_disconnect);
 			character->waiting_disconnect = INVALID_TIMER;
 		}
 	} else if (character->server == server_id)
@@ -367,46 +358,51 @@ static int char_db_kickoffline(DBKey key, DBData *data, va_list ap)
 
 	//Kick out any connected characters, and set them offline as appropriate.
 	if (character->server > -1)
-		mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 1);
+		mapif->disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 1);
 	else if (character->waiting_disconnect == INVALID_TIMER)
-		set_char_offline(character->char_id, character->account_id);
+		chr->set_char_offline(character->char_id, character->account_id);
 	else
 		return 0; // fail
 
 	return 1;
 }
 
-void set_all_offline(int id)
+void char_set_login_all_offline(void)
+{
+	//Tell login-server to also mark all our characters as offline.
+	WFIFOHEAD(chr->login_fd,2);
+	WFIFOW(chr->login_fd,0) = 0x2737;
+	WFIFOSET(chr->login_fd,2);
+}
+
+void char_set_all_offline(int id)
 {
 	if (id < 0)
 		ShowNotice("Sending all users offline.\n");
 	else
 		ShowNotice("Sending users of map-server %d offline.\n",id);
-	online_char_db->foreach(online_char_db,char_db_kickoffline,id);
+	chr->online_char_db->foreach(chr->online_char_db,chr->db_kickoffline,id);
 
-	if (id >= 0 || login_fd <= 0 || session[login_fd]->flag.eof)
+	if (id >= 0 || chr->login_fd <= 0 || session[chr->login_fd]->flag.eof)
 		return;
-	//Tell login-server to also mark all our characters as offline.
-	WFIFOHEAD(login_fd,2);
-	WFIFOW(login_fd,0) = 0x2737;
-	WFIFOSET(login_fd,2);
+	chr->set_login_all_offline();
 }
 
-void set_all_offline_sql(void)
+void char_set_all_offline_sql(void)
 {
 	//Set all players to 'OFFLINE'
-	if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `online` = '0'", char_db) )
-		Sql_ShowDebug(sql_handle);
-	if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `online` = '0'", guild_member_db) )
-		Sql_ShowDebug(sql_handle);
-	if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `connect_member` = '0'", guild_db) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `online` = '0'", char_db) )
+		Sql_ShowDebug(inter->sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `online` = '0'", guild_member_db) )
+		Sql_ShowDebug(inter->sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `connect_member` = '0'", guild_db) )
+		Sql_ShowDebug(inter->sql_handle);
 }
 
 /**
  * @see DBCreateData
  */
-static DBData create_charstatus(DBKey key, va_list args)
+static DBData char_create_charstatus(DBKey key, va_list args)
 {
 	struct mmo_charstatus *cp;
 	cp = (struct mmo_charstatus *) aCalloc(1,sizeof(struct mmo_charstatus));
@@ -414,9 +410,7 @@ static DBData create_charstatus(DBKey key, va_list args)
 	return DB->ptr2data(cp);
 }
 
-int inventory_to_sql(const struct item items[], int max, int id);
-
-int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
+int char_mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 {
 	int i = 0;
 	int count = 0;
@@ -428,14 +422,14 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 
 	if (char_id!=p->char_id) return 0;
 
-	cp = idb_ensure(char_db_, char_id, create_charstatus);
+	cp = idb_ensure(chr->char_db_, char_id, chr->create_charstatus);
 
 	StrBuf->Init(&buf);
 	memset(save_status, 0, sizeof(save_status));
 
 	//map inventory data
 	if( memcmp(p->inventory, cp->inventory, sizeof(p->inventory)) ) {
-		if (!inventory_to_sql(p->inventory, MAX_INVENTORY, p->char_id))
+		if (!chr->inventory_to_sql(p->inventory, MAX_INVENTORY, p->char_id))
 			strcat(save_status, " inventory");
 		else
 			errors++;
@@ -443,7 +437,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 
 	//map cart data
 	if( memcmp(p->cart, cp->cart, sizeof(p->cart)) ) {
-		if (!memitemdata_to_sql(p->cart, MAX_CART, p->char_id, TABLE_CART))
+		if (!chr->memitemdata_to_sql(p->cart, MAX_CART, p->char_id, TABLE_CART))
 			strcat(save_status, " cart");
 		else
 			errors++;
@@ -451,7 +445,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 
 	//map storage data
 	if( memcmp(p->storage.items, cp->storage.items, sizeof(p->storage.items)) ) {
-		if (!memitemdata_to_sql(p->storage.items, MAX_STORAGE, p->account_id, TABLE_STORAGE))
+		if (!chr->memitemdata_to_sql(p->storage.items, MAX_STORAGE, p->account_id, TABLE_STORAGE))
 			strcat(save_status, " storage");
 		else
 			errors++;
@@ -484,7 +478,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		if( p->show_equip )
 			opt |= OPT_SHOW_EQUIP;
 		
-		if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `base_level`='%d', `job_level`='%d',"
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `base_level`='%d', `job_level`='%d',"
 			"`base_exp`='%u', `job_exp`='%u', `zeny`='%d',"
 			"`max_hp`='%d',`hp`='%d',`max_sp`='%d',`sp`='%d',`status_point`='%d',`skill_point`='%d',"
 			"`str`='%d',`agi`='%d',`vit`='%d',`int`='%d',`dex`='%d',`luk`='%d',"
@@ -505,15 +499,15 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 			p->robe,p->slotchange,opt,p->font,p->uniqueitem_counter,
 			p->account_id, p->char_id) )
 		{
-			Sql_ShowDebug(sql_handle);
+			Sql_ShowDebug(inter->sql_handle);
 			errors++;
 		} else
 			strcat(save_status, " status");
 	}
 	
 	if( p->bank_vault != cp->bank_vault || p->mod_exp != cp->mod_exp || p->mod_drop != cp->mod_drop || p->mod_death != cp->mod_death ) {
-		if( SQL_ERROR == SQL->Query(sql_handle, "REPLACE INTO `%s` (`account_id`,`bank_vault`,`base_exp`,`base_drop`,`base_death`) VALUES ('%d','%d','%d','%d','%d')",account_data_db,p->account_id,p->bank_vault,p->mod_exp,p->mod_drop,p->mod_death) ) {
-			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "REPLACE INTO `%s` (`account_id`,`bank_vault`,`base_exp`,`base_drop`,`base_death`) VALUES ('%d','%d','%d','%d','%d')",account_data_db,p->account_id,p->bank_vault,p->mod_exp,p->mod_drop,p->mod_death) ) {
+			Sql_ShowDebug(inter->sql_handle);
 			errors++;
 		} else
 			strcat(save_status, " accdata");
@@ -529,7 +523,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		(p->fame != cp->fame)
 	)
 	{
-		if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `class`='%d',"
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `class`='%d',"
 			"`hair`='%d',`hair_color`='%d',`clothes_color`='%d',"
 			"`partner_id`='%d', `father`='%d', `mother`='%d', `child`='%d',"
 			"`karma`='%d',`manner`='%d', `fame`='%d'"
@@ -540,7 +534,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 			p->karma, p->manner, p->fame,
 			p->account_id, p->char_id) )
 		{
-			Sql_ShowDebug(sql_handle);
+			Sql_ShowDebug(inter->sql_handle);
 			errors++;
 		} else
 			strcat(save_status, " status2");
@@ -552,7 +546,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		(p->spear_calls != cp->spear_calls) || (p->spear_faith != cp->spear_faith) ||
 		(p->sword_calls != cp->sword_calls) || (p->sword_faith != cp->sword_faith) )
 	{
-		if (mercenary_owner_tosql(char_id, p))
+		if (inter_mercenary->owner_tosql(char_id, p))
 			strcat(save_status, " mercenary");
 		else
 			errors++;
@@ -564,9 +558,9 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		char esc_mapname[NAME_LENGTH*2+1];
 
 		//`memo` (`memo_id`,`char_id`,`map`,`x`,`y`)
-		if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", memo_db, p->char_id) )
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", memo_db, p->char_id) )
 		{
-			Sql_ShowDebug(sql_handle);
+			Sql_ShowDebug(inter->sql_handle);
 			errors++;
 		}
 
@@ -579,16 +573,16 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 			{
 				if( count )
 					StrBuf->AppendStr(&buf, ",");
-				SQL->EscapeString(sql_handle, esc_mapname, mapindex_id2name(p->memo_point[i].map));
+				SQL->EscapeString(inter->sql_handle, esc_mapname, mapindex_id2name(p->memo_point[i].map));
 				StrBuf->Printf(&buf, "('%d', '%s', '%d', '%d')", char_id, esc_mapname, p->memo_point[i].x, p->memo_point[i].y);
 				++count;
 			}
 		}
 		if( count )
 		{
-			if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
+			if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) )
 			{
-				Sql_ShowDebug(sql_handle);
+				Sql_ShowDebug(inter->sql_handle);
 				errors++;
 			}
 		}
@@ -598,8 +592,8 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 	//skills
 	if( memcmp(p->skill, cp->skill, sizeof(p->skill)) ) {
 		//`skill` (`char_id`, `id`, `lv`)
-		if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", skill_db, p->char_id) ) {
-			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", skill_db, p->char_id) ) {
+			Sql_ShowDebug(inter->sql_handle);
 			errors++;
 		}
 
@@ -623,9 +617,9 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		}
 		if( count )
 		{
-			if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
+			if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) )
 			{
-				Sql_ShowDebug(sql_handle);
+				Sql_ShowDebug(inter->sql_handle);
 				errors++;
 			}
 		}
@@ -644,9 +638,9 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 
 	if(diff == 1)
 	{	//Save friends
-		if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", friend_db, char_id) )
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", friend_db, char_id) )
 		{
-			Sql_ShowDebug(sql_handle);
+			Sql_ShowDebug(inter->sql_handle);
 			errors++;
 		}
 
@@ -664,9 +658,9 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		}
 		if( count )
 		{
-			if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
+			if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) )
 			{
-				Sql_ShowDebug(sql_handle);
+				Sql_ShowDebug(inter->sql_handle);
 				errors++;
 			}
 		}
@@ -688,9 +682,9 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		}
 	}
 	if(diff) {
-		if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
+		if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) )
 		{
-			Sql_ShowDebug(sql_handle);
+			Sql_ShowDebug(inter->sql_handle);
 			errors++;
 		} else
 			strcat(save_status, " hotkeys");
@@ -706,7 +700,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 }
 
 /// Saves an array of 'item' entries into the specified table.
-int memitemdata_to_sql(const struct item items[], int max, int id, int tableswitch)
+int char_memitemdata_to_sql(const struct item items[], int max, int id, int tableswitch)
 {
 	StringBuf buf;
 	SqlStmt* stmt;
@@ -741,7 +735,7 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 		StrBuf->Printf(&buf, ", `card%d`", j);
 	StrBuf->Printf(&buf, " FROM `%s` WHERE `%s`='%d'", tablename, selectoption, id);
 
-	stmt = SQL->StmtMalloc(sql_handle);
+	stmt = SQL->StmtMalloc(inter->sql_handle);
 	if( SQL_ERROR == SQL->StmtPrepareStr(stmt, StrBuf->Value(&buf))
 	||  SQL_ERROR == SQL->StmtExecute(stmt) )
 	{
@@ -802,9 +796,9 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 						StrBuf->Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
  					StrBuf->Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
 
-					if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
+					if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) )
 					{
-						Sql_ShowDebug(sql_handle);
+						Sql_ShowDebug(inter->sql_handle);
 						errors++;
 					}
 				}
@@ -815,9 +809,9 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 		}
 		if( !found )
 		{// Item not present in inventory, remove it.
-			if( SQL_ERROR == SQL->Query(sql_handle, "DELETE from `%s` where `id`='%d' LIMIT 1", tablename, item.id) )
+			if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE from `%s` where `id`='%d' LIMIT 1", tablename, item.id) )
 			{
-				Sql_ShowDebug(sql_handle);
+				Sql_ShowDebug(inter->sql_handle);
 				errors++;
 			}
 		}
@@ -850,9 +844,9 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 		StrBuf->AppendStr(&buf, ")");
 	}
 
-	if( found && SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
+	if( found && SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) )
 	{
-		Sql_ShowDebug(sql_handle);
+		Sql_ShowDebug(inter->sql_handle);
 		errors++;
 	}
 
@@ -861,9 +855,9 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 
 	return errors;
 }
-/* pretty much a copy of memitemdata_to_sql except it handles inventory_db exclusively,
+/* pretty much a copy of chr->memitemdata_to_sql except it handles inventory_db exclusively,
  * - this is required because inventory db is the only one with the 'favorite' column. */
-int inventory_to_sql(const struct item items[], int max, int id) {
+int char_inventory_to_sql(const struct item items[], int max, int id) {
 	StringBuf buf;
 	SqlStmt* stmt;
 	int i;
@@ -885,7 +879,7 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 		StrBuf->Printf(&buf, ", `card%d`", j);
 	StrBuf->Printf(&buf, " FROM `%s` WHERE `char_id`='%d'", inventory_db, id);
 
-	stmt = SQL->StmtMalloc(sql_handle);
+	stmt = SQL->StmtMalloc(inter->sql_handle);
 	if( SQL_ERROR == SQL->StmtPrepareStr(stmt, StrBuf->Value(&buf))
 	   ||  SQL_ERROR == SQL->StmtExecute(stmt) )
 	{
@@ -945,8 +939,8 @@ int inventory_to_sql(const struct item items[], int max, int id) {
  						StrBuf->Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
 					StrBuf->Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
 
-					if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) ) {
-						Sql_ShowDebug(sql_handle);
+					if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) ) {
+						Sql_ShowDebug(inter->sql_handle);
 						errors++;
 					}
 				}
@@ -956,8 +950,8 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 			}
 		}
 		if( !found ) {// Item not present in inventory, remove it.
-			if( SQL_ERROR == SQL->Query(sql_handle, "DELETE from `%s` where `id`='%d' LIMIT 1", inventory_db, item.id) ) {
-				Sql_ShowDebug(sql_handle);
+			if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE from `%s` where `id`='%d' LIMIT 1", inventory_db, item.id) ) {
+				Sql_ShowDebug(inter->sql_handle);
 				errors++;
 			}
 		}
@@ -989,8 +983,8 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 		StrBuf->AppendStr(&buf, ")");
 	}
 
-	if( found && SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) ) {
-		Sql_ShowDebug(sql_handle);
+	if( found && SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) ) {
+		Sql_ShowDebug(inter->sql_handle);
 		errors++;
 	}
 
@@ -1000,12 +994,9 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 	return errors;
 }
 
-
-int mmo_char_tobuf(uint8* buf, struct mmo_charstatus* p);
-
 //=====================================================================================================
 // Loads the basic character rooster for the given account. Returns total buffer used.
-int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
+int char_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 {
 	SqlStmt* stmt;
 	struct mmo_charstatus p;
@@ -1014,7 +1005,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	time_t unban_time = 0;
 	char sex[2];
 
-	stmt = SQL->StmtMalloc(sql_handle);
+	stmt = SQL->StmtMalloc(inter->sql_handle);
 	if( stmt == NULL ) {
 		SqlStmt_ShowDebug(stmt);
 		return 0;
@@ -1097,7 +1088,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 				p.sex = 99;
 				break;
 		}
-		j += mmo_char_tobuf(WBUFP(buf, j), &p);
+		j += chr->mmo_char_tobuf(WBUFP(buf, j), &p);
 	}
 	
 	memset(sd->new_name,0,sizeof(sd->new_name));
@@ -1107,7 +1098,7 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 }
 
 //=====================================================================================================
-int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything)
+int char_mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything)
 {
 	int i,j;
 	char t_msg[128] = "";
@@ -1133,7 +1124,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 
 	if (save_log) ShowInfo("Char load request (%d)\n", char_id);
 
-	stmt = SQL->StmtMalloc(sql_handle);
+	stmt = SQL->StmtMalloc(inter->sql_handle);
 	if( stmt == NULL )
 	{
 		SqlStmt_ShowDebug(stmt);
@@ -1341,7 +1332,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	strcat(t_msg, " cart");
 
 	//read storage
-	storage_fromsql(p->account_id, &p->storage);
+	inter_storage->fromsql(p->account_id, &p->storage);
 	strcat(t_msg, " storage");
 
 	//read skill
@@ -1362,7 +1353,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 		if( skillid2idx[tmp_skill.id] )
 			memcpy(&p->skill[skillid2idx[tmp_skill.id]], &tmp_skill, sizeof(tmp_skill));
 		else
-			ShowWarning("mmo_char_fromsql: ignoring invalid skill (id=%u,lv=%u) of character %s (AID=%d,CID=%d)\n", tmp_skill.id, tmp_skill.lv, p->name, p->account_id, p->char_id);
+			ShowWarning("chr->mmo_char_fromsql: ignoring invalid skill (id=%u,lv=%u) of character %s (AID=%d,CID=%d)\n", tmp_skill.id, tmp_skill.lv, p->name, p->account_id, p->char_id);
 	}
 	strcat(t_msg, " skills");
 
@@ -1399,13 +1390,13 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 		if( hotkey_num >= 0 && hotkey_num < MAX_HOTKEYS )
 			memcpy(&p->hotkeys[hotkey_num], &tmp_hotkey, sizeof(tmp_hotkey));
 		else
-			ShowWarning("mmo_char_fromsql: ignoring invalid hotkey (hotkey=%d,type=%u,id=%u,lv=%u) of character %s (AID=%d,CID=%d)\n", hotkey_num, tmp_hotkey.type, tmp_hotkey.id, tmp_hotkey.lv, p->name, p->account_id, p->char_id);
+			ShowWarning("chr->mmo_char_fromsql: ignoring invalid hotkey (hotkey=%d,type=%u,id=%u,lv=%u) of character %s (AID=%d,CID=%d)\n", hotkey_num, tmp_hotkey.type, tmp_hotkey.id, tmp_hotkey.lv, p->name, p->account_id, p->char_id);
 	}
 	strcat(t_msg, " hotkeys");
 #endif
 
 	/* Mercenary Owner DataBase */
-	mercenary_owner_fromsql(char_id, p);
+	inter_mercenary->owner_fromsql(char_id, p);
 	strcat(t_msg, " mercenary");
 
 	/* default */
@@ -1434,15 +1425,15 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	if( opt & OPT_SHOW_EQUIP )
 		p->show_equip = true;
 	
-	cp = idb_ensure(char_db_, char_id, create_charstatus);
+	cp = idb_ensure(chr->char_db_, char_id, chr->create_charstatus);
 	memcpy(cp, p, sizeof(struct mmo_charstatus));
 	return 1;
 }
 
 //==========================================================================================================
-int mmo_char_sql_init(void)
+int char_mmo_char_sql_init(void)
 {
-	char_db_= idb_alloc(DB_OPT_RELEASE_DATA);
+	chr->char_db_= idb_alloc(DB_OPT_RELEASE_DATA);
 
 	//the 'set offline' part is now in check_login_conn ...
 	//if the server connects to loginserver
@@ -1451,19 +1442,20 @@ int mmo_char_sql_init(void)
 
 	// Force all users offline in sql when starting char-server
 	// (useful when servers crashes and don't clean the database)
-	set_all_offline_sql();
+	chr->set_all_offline_sql();
 
 	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) {
+bool char_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.
+	if( !chr->mmo_char_fromsql(sd->found_char[from], &char_dat, false) ) // Only the short data is needed.
 		return false;
 
 	if( char_dat.slotchange == 0 )
@@ -1474,30 +1466,30 @@ bool char_slotchange(struct char_session_data *sd, int fd, unsigned short 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);
+		if( SQL_SUCCESS != SQL->QueryStr(inter->sql_handle, "START TRANSACTION")
+		   ||  SQL_SUCCESS != SQL->Query(inter->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(inter->sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d' LIMIT 1", char_db, to, sd->found_char[from]) )
+			Sql_ShowDebug(inter->sql_handle);
 		else
 			result = true;
 		
-		if( SQL_ERROR == SQL->QueryStr(sql_handle, (result == true) ? "COMMIT" : "ROLLBACK") ) {
-			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, (result == true) ? "COMMIT" : "ROLLBACK") ) {
+			Sql_ShowDebug(inter->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);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d' LIMIT 1", char_db, to, sd->found_char[from] ) ) {
+			Sql_ShowDebug(inter->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);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `slotchange`=`slotchange`-1 WHERE `char_id`='%d' LIMIT 1", char_db, from_id ) ) {
+		Sql_ShowDebug(inter->sql_handle);
 		return false;
 	}
 	
@@ -1507,7 +1499,7 @@ bool char_slotchange(struct char_session_data *sd, int fd, unsigned short from,
 //-----------------------------------
 // Function to change character's names
 //-----------------------------------
-int rename_char_sql(struct char_session_data *sd, int char_id)
+int char_rename_char_sql(struct char_session_data *sd, int char_id)
 {
 	struct mmo_charstatus char_dat;
 	char esc_name[NAME_LENGTH*2+1];
@@ -1515,30 +1507,30 @@ int rename_char_sql(struct char_session_data *sd, int char_id)
 	if( sd->new_name[0] == 0 ) // Not ready for rename
 		return 2;
 
-	if( !mmo_char_fromsql(char_id, &char_dat, false) ) // Only the short data is needed.
+	if( !chr->mmo_char_fromsql(char_id, &char_dat, false) ) // Only the short data is needed.
 		return 2;
 
 	if( char_dat.rename == 0 )
 		return 1;
 
-	SQL->EscapeStringLen(sql_handle, esc_name, sd->new_name, strnlen(sd->new_name, NAME_LENGTH));
+	SQL->EscapeStringLen(inter->sql_handle, esc_name, sd->new_name, strnlen(sd->new_name, NAME_LENGTH));
 
 	// check if the char exist
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT 1 FROM `%s` WHERE `name` LIKE '%s' LIMIT 1", char_db, esc_name) )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT 1 FROM `%s` WHERE `name` LIKE '%s' LIMIT 1", char_db, esc_name) )
 	{
-		Sql_ShowDebug(sql_handle);
+		Sql_ShowDebug(inter->sql_handle);
 		return 4;
 	}
 
-	if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `name` = '%s', `rename` = '%d' WHERE `char_id` = '%d'", char_db, esc_name, --char_dat.rename, char_id) )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `name` = '%s', `rename` = '%d' WHERE `char_id` = '%d'", char_db, esc_name, --char_dat.rename, char_id) )
 	{
-		Sql_ShowDebug(sql_handle);
+		Sql_ShowDebug(inter->sql_handle);
 		return 3;
 	}
 
 	// Change character's name into guild_db.
 	if( char_dat.guild_id )
-		inter_guild_charname_changed(char_dat.guild_id, sd->account_id, char_id, sd->new_name);
+		inter_guild->charname_changed(char_dat.guild_id, sd->account_id, char_id, sd->new_name);
 
 	safestrncpy(char_dat.name, sd->new_name, NAME_LENGTH);
 	memset(sd->new_name,0,sizeof(sd->new_name));
@@ -1546,17 +1538,17 @@ int rename_char_sql(struct char_session_data *sd, int char_id)
 	// log change
 	if( log_char )
 	{
-		if( SQL_ERROR == SQL->Query(sql_handle,
+		if( SQL_ERROR == SQL->Query(inter->sql_handle,
 			"INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
 			"VALUES (NOW(), '%s', '%d', '%d', '%d', '%s', '0', '0', '0', '0', '0', '0', '0', '0')",
 			charlog_db, "change char name", sd->account_id, char_dat.char_id, char_dat.slot, esc_name) )
-			Sql_ShowDebug(sql_handle);
+			Sql_ShowDebug(inter->sql_handle);
 	}
 
 	return 0;
 }
 
-int check_char_name(char * name, char * esc_name)
+int char_check_char_name(char * name, char * esc_name)
 {
 	int i;
 
@@ -1591,17 +1583,17 @@ int check_char_name(char * name, char * esc_name)
 				return -5;
 	}
 	if( name_ignoring_case ) {
-		if( SQL_ERROR == SQL->Query(sql_handle, "SELECT 1 FROM `%s` WHERE BINARY `name` = '%s' LIMIT 1", char_db, esc_name) ) {
-			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT 1 FROM `%s` WHERE BINARY `name` = '%s' LIMIT 1", char_db, esc_name) ) {
+			Sql_ShowDebug(inter->sql_handle);
 			return -2;
 		}
 	} else {
-		if( SQL_ERROR == SQL->Query(sql_handle, "SELECT 1 FROM `%s` WHERE `name` = '%s' LIMIT 1", char_db, esc_name) ) {
-			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT 1 FROM `%s` WHERE `name` = '%s' LIMIT 1", char_db, esc_name) ) {
+			Sql_ShowDebug(inter->sql_handle);
 			return -2;
 		}
 	}
-	if( SQL->NumRows(sql_handle) > 0 )
+	if( SQL->NumRows(inter->sql_handle) > 0 )
 		return -1; // name already exists
 
 	return 0;
@@ -1617,22 +1609,16 @@ int check_char_name(char * name, char * esc_name)
  *  -5: 'Symbols in Character Names are forbidden'
  *  char_id: Success
  **/
-#if PACKETVER >= 20120307
-int make_new_char_sql(struct char_session_data* sd, char* name_, int slot, int hair_color, int hair_style) {
-	int str = 1, agi = 1, vit = 1, int_ = 1, dex = 1, luk = 1;
-#else
-int make_new_char_sql(struct char_session_data* sd, char* name_, int str, int agi, int vit, int int_, int dex, int luk, int slot, int hair_color, int hair_style) {
-#endif
-
+int char_make_new_char_sql(struct char_session_data* sd, char* name_, int str, int agi, int vit, int int_, int dex, int luk, int slot, int hair_color, int hair_style) {
 	char name[NAME_LENGTH];
 	char esc_name[NAME_LENGTH*2+1];
 	int char_id, flag, k, l;
 
 	safestrncpy(name, name_, NAME_LENGTH);
 	normalize_name(name,TRIM_CHARS);
-	SQL->EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+	SQL->EscapeStringLen(inter->sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
 
-	flag = check_char_name(name,esc_name);
+	flag = chr->check_char_name(name,esc_name);
 	if( flag < 0 )
 		return flag;
 	
@@ -1657,41 +1643,41 @@ int make_new_char_sql(struct char_session_data* sd, char* name_, int str, int ag
 
 #if PACKETVER >= 20120307
 	//Insert the new char entry to the database
-	if( SQL_ERROR == SQL->Query(sql_handle, "INSERT INTO `%s` (`account_id`, `char_num`, `name`, `zeny`, `status_point`,`str`, `agi`, `vit`, `int`, `dex`, `luk`, `max_hp`, `hp`,"
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "INSERT INTO `%s` (`account_id`, `char_num`, `name`, `zeny`, `status_point`,`str`, `agi`, `vit`, `int`, `dex`, `luk`, `max_hp`, `hp`,"
 		"`max_sp`, `sp`, `hair`, `hair_color`, `last_map`, `last_x`, `last_y`, `save_map`, `save_x`, `save_y`) VALUES ("
 		"'%d', '%d', '%s', '%d',  '%d','%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d','%d', '%d','%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d')",
 		char_db, sd->account_id , slot, esc_name, start_zeny, 48, str, agi, vit, int_, dex, luk,
 		(40 * (100 + vit)/100) , (40 * (100 + vit)/100 ),  (11 * (100 + int_)/100), (11 * (100 + int_)/100), hair_style, hair_color,
 		mapindex_id2name(start_point.map), start_point.x, start_point.y, mapindex_id2name(start_point.map), start_point.x, start_point.y) )
 	{
-		Sql_ShowDebug(sql_handle);
+		Sql_ShowDebug(inter->sql_handle);
 		return -2; //No, stop the procedure!
 	}
 #else
 	//Insert the new char entry to the database
-	if( SQL_ERROR == SQL->Query(sql_handle, "INSERT INTO `%s` (`account_id`, `char_num`, `name`, `zeny`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `max_hp`, `hp`,"
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "INSERT INTO `%s` (`account_id`, `char_num`, `name`, `zeny`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `max_hp`, `hp`,"
 							   "`max_sp`, `sp`, `hair`, `hair_color`, `last_map`, `last_x`, `last_y`, `save_map`, `save_x`, `save_y`) VALUES ("
 							   "'%d', '%d', '%s', '%d',  '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d','%d', '%d','%d', '%d', '%s', '%d', '%d', '%s', '%d', '%d')",
 							   char_db, sd->account_id , slot, esc_name, start_zeny, str, agi, vit, int_, dex, luk,
 							   (40 * (100 + vit)/100) , (40 * (100 + vit)/100 ),  (11 * (100 + int_)/100), (11 * (100 + int_)/100), hair_style, hair_color,
 							   mapindex_id2name(start_point.map), start_point.x, start_point.y, mapindex_id2name(start_point.map), start_point.x, start_point.y) )
 	{
-		Sql_ShowDebug(sql_handle);
+		Sql_ShowDebug(inter->sql_handle);
 		return -2; //No, stop the procedure!
 	}
 #endif
 	//Retrieve the newly auto-generated char id
-	char_id = (int)SQL->LastInsertId(sql_handle);
+	char_id = (int)SQL->LastInsertId(inter->sql_handle);
 
 	if( !char_id )
 		return -2;
 
 	// Validation success, log result
 	if (log_char) {
-		if( SQL_ERROR == SQL->Query(sql_handle, "INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
 			"VALUES (NOW(), '%s', '%d', '%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
 			charlog_db, "make new char", sd->account_id, char_id, slot, esc_name, str, agi, vit, int_, dex, luk, hair_style, hair_color) )
-			Sql_ShowDebug(sql_handle);
+			Sql_ShowDebug(inter->sql_handle);
 	}
 
 	//Give the char the default items
@@ -1699,21 +1685,21 @@ int make_new_char_sql(struct char_session_data* sd, char* name_, int str, int ag
 		// FIXME: How to define if an item is stackable without having to lookup itemdb? [panikon]
 		if( start_items[k+2] == 1 )
 		{
-			if( SQL_ERROR == SQL->Query(sql_handle,
+			if( SQL_ERROR == SQL->Query(inter->sql_handle,
 				"INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')",
 				inventory_db, char_id, start_items[k], start_items[k + 1], 1) )
-					Sql_ShowDebug(sql_handle);
+					Sql_ShowDebug(inter->sql_handle);
 		}
 		else if( start_items[k+2] == 0 )
 		{
 			// Non-stackable items should have their own entries (issue: 7279)
 			for( l = 0; l < start_items[k+1]; l++ )
 			{
-				if( SQL_ERROR == SQL->Query(sql_handle,
+				if( SQL_ERROR == SQL->Query(inter->sql_handle,
 					"INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')",
 					inventory_db, char_id, start_items[k], 1, 1)
 					)
-					Sql_ShowDebug(sql_handle);
+					Sql_ShowDebug(inter->sql_handle);
 			}
 		}
 	}
@@ -1725,19 +1711,19 @@ int make_new_char_sql(struct char_session_data* sd, char* name_, int str, int ag
 /*----------------------------------------------------------------------------------------------------------*/
 /* Divorce Players */
 /*----------------------------------------------------------------------------------------------------------*/
-int divorce_char_sql(int partner_id1, int partner_id2)
+int char_divorce_char_sql(int partner_id1, int partner_id2)
 {
 	unsigned char buf[64];
 
-	if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `partner_id`='0' WHERE `char_id`='%d' OR `char_id`='%d' LIMIT 2", char_db, partner_id1, partner_id2) )
-		Sql_ShowDebug(sql_handle);
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE (`nameid`='%d' OR `nameid`='%d') AND (`char_id`='%d' OR `char_id`='%d') LIMIT 2", inventory_db, WEDDING_RING_M, WEDDING_RING_F, partner_id1, partner_id2) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `partner_id`='0' WHERE `char_id`='%d' OR `char_id`='%d' LIMIT 2", char_db, partner_id1, partner_id2) )
+		Sql_ShowDebug(inter->sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE (`nameid`='%d' OR `nameid`='%d') AND (`char_id`='%d' OR `char_id`='%d') LIMIT 2", inventory_db, WEDDING_RING_M, WEDDING_RING_F, partner_id1, partner_id2) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	WBUFW(buf,0) = 0x2b12;
 	WBUFL(buf,2) = partner_id1;
 	WBUFL(buf,6) = partner_id2;
-	mapif_sendall(buf,10);
+	mapif->sendall(buf,10);
 
 	return 0;
 }
@@ -1748,7 +1734,7 @@ int divorce_char_sql(int partner_id1, int partner_id2)
 /* Returns 0 if successful
  * Returns < 0 for error
  */
-int delete_char_sql(int char_id)
+int char_delete_char_sql(int char_id)
 {
 	char name[NAME_LENGTH];
 	char esc_name[NAME_LENGTH*2+1]; //Name needs be escaped.
@@ -1756,30 +1742,30 @@ int delete_char_sql(int char_id)
 	char *data;
 	size_t len;
 
-	if (SQL_ERROR == SQL->Query(sql_handle, "SELECT `name`,`account_id`,`party_id`,`guild_id`,`base_level`,`homun_id`,`partner_id`,`father`,`mother`,`elemental_id` FROM `%s` WHERE `char_id`='%d'", char_db, char_id))
-		Sql_ShowDebug(sql_handle);
+	if (SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `name`,`account_id`,`party_id`,`guild_id`,`base_level`,`homun_id`,`partner_id`,`father`,`mother`,`elemental_id` FROM `%s` WHERE `char_id`='%d'", char_db, char_id))
+		Sql_ShowDebug(inter->sql_handle);
 
-	if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
+	if( SQL_SUCCESS != SQL->NextRow(inter->sql_handle) )
 	{
-		ShowError("delete_char_sql: Unable to fetch character data, deletion aborted.\n");
-		SQL->FreeResult(sql_handle);
+		ShowError("chr->delete_char_sql: Unable to fetch character data, deletion aborted.\n");
+		SQL->FreeResult(inter->sql_handle);
 		return -1;
 	}
 
-	SQL->GetData(sql_handle, 0, &data, &len); safestrncpy(name, data, NAME_LENGTH);
-	SQL->GetData(sql_handle, 1, &data, NULL); account_id = atoi(data);
-	SQL->GetData(sql_handle, 2, &data, NULL); party_id = atoi(data);
-	SQL->GetData(sql_handle, 3, &data, NULL); guild_id = atoi(data);
-	SQL->GetData(sql_handle, 4, &data, NULL); base_level = atoi(data);
-	SQL->GetData(sql_handle, 5, &data, NULL); hom_id = atoi(data);
-	SQL->GetData(sql_handle, 6, &data, NULL); partner_id = atoi(data);
-	SQL->GetData(sql_handle, 7, &data, NULL); father_id = atoi(data);
-	SQL->GetData(sql_handle, 8, &data, NULL); mother_id = atoi(data);
-	SQL->GetData(sql_handle, 9, &data, NULL);
+	SQL->GetData(inter->sql_handle, 0, &data, &len); safestrncpy(name, data, NAME_LENGTH);
+	SQL->GetData(inter->sql_handle, 1, &data, NULL); account_id = atoi(data);
+	SQL->GetData(inter->sql_handle, 2, &data, NULL); party_id = atoi(data);
+	SQL->GetData(inter->sql_handle, 3, &data, NULL); guild_id = atoi(data);
+	SQL->GetData(inter->sql_handle, 4, &data, NULL); base_level = atoi(data);
+	SQL->GetData(inter->sql_handle, 5, &data, NULL); hom_id = atoi(data);
+	SQL->GetData(inter->sql_handle, 6, &data, NULL); partner_id = atoi(data);
+	SQL->GetData(inter->sql_handle, 7, &data, NULL); father_id = atoi(data);
+	SQL->GetData(inter->sql_handle, 8, &data, NULL); mother_id = atoi(data);
+	SQL->GetData(inter->sql_handle, 9, &data, NULL);
 	elemental_id = atoi(data);
 
-	SQL->EscapeStringLen(sql_handle, esc_name, name, min(len, NAME_LENGTH));
-	SQL->FreeResult(sql_handle);
+	SQL->EscapeStringLen(inter->sql_handle, esc_name, name, min(len, NAME_LENGTH));
+	SQL->FreeResult(inter->sql_handle);
 
 	//check for config char del condition [Lupus]
 	// TODO: Move this out to packet processing (0x68/0x1fb).
@@ -1792,128 +1778,128 @@ int delete_char_sql(int char_id)
 
 	/* Divorce [Wizputer] */
 	if( partner_id )
-		divorce_char_sql(char_id, partner_id);
+		chr->divorce_char_sql(char_id, partner_id);
 
 	/* De-addopt [Zephyrus] */
 	if( father_id || mother_id )
 	{ // Char is Baby
 		unsigned char buf[64];
 
-		if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `child`='0' WHERE `char_id`='%d' OR `char_id`='%d'", char_db, father_id, mother_id) )
-			Sql_ShowDebug(sql_handle);
-		if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '410'AND (`char_id`='%d' OR `char_id`='%d')", skill_db, father_id, mother_id) )
-			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `child`='0' WHERE `char_id`='%d' OR `char_id`='%d'", char_db, father_id, mother_id) )
+			Sql_ShowDebug(inter->sql_handle);
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `id` = '410'AND (`char_id`='%d' OR `char_id`='%d')", skill_db, father_id, mother_id) )
+			Sql_ShowDebug(inter->sql_handle);
 
 		WBUFW(buf,0) = 0x2b25;
 		WBUFL(buf,2) = father_id;
 		WBUFL(buf,6) = mother_id;
 		WBUFL(buf,10) = char_id; // Baby
-		mapif_sendall(buf,14);
+		mapif->sendall(buf,14);
 	}
 
 	//Make the character leave the party [Skotlex]
 	if (party_id)
-		inter_party_leave(party_id, account_id, char_id);
+		inter_party->leave(party_id, account_id, char_id);
 
 	/* delete char's pet */
 	//Delete the hatched pet if you have one...
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d' AND `incubate` = '0'", pet_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d' AND `incubate` = '0'", pet_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	//Delete all pets that are stored in eggs (inventory + cart)
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` USING `%s` JOIN `%s` ON `pet_id` = `card1`|`card2`<<16 WHERE `%s`.char_id = '%d' AND card0 = -256", pet_db, pet_db, inventory_db, inventory_db, char_id) )
-		Sql_ShowDebug(sql_handle);
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` USING `%s` JOIN `%s` ON `pet_id` = `card1`|`card2`<<16 WHERE `%s`.char_id = '%d' AND card0 = -256", pet_db, pet_db, cart_db, cart_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` USING `%s` JOIN `%s` ON `pet_id` = `card1`|`card2`<<16 WHERE `%s`.char_id = '%d' AND card0 = -256", pet_db, pet_db, inventory_db, inventory_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` USING `%s` JOIN `%s` ON `pet_id` = `card1`|`card2`<<16 WHERE `%s`.char_id = '%d' AND card0 = -256", pet_db, pet_db, cart_db, cart_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	/* remove homunculus */
 	if( hom_id )
-		mapif_homunculus_delete(hom_id);
+		mapif->homunculus_delete(hom_id);
 
 	/* remove elemental */
 	if (elemental_id)
-		mapif_elemental_delete(elemental_id);
+		mapif->elemental_delete(elemental_id);
 
 	/* remove mercenary data */
-	mercenary_owner_delete(char_id);
+	inter_mercenary->owner_delete(char_id);
 
 	/* delete char's friends list */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", friend_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", friend_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	/* delete char from other's friend list */
 	//NOTE: Won't this cause problems for people who are already online? [Skotlex]
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `friend_id` = '%d'", friend_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `friend_id` = '%d'", friend_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 #ifdef HOTKEY_SAVING
 	/* delete hotkeys */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", hotkey_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", hotkey_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 #endif
 
 	/* delete inventory */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", inventory_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", inventory_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	/* delete cart inventory */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", cart_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", cart_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	/* delete memo areas */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", memo_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", memo_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	/* delete character registry */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", char_reg_str_db, char_id) )
-		Sql_ShowDebug(sql_handle);
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", char_reg_num_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", char_reg_str_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", char_reg_num_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	/* delete skills */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", skill_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", skill_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	/* delete mails (only received) */
-	if (SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `dest_id`='%d'", mail_db, char_id))
-		Sql_ShowDebug(sql_handle);
+	if (SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `dest_id`='%d'", mail_db, char_id))
+		Sql_ShowDebug(inter->sql_handle);
 
 #ifdef ENABLE_SC_SAVING
 	/* status changes */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, account_id, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, account_id, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 #endif
 
 	/* delete character */
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", char_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", char_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 	else if( log_char ) {
-		if( SQL_ERROR == SQL->Query(sql_handle,
+		if( SQL_ERROR == SQL->Query(inter->sql_handle,
 			"INSERT INTO `%s`(`time`, `account_id`, `char_id`, `char_num`, `char_msg`, `name`)"
 			" VALUES (NOW(), '%d', '%d', '%d', 'Deleted character', '%s')",
 			charlog_db, account_id, char_id, 0, esc_name) )
-			Sql_ShowDebug(sql_handle);
+			Sql_ShowDebug(inter->sql_handle);
 	}
 
-	/* No need as we used inter_guild_leave [Skotlex]
+	/* No need as we used inter_guild->leave [Skotlex]
 	// Also delete info from guildtables.
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", guild_member_db, char_id) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", guild_member_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
 	*/
 
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `char_id` = '%d'", guild_db, char_id) )
-		Sql_ShowDebug(sql_handle);
-	else if( SQL->NumRows(sql_handle) > 0 )
-		mapif_parse_BreakGuild(0,guild_id);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `guild_id` FROM `%s` WHERE `char_id` = '%d'", guild_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
+	else if( SQL->NumRows(inter->sql_handle) > 0 )
+		mapif->parse_BreakGuild(0,guild_id);
 	else if( guild_id )
-		inter_guild_leave(guild_id, account_id, char_id);// Leave your guild.
+		inter_guild->leave(guild_id, account_id, char_id);// Leave your guild.
 	return 0;
 }
 
 //---------------------------------------------------------------------
 // This function return the number of online players in all map-servers
 //---------------------------------------------------------------------
-int count_users(void)
+int char_count_users(void)
 {
 	int i, users;
 
@@ -1930,7 +1916,7 @@ int count_users(void)
 // Used in packets 0x6b (chars info) and 0x6d (new char info)
 // Returns the size
 #define MAX_CHAR_BUF 150 //Max size (for WFIFOHEAD calls)
-int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) {
+int char_mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) {
 	unsigned short offset = 0;
 	uint8* buf;
 
@@ -2025,15 +2011,16 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) {
 }
 	
 /* Made Possible by Yommy~! <3 */
-void mmo_char_send099d(int fd, struct char_session_data *sd) {
+void char_mmo_char_send099d(int fd, struct char_session_data *sd) {
 	WFIFOHEAD(fd,4 + (MAX_CHARS*MAX_CHAR_BUF));
 	WFIFOW(fd,0) = 0x99d;
-	WFIFOW(fd,2) = mmo_chars_fromsql(sd, WFIFOP(fd,4)) + 4;
+	WFIFOW(fd,2) = chr->mmo_chars_fromsql(sd, WFIFOP(fd,4)) + 4;
 	WFIFOSET(fd,WFIFOW(fd,2));
 }
+
 /* Sends character ban list */
 /* Made Possible by Yommy~! <3 */
-void mmo_char_send020d(int fd, struct char_session_data *sd) {
+void char_mmo_char_send_ban_list(int fd, struct char_session_data *sd) {
 	int i;
 	time_t now = time(NULL);
 		
@@ -2057,8 +2044,8 @@ void mmo_char_send020d(int fd, struct char_session_data *sd) {
 					WFIFOL(fd, 4 + (24*c)) = 0;
 					/* also update on mysql */
 					sd->unban_time[i] = 0;
-					if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `unban_time`='0' WHERE `char_id`='%d' LIMIT 1", char_db, sd->found_char[i]) )
-						Sql_ShowDebug(sql_handle);
+					if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `unban_time`='0' WHERE `char_id`='%d' LIMIT 1", char_db, sd->found_char[i]) )
+						Sql_ShowDebug(inter->sql_handle);
 				}
 				c++;
 			}
@@ -2069,11 +2056,11 @@ void mmo_char_send020d(int fd, struct char_session_data *sd) {
 		WFIFOSET(fd, WFIFOW(fd, 2));
 	}
 }
-int mmo_char_send006b(int fd, struct char_session_data* sd);
+
 //----------------------------------------
 // [Ind/Hercules] notify client about charselect window data
 //----------------------------------------
-void mmo_char_send082d(int fd, struct char_session_data* sd) {
+void char_mmo_char_send_slots_info(int fd, struct char_session_data* sd) {
 	
 	WFIFOHEAD(fd,29);
 	WFIFOW(fd,0) = 0x82d;
@@ -2085,13 +2072,11 @@ void mmo_char_send082d(int fd, struct char_session_data* sd) {
 	WFIFOB(fd,8) = sd->char_slots;
 	memset(WFIFOP(fd,9), 0, 20); // unused bytes
 	WFIFOSET(fd,29);
-	
-	mmo_char_send006b(fd,sd);
 }
 //----------------------------------------
 // Function to send characters to a player
 //----------------------------------------
-int mmo_char_send006b(int fd, struct char_session_data* sd)
+int char_mmo_char_send_characters(int fd, struct char_session_data* sd)
 {
 	int j, offset = 0;
 #if PACKETVER >= 20100413
@@ -2109,82 +2094,82 @@ int mmo_char_send006b(int fd, struct char_session_data* sd)
 	WFIFOB(fd,6) = MAX_CHARS; // Premium slots. AKA any existent chars past sd->char_slots but within MAX_CHARS will show a 'Premium Service' in red
 #endif
 	memset(WFIFOP(fd,4 + offset), 0, 20); // unknown bytes
-	j+=mmo_chars_fromsql(sd, WFIFOP(fd,j));
+	j+=chr->mmo_chars_fromsql(sd, WFIFOP(fd,j));
 	WFIFOW(fd,2) = j; // packet len
 	WFIFOSET(fd,j);
 
 	return 0;
 }
 
-int char_married(int pl1, int pl2)
+int char_char_married(int pl1, int pl2)
 {
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `partner_id` FROM `%s` WHERE `char_id` = '%d'", char_db, pl1) )
-		Sql_ShowDebug(sql_handle);
-	else if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `partner_id` FROM `%s` WHERE `char_id` = '%d'", char_db, pl1) )
+		Sql_ShowDebug(inter->sql_handle);
+	else if( SQL_SUCCESS == SQL->NextRow(inter->sql_handle) )
 	{
 		char* data;
 
-		SQL->GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(inter->sql_handle, 0, &data, NULL);
 		if( pl2 == atoi(data) )
 		{
-			SQL->FreeResult(sql_handle);
+			SQL->FreeResult(inter->sql_handle);
 			return 1;
 		}
 	}
-	SQL->FreeResult(sql_handle);
+	SQL->FreeResult(inter->sql_handle);
 	return 0;
 }
 
-int char_child(int parent_id, int child_id)
+int char_char_child(int parent_id, int child_id)
 {
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `child` FROM `%s` WHERE `char_id` = '%d'", char_db, parent_id) )
-		Sql_ShowDebug(sql_handle);
-	else if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `child` FROM `%s` WHERE `char_id` = '%d'", char_db, parent_id) )
+		Sql_ShowDebug(inter->sql_handle);
+	else if( SQL_SUCCESS == SQL->NextRow(inter->sql_handle) )
 	{
 		char* data;
 
-		SQL->GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(inter->sql_handle, 0, &data, NULL);
 		if( child_id == atoi(data) )
 		{
-			SQL->FreeResult(sql_handle);
+			SQL->FreeResult(inter->sql_handle);
 			return 1;
 		}
 	}
-	SQL->FreeResult(sql_handle);
+	SQL->FreeResult(inter->sql_handle);
 	return 0;
 }
 
-int char_family(int cid1, int cid2, int cid3)
+int char_char_family(int cid1, int cid2, int cid3)
 {
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `char_id`,`partner_id`,`child` FROM `%s` WHERE `char_id` IN ('%d','%d','%d')", char_db, cid1, cid2, cid3) )
-		Sql_ShowDebug(sql_handle);
-	else while( SQL_SUCCESS == SQL->NextRow(sql_handle) )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `char_id`,`partner_id`,`child` FROM `%s` WHERE `char_id` IN ('%d','%d','%d')", char_db, cid1, cid2, cid3) )
+		Sql_ShowDebug(inter->sql_handle);
+	else while( SQL_SUCCESS == SQL->NextRow(inter->sql_handle) )
 	{
 		int charid;
 		int partnerid;
 		int childid;
 		char* data;
 
-		SQL->GetData(sql_handle, 0, &data, NULL); charid = atoi(data);
-		SQL->GetData(sql_handle, 1, &data, NULL); partnerid = atoi(data);
-		SQL->GetData(sql_handle, 2, &data, NULL); childid = atoi(data);
+		SQL->GetData(inter->sql_handle, 0, &data, NULL); charid = atoi(data);
+		SQL->GetData(inter->sql_handle, 1, &data, NULL); partnerid = atoi(data);
+		SQL->GetData(inter->sql_handle, 2, &data, NULL); childid = atoi(data);
 
 		if( (cid1 == charid    && ((cid2 == partnerid && cid3 == childid  ) || (cid2 == childid   && cid3 == partnerid))) ||
 			(cid1 == partnerid && ((cid2 == charid    && cid3 == childid  ) || (cid2 == childid   && cid3 == charid   ))) ||
 			(cid1 == childid   && ((cid2 == charid    && cid3 == partnerid) || (cid2 == partnerid && cid3 == charid   ))) )
 		{
-			SQL->FreeResult(sql_handle);
+			SQL->FreeResult(inter->sql_handle);
 			return childid;
 		}
 	}
-	SQL->FreeResult(sql_handle);
+	SQL->FreeResult(inter->sql_handle);
 	return 0;
 }
 
 //----------------------------------------------------------------------
 // Force disconnection of an online player (with account value) by [Yor]
 //----------------------------------------------------------------------
-void disconnect_player(int account_id)
+void char_disconnect_player(int account_id)
 {
 	int i;
 	struct char_session_data* sd;
@@ -2195,64 +2180,66 @@ void disconnect_player(int account_id)
 		set_eof(i);
 }
 
+void char_authfail_fd(int fd, int type)
+{
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x81;
+	WFIFOB(fd,2) = type;
+	WFIFOSET(fd,3);
+}
+
+void char_request_account_data(int account_id)
+{
+	WFIFOHEAD(chr->login_fd,6);
+	WFIFOW(chr->login_fd,0) = 0x2716;
+	WFIFOL(chr->login_fd,2) = account_id;
+	WFIFOSET(chr->login_fd,6);
+}
+
 static void char_auth_ok(int fd, struct char_session_data *sd)
 {
 	struct online_char_data* character;
 
-	if( (character = (struct online_char_data*)idb_get(online_char_db, sd->account_id)) != NULL )
+	if( (character = (struct online_char_data*)idb_get(chr->online_char_db, sd->account_id)) != NULL )
 	{	// check if character is not online already. [Skotlex]
 		if (character->server > -1)
 		{	//Character already online. KICK KICK KICK
-			mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
+			mapif->disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
 			if (character->waiting_disconnect == INVALID_TIMER)
-				character->waiting_disconnect = timer->add(timer->gettick()+20000, chardb_waiting_disconnect, character->account_id, 0);
+				character->waiting_disconnect = timer->add(timer->gettick()+20000, chr->waiting_disconnect, character->account_id, 0);
 			if (character)
 				character->pincode_enable = -1;
-			WFIFOHEAD(fd,3);
-			WFIFOW(fd,0) = 0x81;
-			WFIFOB(fd,2) = 8;
-			WFIFOSET(fd,3);
+			chr->authfail_fd(fd, 8);
 			return;
 		}
 		if (character->fd >= 0 && character->fd != fd)
 		{	//There's already a connection from this account that hasn't picked a char yet.
-			WFIFOHEAD(fd,3);
-			WFIFOW(fd,0) = 0x81;
-			WFIFOB(fd,2) = 8;
-			WFIFOSET(fd,3);
+			chr->authfail_fd(fd, 8);
 			return;
 		}
 		character->fd = fd;
 	}
 
-	if (login_fd > 0) {
-		// request account data
-		WFIFOHEAD(login_fd,6);
-		WFIFOW(login_fd,0) = 0x2716;
-		WFIFOL(login_fd,2) = sd->account_id;
-		WFIFOSET(login_fd,6);
+	if (chr->login_fd > 0) {
+		chr->request_account_data(sd->account_id);
 	}
 
 	// mark session as 'authed'
 	sd->auth = true;
 
 	// set char online on charserver
-	set_char_charselect(sd->account_id);
+	chr->set_char_charselect(sd->account_id);
 
 	// continues when account data is received...
 }
 
-int send_accounts_tologin(int tid, int64 tick, int id, intptr_t data);
-void mapif_server_reset(int id);
-
-
 /// Resets all the data.
 void loginif_reset(void)
 {
 	int id;
 	// TODO kick everyone out and reset everything or wait for connect and try to reacquire locks [FlavioJS]
 	for( id = 0; id < ARRAYLENGTH(server); ++id )
-		mapif_server_reset(id);
+		mapif->server_reset(id);
 	flush_fifos();
 	exit(EXIT_FAILURE);
 }
@@ -2281,10 +2268,10 @@ void loginif_on_ready(void)
 {
 	int i;
 
-	loginif_check_shutdown();
+	loginif->check_shutdown();
 
 	//Send online accounts to login server.
-	send_accounts_tologin(INVALID_TIMER, timer->gettick(), 0, 0);
+	chr->send_accounts_tologin(INVALID_TIMER, timer->gettick(), 0, 0);
 
 	// if no map-server already connected, display a message...
 	ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd > 0 && server[i].map );
@@ -2292,37 +2279,352 @@ void loginif_on_ready(void)
 		ShowStatus("Awaiting maps from map-server.\n");
 }
 
+void char_ping_login_server(int fd)
+{
+	WFIFOHEAD(fd,2);// sends a ping packet to login server (will receive pong 0x2718)
+	WFIFOW(fd,0) = 0x2719;
+	WFIFOSET(fd,2);
+}
+
+int char_parse_fromlogin_connection_state(int fd)
+{
+	if (RFIFOB(fd,2)) {
+		//printf("connect login server error : %d\n", RFIFOB(fd,2));
+		ShowError("Can not connect to login-server.\n");
+		ShowError("The server communication passwords (default s1/p1) are probably invalid.\n");
+		ShowError("Also, please make sure your login db has the correct communication username/passwords and the gender of the account is S.\n");
+		ShowError("The communication passwords are set in /conf/map-server.conf and /conf/char-server.conf\n");
+		set_eof(fd);
+		return 1;
+	} else {
+		ShowStatus("Connected to login-server (connection #%d).\n", fd);
+		loginif->on_ready();
+	}
+	RFIFOSKIP(fd,3);
+	return 0;
+}
 
-int parse_fromlogin(int fd) {
+// 0 - rejected from server
+//
+void char_auth_error(int fd, unsigned char flag)
+{
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x6c;
+	WFIFOB(fd,2) = flag;
+	WFIFOSET(fd,3);
+}
+
+void char_parse_fromlogin_auth_state(int fd)
+{
 	struct char_session_data* sd = NULL;
+	int account_id = RFIFOL(fd,2);
+	uint32 login_id1 = RFIFOL(fd,6);
+	uint32 login_id2 = RFIFOL(fd,10);
+	uint8 sex = RFIFOB(fd,14);
+	uint8 result = RFIFOB(fd,15);
+	int request_id = RFIFOL(fd,16);
+	uint32 version = RFIFOL(fd,20);
+	uint8 clienttype = RFIFOB(fd,24);
+	int group_id = RFIFOL(fd,25);
+	unsigned int expiration_time = RFIFOL(fd, 29);
+	RFIFOSKIP(fd,33);
+
+	if( session_isActive(request_id) && (sd=(struct char_session_data*)session[request_id]->session_data) &&
+		!sd->auth && sd->account_id == account_id && sd->login_id1 == login_id1 && sd->login_id2 == login_id2 && sd->sex == sex )
+	{
+		int client_fd = request_id;
+		sd->version = version;
+		sd->clienttype = clienttype;
+		switch( result ) {
+			case 0:// ok
+				/* restrictions apply */
+				if( char_server_type == CST_MAINTENANCE && group_id < char_maintenance_min_group_id ) {
+					chr->auth_error(client_fd, 0);
+					break;
+				}
+				/* the client will already deny this request, this check is to avoid someone bypassing. */
+				if( char_server_type == CST_PAYING && (time_t)expiration_time < time(NULL) ) {
+					chr->auth_error(client_fd, 0);
+					break;
+				}
+				chr->auth_ok(client_fd, sd);
+				break;
+			case 1:// auth failed
+				chr->auth_error(client_fd, 0);
+				break;
+		}
+	}
+}
+
+void char_parse_fromlogin_account_data(int fd)
+{
+	struct char_session_data* sd = (struct char_session_data*)session[fd]->session_data;
+	int i;
+	// find the authenticated session with this account id
+	ARR_FIND( 0, sockt->fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) );
+	if( i < sockt->fd_max ) {
+		memcpy(sd->email, RFIFOP(fd,6), 40);
+		sd->expiration_time = (time_t)RFIFOL(fd,46);
+		sd->group_id = RFIFOB(fd,50);
+		sd->char_slots = RFIFOB(fd,51);
+		if( sd->char_slots > MAX_CHARS ) {
+			ShowError("Account '%d' `character_slots` column is higher than supported MAX_CHARS (%d), update MAX_CHARS in mmo.h! capping to MAX_CHARS...\n",sd->account_id,sd->char_slots);
+			sd->char_slots = MAX_CHARS;/* cap to maximum */
+		} else if ( sd->char_slots <= 0 )/* no value aka 0 in sql */
+			sd->char_slots = MAX_CHARS;/* cap to maximum */
+		safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,52), sizeof(sd->birthdate));
+		safestrncpy(sd->pincode, (const char*)RFIFOP(fd,63), sizeof(sd->pincode));
+		sd->pincode_change = RFIFOL(fd,68);
+		// continued from chr->auth_ok...
+		if( (max_connect_user == 0 && sd->group_id != gm_allow_group) ||
+			( max_connect_user > 0 && chr->count_users() >= max_connect_user && sd->group_id != gm_allow_group ) ) {
+			// refuse connection (over populated)
+			chr->auth_error(i, 0);
+		} else {
+			// send characters to player
+	#if PACKETVER >= 20130000
+			chr->mmo_char_send_slots_info(i, sd);
+			chr->mmo_char_send_characters(i, sd);
+	#else
+			chr->mmo_char_send_characters(i, sd);
+	#endif
+	#if PACKETVER >= 20060819
+			chr->mmo_char_send_ban_list(i, sd);
+	#endif
+	#if PACKETVER >= 20110309
+			pincode->handle(i, sd);
+	#endif
+		}
+	}
+	RFIFOSKIP(fd,72);
+}
+
+void char_parse_fromlogin_login_pong(int fd)
+{
+	RFIFOSKIP(fd,2);
+	session[fd]->flag.ping = 0;
+}
+
+void char_changesex(int account_id, int sex)
+{
+	unsigned char buf[7];
+
+	WBUFW(buf,0) = 0x2b0d;
+	WBUFL(buf,2) = account_id;
+	WBUFB(buf,6) = sex;
+	mapif->sendall(buf, 7);
+}
+
+int char_parse_fromlogin_changesex_reply(int fd)
+{
+	int char_id[MAX_CHARS];
+	int class_[MAX_CHARS];
+	int guild_id[MAX_CHARS];
+	int num;
+	int i;
+	char* data;
+	struct char_auth_node* node;
+
+	int acc = RFIFOL(fd,2);
+	int sex = RFIFOB(fd,6);
+
+	RFIFOSKIP(fd,7);
+
+	// This should _never_ happen
+	if( acc <= 0 ) {
+		ShowError("Received invalid account id from login server! (aid: %d)\n", acc);
+		return 1;
+	}
+
+	node = (struct char_auth_node*)idb_get(auth_db, acc);
+	if( node != NULL )
+		node->sex = sex;
+
+	// get characters
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `char_id`,`class`,`guild_id` FROM `%s` WHERE `account_id` = '%d'", char_db, acc) )
+		Sql_ShowDebug(inter->sql_handle);
+	for( i = 0; i < MAX_CHARS && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++i )
+	{
+		SQL->GetData(inter->sql_handle, 0, &data, NULL); char_id[i] = atoi(data);
+		SQL->GetData(inter->sql_handle, 1, &data, NULL); class_[i] = atoi(data);
+		SQL->GetData(inter->sql_handle, 2, &data, NULL); guild_id[i] = atoi(data);
+	}
+	num = i;
+	for( i = 0; i < num; ++i )
+	{
+		if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER ||
+			class_[i] == JOB_CLOWN || class_[i] == JOB_GYPSY ||
+			class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER ||
+			class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER ||
+			class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T ||
+			class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER ||
+			class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
+		{
+			// job modification
+			if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER )
+				class_[i] = (sex ? JOB_BARD : JOB_DANCER);
+			else if( class_[i] == JOB_CLOWN || class_[i] == JOB_GYPSY )
+				class_[i] = (sex ? JOB_CLOWN : JOB_GYPSY);
+			else if( class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER )
+				class_[i] = (sex ? JOB_BABY_BARD : JOB_BABY_DANCER);
+			else if( class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER )
+				class_[i] = (sex ? JOB_MINSTREL : JOB_WANDERER);
+			else if( class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T )
+				class_[i] = (sex ? JOB_MINSTREL_T : JOB_WANDERER_T);
+			else if( class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER )
+				class_[i] = (sex ? JOB_BABY_MINSTREL : JOB_BABY_WANDERER);
+			else if( class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
+				class_[i] = (sex ? JOB_KAGEROU : JOB_OBORO);
+		}
+
+		if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `equip`='0' WHERE `char_id`='%d'", inventory_db, char_id[i]) )
+			Sql_ShowDebug(inter->sql_handle);
+
+		if( SQL_ERROR == SQL->Query(inter->sql_handle,
+			"UPDATE `%s` SET `class`='%d', `weapon`='0', `shield`='0', `head_top`='0', `head_mid`='0', "
+			"`head_bottom`='0' WHERE `char_id`='%d'",
+			char_db, class_[i], char_id[i]) )
+			Sql_ShowDebug(inter->sql_handle);
+
+		if( guild_id[i] )// If there is a guild, update the guild_member data [Skotlex]
+			inter_guild->sex_changed(guild_id[i], acc, char_id[i], sex);
+	}
+	SQL->FreeResult(inter->sql_handle);
+
+	// disconnect player if online on char-server
+	chr->disconnect_player(acc);
+
+	// notify all mapservers about this change
+	chr->changesex(acc, sex);
+	return 0;
+}
+
+void char_parse_fromlogin_account_reg2(int fd)
+{
+	//Receive account_reg2 registry, forward to map servers.
+	mapif->sendall(RFIFOP(fd, 0), RFIFOW(fd,2));
+	RFIFOSKIP(fd, RFIFOW(fd,2));
+}
 
+void mapif_ban(int id, unsigned int flag, int status)
+{
+	// send to all map-servers to disconnect the player
+	unsigned char buf[11];
+	WBUFW(buf,0) = 0x2b14;
+	WBUFL(buf,2) = id;
+	WBUFB(buf,6) = flag; // 0: change of status, 1: ban
+	WBUFL(buf,7) = status; // status or final date of a banishment
+	mapif->sendall(buf, 11);
+}
+
+void char_parse_fromlogin_ban(int fd)
+{
+    mapif->ban(RFIFOL(fd,2), RFIFOB(fd,6), RFIFOL(fd,7));
+	// disconnect player if online on char-server
+	chr->disconnect_player(RFIFOL(fd,2));
+	RFIFOSKIP(fd,11);
+}
+
+void char_parse_fromlogin_kick(int fd)
+{
+	int aid = RFIFOL(fd,2);
+	struct online_char_data* character = (struct online_char_data*)idb_get(chr->online_char_db, aid);
+	RFIFOSKIP(fd,6);
+	if( character != NULL )
+	{// account is already marked as online!
+		if( character->server > -1 )
+		{	//Kick it from the map server it is on.
+			mapif->disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
+			if (character->waiting_disconnect == INVALID_TIMER)
+				character->waiting_disconnect = timer->add(timer->gettick()+AUTH_TIMEOUT, chr->waiting_disconnect, character->account_id, 0);
+		}
+		else
+		{// Manual kick from char server.
+			struct char_session_data *tsd;
+			int i;
+			ARR_FIND( 0, sockt->fd_max, i, session[i] && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == aid );
+			if( i < sockt->fd_max )
+			{
+				chr->authfail_fd(i, 2);
+				set_eof(i);
+			}
+			else // still moving to the map-server
+				chr->set_char_offline(-1, aid);
+		}
+	}
+	idb_remove(auth_db, aid);// reject auth attempts from map-server
+}
+
+void char_update_ip(int fd)
+{
+	WFIFOHEAD(fd,6);
+	WFIFOW(fd,0) = 0x2736;
+	WFIFOL(fd,2) = htonl(char_ip);
+	WFIFOSET(fd,6);
+}
+
+void char_parse_fromlogin_update_ip(int fd)
+{
+	unsigned char buf[2];
+	uint32 new_ip = 0;
+
+	WBUFW(buf,0) = 0x2b1e;
+	mapif->sendall(buf, 2);
+
+	new_ip = host2ip(login_ip_str);
+	if (new_ip && new_ip != login_ip)
+		login_ip = new_ip; //Update login ip, too.
+
+	new_ip = host2ip(char_ip_str);
+	if (new_ip && new_ip != char_ip)
+	{	//Update ip.
+		char_ip = new_ip;
+		ShowInfo("Updating IP for [%s].\n", char_ip_str);
+		// notify login server about the change
+		chr->update_ip(fd);
+	}
+	RFIFOSKIP(fd,2);
+}
+
+void char_parse_fromlogin_accinfo2_failed(int fd)
+{
+	mapif->parse_accinfo2(false, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14),
+	                     NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1, 0, 0);
+	RFIFOSKIP(fd,18);
+}
+
+void char_parse_fromlogin_accinfo2_ok(int fd)
+{
+	mapif->parse_accinfo2(true, RFIFOL(fd,167), RFIFOL(fd,171), RFIFOL(fd,175), RFIFOL(fd,179),
+	                     (char*)RFIFOP(fd,2), (char*)RFIFOP(fd,26), (char*)RFIFOP(fd,59),
+	                     (char*)RFIFOP(fd,99), (char*)RFIFOP(fd,119), (char*)RFIFOP(fd,151),
+	                     (char*)RFIFOP(fd,156), RFIFOL(fd,115), RFIFOL(fd,143), RFIFOL(fd,147));
+	RFIFOSKIP(fd,183);
+}
+
+int char_parse_fromlogin(int fd) {
 	// only process data from the login-server
-	if( fd != login_fd ) {
-		ShowDebug("parse_fromlogin: Disconnecting invalid session #%d (is not the login-server)\n", fd);
+	if( fd != chr->login_fd ) {
+		ShowDebug("chr->parse_fromlogin: Disconnecting invalid session #%d (is not the login-server)\n", fd);
 		do_close(fd);
 		return 0;
 	}
 
 	if( session[fd]->flag.eof ) {
 		do_close(fd);
-		login_fd = -1;
-		loginif_on_disconnect();
+		chr->login_fd = -1;
+		loginif->on_disconnect();
 		return 0;
 	} else if ( session[fd]->flag.ping ) {/* we've reached stall time */
 		if( DIFF_TICK(sockt->last_tick, session[fd]->rdata_tick) > (sockt->stall_time * 2) ) {/* we can't wait any longer */
 			set_eof(fd);
 			return 0;
 		} else if( session[fd]->flag.ping != 2 ) { /* we haven't sent ping out yet */
-			WFIFOHEAD(fd,2);// sends a ping packet to login server (will receive pong 0x2718)
-			WFIFOW(fd,0) = 0x2719;
-			WFIFOSET(fd,2);
-
+			chr->ping_login_server(fd);
 			session[fd]->flag.ping = 2;
 		}
 	}
 
-	sd = (struct char_session_data*)session[fd]->session_data;
-
 	while(RFIFOREST(fd) >= 2) {
 		uint16 command = RFIFOW(fd,0);
 		
@@ -2338,20 +2640,8 @@ int parse_fromlogin(int fd) {
 			case 0x2711:
 				if (RFIFOREST(fd) < 3)
 					return 0;
-
-				if (RFIFOB(fd,2)) {
-					//printf("connect login server error : %d\n", RFIFOB(fd,2));
-					ShowError("Can not connect to login-server.\n");
-					ShowError("The server communication passwords (default s1/p1) are probably invalid.\n");
-					ShowError("Also, please make sure your login db has the correct communication username/passwords and the gender of the account is S.\n");
-					ShowError("The communication passwords are set in /conf/map-server.conf and /conf/char-server.conf\n");
-					set_eof(fd);
+				if (chr->parse_fromlogin_connection_state(fd))
 					return 0;
-				} else {
-					ShowStatus("Connected to login-server (connection #%d).\n", fd);
-					loginif_on_ready();
-				}
-				RFIFOSKIP(fd,3);
 			break;
 
 			// acknowledgment of account authentication request
@@ -2359,100 +2649,15 @@ int parse_fromlogin(int fd) {
 				if (RFIFOREST(fd) < 33)
 					return 0;
 			{
-				int account_id = RFIFOL(fd,2);
-				uint32 login_id1 = RFIFOL(fd,6);
-				uint32 login_id2 = RFIFOL(fd,10);
-				uint8 sex = RFIFOB(fd,14);
-				uint8 result = RFIFOB(fd,15);
-				int request_id = RFIFOL(fd,16);
-				uint32 version = RFIFOL(fd,20);
-				uint8 clienttype = RFIFOB(fd,24);
-				int group_id = RFIFOL(fd,25);
-				unsigned int expiration_time = RFIFOL(fd, 29);
-				RFIFOSKIP(fd,33);
-
-				if( session_isActive(request_id) && (sd=(struct char_session_data*)session[request_id]->session_data) &&
-					!sd->auth && sd->account_id == account_id && sd->login_id1 == login_id1 && sd->login_id2 == login_id2 && sd->sex == sex )
-				{
-					int client_fd = request_id;
-					sd->version = version;
-					sd->clienttype = clienttype;
-					switch( result ) {
-						case 0:// ok
-							/* restrictions apply */
-							if( char_server_type == CST_MAINTENANCE && group_id < char_maintenance_min_group_id ) {
-								WFIFOHEAD(client_fd,3);
-								WFIFOW(client_fd,0) = 0x6c;
-								WFIFOB(client_fd,2) = 0;// rejected from server
-								WFIFOSET(client_fd,3);
-								break;
-							}
-							/* the client will already deny this request, this check is to avoid someone bypassing. */
-							if( char_server_type == CST_PAYING && (time_t)expiration_time < time(NULL) ) {
-								WFIFOHEAD(client_fd,3);
-								WFIFOW(client_fd,0) = 0x6c;
-								WFIFOB(client_fd,2) = 0;// rejected from server
-								WFIFOSET(client_fd,3);
-								break;
-							}
-							char_auth_ok(client_fd, sd);
-							break;
-						case 1:// auth failed
-							WFIFOHEAD(client_fd,3);
-							WFIFOW(client_fd,0) = 0x6c;
-							WFIFOB(client_fd,2) = 0;// rejected from server
-							WFIFOSET(client_fd,3);
-							break;
-					}
-				}
+				chr->parse_fromlogin_auth_state(fd);
 			}
 			break;
 
 			case 0x2717: // account data
 			{
-				int i;
 				if (RFIFOREST(fd) < 72)
 					return 0;
-
-				// find the authenticated session with this account id
-				ARR_FIND( 0, sockt->fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) );
-				if( i < sockt->fd_max ) {
-					memcpy(sd->email, RFIFOP(fd,6), 40);
-					sd->expiration_time = (time_t)RFIFOL(fd,46);
-					sd->group_id = RFIFOB(fd,50);
-					sd->char_slots = RFIFOB(fd,51);
-					if( sd->char_slots > MAX_CHARS ) {
-						ShowError("Account '%d' `character_slots` column is higher than supported MAX_CHARS (%d), update MAX_CHARS in mmo.h! capping to MAX_CHARS...\n",sd->account_id,sd->char_slots);
-						sd->char_slots = MAX_CHARS;/* cap to maximum */
-					} else if ( sd->char_slots <= 0 )/* no value aka 0 in sql */
-						sd->char_slots = MAX_CHARS;/* cap to maximum */
-					safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,52), sizeof(sd->birthdate));
-					safestrncpy(sd->pincode, (const char*)RFIFOP(fd,63), sizeof(sd->pincode));
-					sd->pincode_change = RFIFOL(fd,68);
-					// continued from char_auth_ok...
-					if( (max_connect_user == 0 && sd->group_id != gm_allow_group) ||
-						( max_connect_user > 0 && count_users() >= max_connect_user && sd->group_id != gm_allow_group ) ) {
-						// refuse connection (over populated)
-						WFIFOHEAD(i,3);
-						WFIFOW(i,0) = 0x6c;
-						WFIFOW(i,2) = 0;
-						WFIFOSET(i,3);
-					} else {
-						// send characters to player
-	#if PACKETVER >= 20130000
-						mmo_char_send082d(i, sd);
-	#else
-						mmo_char_send006b(i, sd);
-	#endif
-	#if PACKETVER >= 20060819
-						mmo_char_send020d(i, sd);
-	#endif
-	#if PACKETVER >= 20110309
-						pincode->handle(i, sd);
-	#endif
-					}
-				}
-				RFIFOSKIP(fd,72);
+				chr->parse_fromlogin_account_data(fd);
 			}
 			break;
 
@@ -2460,8 +2665,7 @@ int parse_fromlogin(int fd) {
 			case 0x2718:
 				if (RFIFOREST(fd) < 2)
 					return 0;
-				RFIFOSKIP(fd,2);
-				session[fd]->flag.ping = 0;
+				chr->parse_fromlogin_login_pong(fd);
 			break;
 
 			// changesex reply
@@ -2469,90 +2673,8 @@ int parse_fromlogin(int fd) {
 				if (RFIFOREST(fd) < 7)
 					return 0;
 			{
-				unsigned char buf[7];
-
-				int char_id[MAX_CHARS];
-				int class_[MAX_CHARS];
-				int guild_id[MAX_CHARS];
-				int num;
-				int i;
-				char* data;
-				struct auth_node* node;
-
-				int acc = RFIFOL(fd,2);
-				int sex = RFIFOB(fd,6);
-
-				RFIFOSKIP(fd,7);
-
-				// This should _never_ happen
-				if( acc <= 0 ) {
-					ShowError("Received invalid account id from login server! (aid: %d)\n", acc);
+				if (chr->parse_fromlogin_changesex_reply(fd))
 					return 0;
-				}
-
-				node = (struct auth_node*)idb_get(auth_db, acc);
-				if( node != NULL )
-					node->sex = sex;
-
-				// get characters
-				if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `char_id`,`class`,`guild_id` FROM `%s` WHERE `account_id` = '%d'", char_db, acc) )
-					Sql_ShowDebug(sql_handle);
-				for( i = 0; i < MAX_CHARS && SQL_SUCCESS == SQL->NextRow(sql_handle); ++i )
-				{
-					SQL->GetData(sql_handle, 0, &data, NULL); char_id[i] = atoi(data);
-					SQL->GetData(sql_handle, 1, &data, NULL); class_[i] = atoi(data);
-					SQL->GetData(sql_handle, 2, &data, NULL); guild_id[i] = atoi(data);
-				}
-				num = i;
-				for( i = 0; i < num; ++i )
-				{
-					if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER ||
-						class_[i] == JOB_CLOWN || class_[i] == JOB_GYPSY ||
-						class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER ||
-						class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER ||
-						class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T ||
-						class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER ||
-						class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
-					{
-						// job modification
-						if( class_[i] == JOB_BARD || class_[i] == JOB_DANCER )
-							class_[i] = (sex ? JOB_BARD : JOB_DANCER);
-						else if( class_[i] == JOB_CLOWN || class_[i] == JOB_GYPSY )
-							class_[i] = (sex ? JOB_CLOWN : JOB_GYPSY);
-						else if( class_[i] == JOB_BABY_BARD || class_[i] == JOB_BABY_DANCER )
-							class_[i] = (sex ? JOB_BABY_BARD : JOB_BABY_DANCER);
-						else if( class_[i] == JOB_MINSTREL || class_[i] == JOB_WANDERER )
-							class_[i] = (sex ? JOB_MINSTREL : JOB_WANDERER);
-						else if( class_[i] == JOB_MINSTREL_T || class_[i] == JOB_WANDERER_T )
-							class_[i] = (sex ? JOB_MINSTREL_T : JOB_WANDERER_T);
-						else if( class_[i] == JOB_BABY_MINSTREL || class_[i] == JOB_BABY_WANDERER )
-							class_[i] = (sex ? JOB_BABY_MINSTREL : JOB_BABY_WANDERER);
-						else if( class_[i] == JOB_KAGEROU || class_[i] == JOB_OBORO )
-							class_[i] = (sex ? JOB_KAGEROU : JOB_OBORO);
-					}
-
-					if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `equip`='0' WHERE `char_id`='%d'", inventory_db, char_id[i]) )
-						Sql_ShowDebug(sql_handle);
-
-					if( SQL_ERROR == SQL->Query(sql_handle,
-						"UPDATE `%s` SET `class`='%d', `weapon`='0', `shield`='0', `head_top`='0', `head_mid`='0', "
-						"`head_bottom`='0' WHERE `char_id`='%d'",
-						char_db, class_[i], char_id[i]) )
-						Sql_ShowDebug(sql_handle);
-
-					if( guild_id[i] )// If there is a guild, update the guild_member data [Skotlex]
-						inter_guild_sex_changed(guild_id[i], acc, char_id[i], sex);
-				}
-				SQL->FreeResult(sql_handle);
-
-				// disconnect player if online on char-server
-				disconnect_player(acc);
-
-				// notify all mapservers about this change
-				WBUFW(buf,0) = 0x2b0d;
-				WBUFL(buf,2) = acc;
-				WBUFB(buf,6) = sex;
-				mapif_sendall(buf, 7);
 			}
 			break;
 
@@ -2560,28 +2682,14 @@ int parse_fromlogin(int fd) {
 			case 0x3804:
 				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 					return 0;
-				//Receive account_reg2 registry, forward to map servers.
-				mapif_sendall(RFIFOP(fd, 0), RFIFOW(fd,2));
-				RFIFOSKIP(fd, RFIFOW(fd,2));
+				chr->parse_fromlogin_account_reg2(fd);
 			break;
 
 			// State change of account/ban notification (from login-server)
 			case 0x2731:
 				if (RFIFOREST(fd) < 11)
 					return 0;
-
-			{	// send to all map-servers to disconnect the player
-				unsigned char buf[11];
-				WBUFW(buf,0) = 0x2b14;
-				WBUFL(buf,2) = RFIFOL(fd,2);
-				WBUFB(buf,6) = RFIFOB(fd,6); // 0: change of status, 1: ban
-				WBUFL(buf,7) = RFIFOL(fd,7); // status or final date of a banishment
-				mapif_sendall(buf, 11);
-			}
-				// disconnect player if online on char-server
-				disconnect_player(RFIFOL(fd,2));
-
-				RFIFOSKIP(fd,11);
+				chr->parse_fromlogin_ban(fd);
 			break;
 
 			// Login server request to kick a character out. [Skotlex]
@@ -2589,64 +2697,14 @@ int parse_fromlogin(int fd) {
 				if (RFIFOREST(fd) < 6)
 					return 0;
 			{
-				int aid = RFIFOL(fd,2);
-				struct online_char_data* character = (struct online_char_data*)idb_get(online_char_db, aid);
-				RFIFOSKIP(fd,6);
-				if( character != NULL )
-				{// account is already marked as online!
-					if( character->server > -1 )
-					{	//Kick it from the map server it is on.
-						mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
-						if (character->waiting_disconnect == INVALID_TIMER)
-							character->waiting_disconnect = timer->add(timer->gettick()+AUTH_TIMEOUT, chardb_waiting_disconnect, character->account_id, 0);
-					}
-					else
-					{// Manual kick from char server.
-						struct char_session_data *tsd;
-						int i;
-						ARR_FIND( 0, sockt->fd_max, i, session[i] && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == aid );
-						if( i < sockt->fd_max )
-						{
-							WFIFOHEAD(i,3);
-							WFIFOW(i,0) = 0x81;
-							WFIFOB(i,2) = 2; // "Someone has already logged in with this id"
-							WFIFOSET(i,3);
-							set_eof(i);
-						}
-						else // still moving to the map-server
-							set_char_offline(-1, aid);
-					}
-				}
-				idb_remove(auth_db, aid);// reject auth attempts from map-server
+				chr->parse_fromlogin_kick(fd);
 			}
 			break;
 
 			// ip address update signal from login server
 			case 0x2735:
 			{
-				unsigned char buf[2];
-				uint32 new_ip = 0;
-
-				WBUFW(buf,0) = 0x2b1e;
-				mapif_sendall(buf, 2);
-
-				new_ip = host2ip(login_ip_str);
-				if (new_ip && new_ip != login_ip)
-					login_ip = new_ip; //Update login ip, too.
-
-				new_ip = host2ip(char_ip_str);
-				if (new_ip && new_ip != char_ip)
-				{	//Update ip.
-					char_ip = new_ip;
-					ShowInfo("Updating IP for [%s].\n", char_ip_str);
-					// notify login server about the change
-					WFIFOHEAD(fd,6);
-					WFIFOW(fd,0) = 0x2736;
-					WFIFOL(fd,2) = htonl(char_ip);
-					WFIFOSET(fd,6);
-				}
-
-				RFIFOSKIP(fd,2);
+				chr->parse_fromlogin_update_ip(fd);
 			}
 			break;
 
@@ -2654,20 +2712,14 @@ int parse_fromlogin(int fd) {
 				if (RFIFOREST(fd) < 18)
 					return 0;
 
-				mapif_parse_accinfo2(false, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14),
-				                     NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1, 0, 0);
-				RFIFOSKIP(fd,18);
+				chr->parse_fromlogin_accinfo2_failed(fd);
 			break;
 
 			case 0x2737: // Successful accinfo lookup to forward to mapserver
 				if (RFIFOREST(fd) < 183)
 					return 0;
 
-				mapif_parse_accinfo2(true, RFIFOL(fd,167), RFIFOL(fd,171), RFIFOL(fd,175), RFIFOL(fd,179),
-				                     (char*)RFIFOP(fd,2), (char*)RFIFOP(fd,26), (char*)RFIFOP(fd,59),
-				                     (char*)RFIFOP(fd,99), (char*)RFIFOP(fd,119), (char*)RFIFOP(fd,151),
-				                     (char*)RFIFOP(fd,156), RFIFOL(fd,115), RFIFOL(fd,143), RFIFOL(fd,147));
-				RFIFOSKIP(fd,183);
+				chr->parse_fromlogin_accinfo2_ok(fd);
 			break;
 
 			default:
@@ -2681,110 +2733,112 @@ int parse_fromlogin(int fd) {
 	return 0;
 }
 
-int check_connect_login_server(int tid, int64 tick, int id, intptr_t data);
-
 void do_init_loginif(void)
 {
 	// establish char-login connection if not present
-	timer->add_func_list(check_connect_login_server, "check_connect_login_server");
-	timer->add_interval(timer->gettick() + 1000, check_connect_login_server, 0, 0, 10 * 1000);
+	timer->add_func_list(chr->check_connect_login_server, "chr->check_connect_login_server");
+	timer->add_interval(timer->gettick() + 1000, chr->check_connect_login_server, 0, 0, 10 * 1000);
 
 	// send a list of all online account IDs to login server
-	timer->add_func_list(send_accounts_tologin, "send_accounts_tologin");
-	timer->add_interval(timer->gettick() + 1000, send_accounts_tologin, 0, 0, 3600 * 1000); //Sync online accounts every hour
+	timer->add_func_list(chr->send_accounts_tologin, "chr->send_accounts_tologin");
+	timer->add_interval(timer->gettick() + 1000, chr->send_accounts_tologin, 0, 0, 3600 * 1000); //Sync online accounts every hour
 }
 
 void do_final_loginif(void)
 {
-	if( login_fd != -1 )
+	if( chr->login_fd != -1 )
 	{
-		do_close(login_fd);
-		login_fd = -1;
+		do_close(chr->login_fd);
+		chr->login_fd = -1;
 	}
 }
 
-int request_accreg2(int account_id, int char_id)
+int char_request_accreg2(int account_id, int char_id)
 {
-	if (login_fd > 0) {
-		WFIFOHEAD(login_fd,10);
-		WFIFOW(login_fd,0) = 0x272e;
-		WFIFOL(login_fd,2) = account_id;
-		WFIFOL(login_fd,6) = char_id;
-		WFIFOSET(login_fd,10);
+	if (chr->login_fd > 0) {
+		WFIFOHEAD(chr->login_fd,10);
+		WFIFOW(chr->login_fd,0) = 0x272e;
+		WFIFOL(chr->login_fd,2) = account_id;
+		WFIFOL(chr->login_fd,6) = char_id;
+		WFIFOSET(chr->login_fd,10);
 		return 1;
 	}
 	return 0;
 }
+
 /**
- * Handles global account reg saving that continues with global_accreg_to_login_add and global_accreg_to_send
+ * Handles global account reg saving that continues with chr->global_accreg_to_login_add and global_accreg_to_send
  **/
-void global_accreg_to_login_start (int account_id, int char_id) {
-	WFIFOHEAD(login_fd, 60000 + 300);
-	WFIFOW(login_fd,0)  = 0x2728;
-	WFIFOW(login_fd,2)  = 14;
-	WFIFOL(login_fd,4)  = account_id;
-	WFIFOL(login_fd,8)  = char_id;
-	WFIFOW(login_fd,12) = 0;/* count */
+void char_global_accreg_to_login_start (int account_id, int char_id) {
+	WFIFOHEAD(chr->login_fd, 60000 + 300);
+	WFIFOW(chr->login_fd,0)  = 0x2728;
+	WFIFOW(chr->login_fd,2)  = 14;
+	WFIFOL(chr->login_fd,4)  = account_id;
+	WFIFOL(chr->login_fd,8)  = char_id;
+	WFIFOW(chr->login_fd,12) = 0;/* count */
 }
+
 /**
- * Completes global account reg saving that starts global_accreg_to_login_start and continues with global_accreg_to_login_add
+ * Completes global account reg saving that starts chr->global_accreg_to_login_start and continues with chr->global_accreg_to_login_add
  **/
-void global_accreg_to_login_send (void) {
-	WFIFOSET(login_fd, WFIFOW(login_fd,2));
+void char_global_accreg_to_login_send (void) {
+	WFIFOSET(chr->login_fd, WFIFOW(chr->login_fd,2));
 }
+
 /**
- * Handles global account reg saving that starts global_accreg_to_login_start and ends with global_accreg_to_send
+ * Handles global account reg saving that starts chr->global_accreg_to_login_start and ends with global_accreg_to_send
  **/
-void global_accreg_to_login_add (const char *key, unsigned int index, intptr_t val, bool is_string) {
-	int nlen = WFIFOW(login_fd, 2);
+void char_global_accreg_to_login_add (const char *key, unsigned int index, intptr_t val, bool is_string) {
+	int nlen = WFIFOW(chr->login_fd, 2);
 	size_t len;
 	
 	len = strlen(key)+1;
 	
-	WFIFOB(login_fd, nlen) = (unsigned char)len;/* won't be higher; the column size is 32 */
+	WFIFOB(chr->login_fd, nlen) = (unsigned char)len;/* won't be higher; the column size is 32 */
 	nlen += 1;
 	
-	safestrncpy((char*)WFIFOP(login_fd,nlen), key, len);
+	safestrncpy((char*)WFIFOP(chr->login_fd,nlen), key, len);
 	nlen += len;
 	
-	WFIFOL(login_fd, nlen) = index;
+	WFIFOL(chr->login_fd, nlen) = index;
 	nlen += 4;
 	
 	if( is_string ) {
-		WFIFOB(login_fd, nlen) = val ? 2 : 3;
+		WFIFOB(chr->login_fd, nlen) = val ? 2 : 3;
 		nlen += 1;
 		
 		if( val ) {
 			char *sval = (char*)val;
 			len = strlen(sval)+1;
 			
-			WFIFOB(login_fd, nlen) = (unsigned char)len;/* won't be higher; the column size is 254 */
+			WFIFOB(chr->login_fd, nlen) = (unsigned char)len;/* won't be higher; the column size is 254 */
 			nlen += 1;
 			
-			safestrncpy((char*)WFIFOP(login_fd,nlen), sval, len);
+			safestrncpy((char*)WFIFOP(chr->login_fd,nlen), sval, len);
 			nlen += len;
 		}
 		
 	} else {
-		WFIFOB(login_fd, nlen) = val ? 0 : 1;
+		WFIFOB(chr->login_fd, nlen) = val ? 0 : 1;
 		nlen += 1;
 		
 		if( val ) {
-			WFIFOL(login_fd, nlen) = (int)val;
+			WFIFOL(chr->login_fd, nlen) = (int)val;
 			nlen += 4;
 		}
 		
 	}
 	
-	WFIFOW(login_fd,12) += 1;
+	WFIFOW(chr->login_fd,12) += 1;
 	
-	WFIFOW(login_fd, 2) = nlen;
-	if( WFIFOW(login_fd, 2) > 60000 ) {
-		int account_id = WFIFOL(login_fd,4), char_id = WFIFOL(login_fd,8);
-		global_accreg_to_login_send();
-		global_accreg_to_login_start(account_id,char_id);/* prepare next */
+	WFIFOW(chr->login_fd, 2) = nlen;
+	if( WFIFOW(chr->login_fd, 2) > 60000 ) {
+		int account_id = WFIFOL(chr->login_fd,4), char_id = WFIFOL(chr->login_fd,8);
+		chr->global_accreg_to_login_send();
+		chr->global_accreg_to_login_start(account_id,char_id);/* prepare next */
 	}
 }
+
 void char_read_fame_list(void) {
 	int i;
 	char* data;
@@ -2795,51 +2849,51 @@ void char_read_fame_list(void) {
 	memset(chemist_fame_list, 0, sizeof(chemist_fame_list));
 	memset(taekwon_fame_list, 0, sizeof(taekwon_fame_list));
 	// Build Blacksmith ranking list
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `char_id`,`fame`,`name` FROM `%s` WHERE `fame`>0 AND (`class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_BLACKSMITH, JOB_WHITESMITH, JOB_BABY_BLACKSMITH, JOB_MECHANIC, JOB_MECHANIC_T, JOB_BABY_MECHANIC, fame_list_size_smith) )
-		Sql_ShowDebug(sql_handle);
-	for( i = 0; i < fame_list_size_smith && SQL_SUCCESS == SQL->NextRow(sql_handle); ++i )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `char_id`,`fame`,`name` FROM `%s` WHERE `fame`>0 AND (`class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_BLACKSMITH, JOB_WHITESMITH, JOB_BABY_BLACKSMITH, JOB_MECHANIC, JOB_MECHANIC_T, JOB_BABY_MECHANIC, fame_list_size_smith) )
+		Sql_ShowDebug(inter->sql_handle);
+	for( i = 0; i < fame_list_size_smith && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++i )
 	{
 		// char_id
-		SQL->GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(inter->sql_handle, 0, &data, NULL);
 		smith_fame_list[i].id = atoi(data);
 		// fame
-		SQL->GetData(sql_handle, 1, &data, &len);
+		SQL->GetData(inter->sql_handle, 1, &data, &len);
 		smith_fame_list[i].fame = atoi(data);
 		// name
-		SQL->GetData(sql_handle, 2, &data, &len);
+		SQL->GetData(inter->sql_handle, 2, &data, &len);
 		memcpy(smith_fame_list[i].name, data, min(len, NAME_LENGTH));
 	}
 	// Build Alchemist ranking list
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `char_id`,`fame`,`name` FROM `%s` WHERE `fame`>0 AND (`class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_ALCHEMIST, JOB_CREATOR, JOB_BABY_ALCHEMIST, JOB_GENETIC, JOB_GENETIC_T, JOB_BABY_GENETIC, fame_list_size_chemist) )
-		Sql_ShowDebug(sql_handle);
-	for( i = 0; i < fame_list_size_chemist && SQL_SUCCESS == SQL->NextRow(sql_handle); ++i )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `char_id`,`fame`,`name` FROM `%s` WHERE `fame`>0 AND (`class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_ALCHEMIST, JOB_CREATOR, JOB_BABY_ALCHEMIST, JOB_GENETIC, JOB_GENETIC_T, JOB_BABY_GENETIC, fame_list_size_chemist) )
+		Sql_ShowDebug(inter->sql_handle);
+	for( i = 0; i < fame_list_size_chemist && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++i )
 	{
 		// char_id
-		SQL->GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(inter->sql_handle, 0, &data, NULL);
 		chemist_fame_list[i].id = atoi(data);
 		// fame
-		SQL->GetData(sql_handle, 1, &data, &len);
+		SQL->GetData(inter->sql_handle, 1, &data, &len);
 		chemist_fame_list[i].fame = atoi(data);
 		// name
-		SQL->GetData(sql_handle, 2, &data, &len);
+		SQL->GetData(inter->sql_handle, 2, &data, &len);
 		memcpy(chemist_fame_list[i].name, data, min(len, NAME_LENGTH));
 	}
 	// Build Taekwon ranking list
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `char_id`,`fame`,`name` FROM `%s` WHERE `fame`>0 AND (`class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_TAEKWON, fame_list_size_taekwon) )
-		Sql_ShowDebug(sql_handle);
-	for( i = 0; i < fame_list_size_taekwon && SQL_SUCCESS == SQL->NextRow(sql_handle); ++i )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `char_id`,`fame`,`name` FROM `%s` WHERE `fame`>0 AND (`class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_TAEKWON, fame_list_size_taekwon) )
+		Sql_ShowDebug(inter->sql_handle);
+	for( i = 0; i < fame_list_size_taekwon && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++i )
 	{
 		// char_id
-		SQL->GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(inter->sql_handle, 0, &data, NULL);
 		taekwon_fame_list[i].id = atoi(data);
 		// fame
-		SQL->GetData(sql_handle, 1, &data, &len);
+		SQL->GetData(inter->sql_handle, 1, &data, &len);
 		taekwon_fame_list[i].fame = atoi(data);
 		// name
-		SQL->GetData(sql_handle, 2, &data, &len);
+		SQL->GetData(inter->sql_handle, 2, &data, &len);
 		memcpy(taekwon_fame_list[i].name, data, min(len, NAME_LENGTH));
 	}
-	SQL->FreeResult(sql_handle);
+	SQL->FreeResult(inter->sql_handle);
 }
 
 // Send map-servers the fame ranking lists
@@ -2871,9 +2925,9 @@ int char_send_fame_list(int fd) {
 	WBUFW(buf, 2) = len;
 
 	if (fd != -1)
-		mapif_send(fd, buf, len);
+		mapif->send(fd, buf, len);
 	else
-		mapif_sendall(buf, len);
+		mapif->sendall(buf, len);
 
 	return 0;
 }
@@ -2884,7 +2938,7 @@ void char_update_fame_list(int type, int index, int fame) {
 	WBUFB(buf,2) = type;
 	WBUFB(buf,3) = index;
 	WBUFL(buf,4) = fame;
-	mapif_sendall(buf, 8);
+	mapif->sendall(buf, 8);
 }
 
 //Loads a character's name and stores it in the buffer given (must be NAME_LENGTH in size)
@@ -2894,11 +2948,11 @@ int char_loadName(int char_id, char* name)
 	char* data;
 	size_t len;
 
-	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `name` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) )
-		Sql_ShowDebug(sql_handle);
-	else if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `name` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) )
+		Sql_ShowDebug(inter->sql_handle);
+	else if( SQL_SUCCESS == SQL->NextRow(inter->sql_handle) )
 	{
-		SQL->GetData(sql_handle, 0, &data, &len);
+		SQL->GetData(inter->sql_handle, 0, &data, &len);
 		safestrncpy(name, data, NAME_LENGTH);
 		return 1;
 	}
@@ -2909,9 +2963,6 @@ int char_loadName(int char_id, char* name)
 	return 0;
 }
 
-int search_mapserver(unsigned short map, uint32 ip, uint16 port);
-
-
 /// Initializes a server structure.
 void mapif_server_init(int id)
 {
@@ -2919,7 +2970,6 @@ void mapif_server_init(int id)
 	server[id].fd = -1;
 }
 
-
 /// Destroys a server structure.
 void mapif_server_destroy(int id)
 {
@@ -2947,49 +2997,917 @@ void mapif_server_reset(int id)
 			WBUFW(buf,10+(j++)*4) = server[id].map[i];
 	if (j > 0) {
 		WBUFW(buf,2) = j * 4 + 10;
-		mapif_sendallwos(fd, buf, WBUFW(buf,2));
+		mapif->sendallwos(fd, buf, WBUFW(buf,2));
 	}
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `index`='%d'", ragsrvinfo_db, server[id].fd) )
-		Sql_ShowDebug(sql_handle);
-	online_char_db->foreach(online_char_db,char_db_setoffline,id); //Tag relevant chars as 'in disconnected' server.
-	mapif_server_destroy(id);
-	mapif_server_init(id);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `index`='%d'", ragsrvinfo_db, server[id].fd) )
+		Sql_ShowDebug(inter->sql_handle);
+	chr->online_char_db->foreach(chr->online_char_db,chr->db_setoffline,id); //Tag relevant chars as 'in disconnected' server.
+	mapif->server_destroy(id);
+	mapif->server_init(id);
 }
 
-
 /// Called when the connection to a Map Server is disconnected.
 void mapif_on_disconnect(int id)
 {
 	ShowStatus("Map-server #%d has disconnected.\n", id);
-	mapif_server_reset(id);
+	mapif->server_reset(id);
 }
 
 void mapif_on_parse_accinfo(int account_id, int u_fd, int u_aid, int u_group, int map_fd) {
-	WFIFOHEAD(login_fd,22);
-	WFIFOW(login_fd,0) = 0x2740;
-	WFIFOL(login_fd,2) = account_id;
-	WFIFOL(login_fd,6) = u_fd;
-	WFIFOL(login_fd,10) = u_aid;
-	WFIFOL(login_fd,14) = u_group;
-	WFIFOL(login_fd,18) = map_fd;
-	WFIFOSET(login_fd,22);
+	WFIFOHEAD(chr->login_fd,22);
+	WFIFOW(chr->login_fd,0) = 0x2740;
+	WFIFOL(chr->login_fd,2) = account_id;
+	WFIFOL(chr->login_fd,6) = u_fd;
+	WFIFOL(chr->login_fd,10) = u_aid;
+	WFIFOL(chr->login_fd,14) = u_group;
+	WFIFOL(chr->login_fd,18) = map_fd;
+	WFIFOSET(chr->login_fd,22);
 }
 
-int parse_frommap(int fd)
+void char_parse_frommap_datasync(int fd)
 {
-	int i, j;
+	sockt->datasync(fd, false);
+	RFIFOSKIP(fd,RFIFOW(fd,2));
+}
+
+void char_parse_frommap_skillid2idx(int fd)
+{
+	memset(&skillid2idx, 0, sizeof(skillid2idx));
+	int i;
+	int j = RFIFOW(fd, 2) - 4;
+	if( j )
+		j /= 4;
+	for(i = 0; i < j; i++) {
+		if( RFIFOW(fd, 4 + (i*4)) > MAX_SKILL_ID ) {
+			ShowWarning("Error skillid2dx[%d] = %d failed, %d is higher than MAX_SKILL_ID (%d)\n",RFIFOW(fd, 4 + (i*4)), RFIFOW(fd, 6 + (i*4)),RFIFOW(fd, 4 + (i*4)),MAX_SKILL_ID);
+			continue;
+		}
+		skillid2idx[RFIFOW(fd, 4 + (i*4))] = RFIFOW(fd, 6 + (i*4));
+	}
+	RFIFOSKIP(fd, RFIFOW(fd, 2));
+}
+
+void char_map_received_ok(int fd)
+{
+	WFIFOHEAD(fd, 3 + NAME_LENGTH);
+	WFIFOW(fd,0) = 0x2afb;
+	WFIFOB(fd,2) = 0;
+	memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH);
+	WFIFOSET(fd,3+NAME_LENGTH);
+}
+
+void char_send_maps(int fd, int id, int j)
+{
+	unsigned char buf[16384];
+	int x;
+	if (j == 0) {
+		ShowWarning("Map-server %d has NO maps.\n", id);
+	} else {
+		// Transmitting maps information to the other map-servers
+		WBUFW(buf,0) = 0x2b04;
+		WBUFW(buf,2) = j * 4 + 10;
+		WBUFL(buf,4) = htonl(server[id].ip);
+		WBUFW(buf,8) = htons(server[id].port);
+		memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 4);
+		mapif->sendallwos(fd, buf, WBUFW(buf,2));
+	}
+	// Transmitting the maps of the other map-servers to the new map-server
+	for(x = 0; x < ARRAYLENGTH(server); x++) {
+		if (server[x].fd > 0 && x != id) {
+			WFIFOHEAD(fd,10 +4*ARRAYLENGTH(server[x].map));
+			WFIFOW(fd,0) = 0x2b04;
+			WFIFOL(fd,4) = htonl(server[x].ip);
+			WFIFOW(fd,8) = htons(server[x].port);
+			j = 0;
+			int i;
+			for(i = 0; i < ARRAYLENGTH(server[x].map); i++)
+				if (server[x].map[i])
+					WFIFOW(fd,10+(j++)*4) = server[x].map[i];
+			if (j > 0) {
+				WFIFOW(fd,2) = j * 4 + 10;
+				WFIFOSET(fd,WFIFOW(fd,2));
+			}
+		}
+	}
+}
+
+void char_parse_frommap_map_names(int fd, int id)
+{
+	if( server[id].map != NULL ) { aFree(server[id].map); server[id].map = NULL; }
+
+	server[id].maps = ( RFIFOW(fd, 2) - 4 ) / 4;
+	CREATE(server[id].map, unsigned short, server[id].maps);
+
+	int i;
+	int j = 0;
+	for(i = 4; i < RFIFOW(fd,2); i += 4) {
+		server[id].map[j] = RFIFOW(fd,i);
+		j++;
+	}
+
+	ShowStatus("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
+				id, j, CONVIP(server[id].ip), server[id].port);
+	ShowStatus("Map-server %d loading complete.\n", id);
+
+	// send name for wisp to player
+	chr->map_received_ok(fd);
+	chr->send_fame_list(fd); //Send fame list.
+	chr->send_maps(fd, id, j);
+	RFIFOSKIP(fd,RFIFOW(fd,2));
+}
+
+void char_send_scdata(int fd, int aid, int cid)
+{
+	#ifdef ENABLE_SC_SAVING
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `type`, `tick`, `val1`, `val2`, `val3`, `val4` "
+		"FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'",
+		scdata_db, aid, cid) )
+	{
+		Sql_ShowDebug(inter->sql_handle);
+		return;
+	}
+	if( SQL->NumRows(inter->sql_handle) > 0 ) {
+		struct status_change_data scdata;
+		int count;
+		char* data;
+
+		memset(&scdata, 0, sizeof(scdata));
+		WFIFOHEAD(fd,14+50*sizeof(struct status_change_data));
+		WFIFOW(fd,0) = 0x2b1d;
+		WFIFOL(fd,4) = aid;
+		WFIFOL(fd,8) = cid;
+		for( count = 0; count < 50 && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++count )
+		{
+			SQL->GetData(inter->sql_handle, 0, &data, NULL); scdata.type = atoi(data);
+			SQL->GetData(inter->sql_handle, 1, &data, NULL); scdata.tick = atoi(data);
+			SQL->GetData(inter->sql_handle, 2, &data, NULL); scdata.val1 = atoi(data);
+			SQL->GetData(inter->sql_handle, 3, &data, NULL); scdata.val2 = atoi(data);
+			SQL->GetData(inter->sql_handle, 4, &data, NULL); scdata.val3 = atoi(data);
+			SQL->GetData(inter->sql_handle, 5, &data, NULL); scdata.val4 = atoi(data);
+			memcpy(WFIFOP(fd, 14+count*sizeof(struct status_change_data)), &scdata, sizeof(struct status_change_data));
+		}
+		if (count >= 50)
+			ShowWarning("Too many status changes for %d:%d, some of them were not loaded.\n", aid, cid);
+		if (count > 0) {
+			WFIFOW(fd,2) = 14 + count*sizeof(struct status_change_data);
+			WFIFOW(fd,12) = count;
+			WFIFOSET(fd,WFIFOW(fd,2));
+
+			//Clear the data once loaded.
+			if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, aid, cid) )
+				Sql_ShowDebug(inter->sql_handle);
+		}
+	} else { //no sc (needs a response)
+		WFIFOHEAD(fd,14);
+		WFIFOW(fd,0) = 0x2b1d;
+		WFIFOW(fd,2) = 14;
+		WFIFOL(fd,4) = aid;
+		WFIFOL(fd,8) = cid;
+		WFIFOW(fd,12) = 0;
+		WFIFOSET(fd,WFIFOW(fd,2));
+	}
+	SQL->FreeResult(inter->sql_handle);
+	#endif
+}
+
+void char_parse_frommap_request_scdata(int fd)
+{
+	#ifdef ENABLE_SC_SAVING
+	int aid = RFIFOL(fd,2);
+	int cid = RFIFOL(fd,6);
+	chr->send_scdata(fd, aid, cid);
+	#endif
+	RFIFOSKIP(fd, 10);
+}
+
+void char_parse_frommap_set_users_count(int fd, int id)
+{
+	if (RFIFOW(fd,2) != server[id].users) {
+		server[id].users = RFIFOW(fd,2);
+		ShowInfo("User Count: %d (Server: %d)\n", server[id].users, id);
+	}
+	RFIFOSKIP(fd, 4);
+}
+
+void char_parse_frommap_set_users(int fd, int id)
+{
+	//TODO: When data mismatches memory, update guild/party online/offline states.
+	int aid, cid;
+	struct online_char_data* character;
+
+	server[id].users = RFIFOW(fd,4);
+	chr->online_char_db->foreach(chr->online_char_db,chr->db_setoffline,id); //Set all chars from this server as 'unknown'
+	int i;
+	for(i = 0; i < server[id].users; i++) {
+		aid = RFIFOL(fd,6+i*8);
+		cid = RFIFOL(fd,6+i*8+4);
+		character = idb_ensure(chr->online_char_db, aid, chr->create_online_char_data);
+		if( character->server > -1 && character->server != id )
+		{
+			ShowNotice("Set map user: Character (%d:%d) marked on map server %d, but map server %d claims to have (%d:%d) online!\n",
+				character->account_id, character->char_id, character->server, id, aid, cid);
+			mapif->disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
+		}
+		character->server = id;
+		character->char_id = cid;
+	}
+	//If any chars remain in -2, they will be cleaned in the cleanup timer.
+	RFIFOSKIP(fd,RFIFOW(fd,2));
+}
+
+void char_save_character_ack(int fd, int aid, int cid)
+{
+	WFIFOHEAD(fd,10);
+	WFIFOW(fd,0) = 0x2b21; //Save ack only needed on final save.
+	WFIFOL(fd,2) = aid;
+	WFIFOL(fd,6) = cid;
+	WFIFOSET(fd,10);
+}
+
+void char_parse_frommap_save_character(int fd, int id)
+{
+	int aid = RFIFOL(fd,4), cid = RFIFOL(fd,8), size = RFIFOW(fd,2);
+	struct online_char_data* character;
+
+	if (size - 13 != sizeof(struct mmo_charstatus)) {
+		ShowError("parse_from_map (save-char): Size mismatch! %d != %"PRIuS"\n", size-13, sizeof(struct mmo_charstatus));
+		RFIFOSKIP(fd,size);
+		return;
+	}
+	//Check account only if this ain't final save. Final-save goes through because of the char-map reconnect
+	if (RFIFOB(fd,12) || (
+		(character = (struct online_char_data*)idb_get(chr->online_char_db, aid)) != NULL &&
+		character->char_id == cid))
+	{
+		struct mmo_charstatus char_dat;
+		memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
+		chr->mmo_char_tosql(cid, &char_dat);
+	} else {	//This may be valid on char-server reconnection, when re-sending characters that already logged off.
+		ShowError("parse_from_map (save-char): Received data for non-existing/offline character (%d:%d).\n", aid, cid);
+		chr->set_char_online(id, cid, aid);
+	}
+
+	if (RFIFOB(fd,12))
+	{	//Flag, set character offline after saving. [Skotlex]
+		chr->set_char_offline(cid, aid);
+		chr->save_character_ack(fd, aid, cid);
+	}
+	RFIFOSKIP(fd,size);
+}
+
+// 0 - not ok
+// 1 - ok
+void char_select_ack(int fd, int account_id, uint8 flag)
+{
+	WFIFOHEAD(fd,7);
+	WFIFOW(fd,0) = 0x2b03;
+	WFIFOL(fd,2) = account_id;
+	WFIFOB(fd,6) = flag;
+	WFIFOSET(fd,7);
+}
+
+void char_parse_frommap_char_select_req(int fd)
+{
+	int account_id = RFIFOL(fd,2);
+	uint32 login_id1 = RFIFOL(fd,6);
+	uint32 login_id2 = RFIFOL(fd,10);
+	uint32 ip = RFIFOL(fd,14);
+	int32 group_id = RFIFOL(fd, 18);
+	RFIFOSKIP(fd,22);
+
+	if( runflag != CHARSERVER_ST_RUNNING )
+	{
+		chr->select_ack(fd, account_id, 0);
+	}
+	else
+	{
+		struct char_auth_node* node;
+
+		// create temporary auth entry
+		CREATE(node, struct char_auth_node, 1);
+		node->account_id = account_id;
+		node->char_id = 0;
+		node->login_id1 = login_id1;
+		node->login_id2 = login_id2;
+		node->group_id = group_id;
+		//node->sex = 0;
+		node->ip = ntohl(ip);
+		/* sounds troublesome. */
+		//node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
+		//node->gmlevel = 0;
+		idb_put(auth_db, account_id, node);
+
+		//Set char to "@ char select" in online db [Kevin]
+		chr->set_char_charselect(account_id);
+		chr->select_ack(fd, account_id, 1);
+	}
+}
+
+void char_change_map_server_ack(int fd, uint8 *data, bool ok)
+{
+	WFIFOHEAD(fd,30);
+	WFIFOW(fd,0) = 0x2b06;
+	memcpy(WFIFOP(fd,2), data, 28);
+	if (!ok)
+		WFIFOL(fd,6) = 0; //Set login1 to 0.
+	WFIFOSET(fd,30);
+}
+
+void char_parse_frommap_change_map_server(int fd)
+{
+	int map_id, map_fd = -1;
+	struct mmo_charstatus* char_data;
+
+	map_id = chr->search_mapserver(RFIFOW(fd,18), ntohl(RFIFOL(fd,24)), ntohs(RFIFOW(fd,28))); //Locate mapserver by ip and port.
+	if (map_id >= 0)
+		map_fd = server[map_id].fd;
+	//Char should just had been saved before this packet, so this should be safe. [Skotlex]
+	char_data = (struct mmo_charstatus*)uidb_get(chr->char_db_,RFIFOL(fd,14));
+	if (char_data == NULL) {	//Really shouldn't happen.
+		struct mmo_charstatus char_dat;
+		chr->mmo_char_fromsql(RFIFOL(fd,14), &char_dat, true);
+		char_data = (struct mmo_charstatus*)uidb_get(chr->char_db_,RFIFOL(fd,14));
+	}
+
+	if( runflag == CHARSERVER_ST_RUNNING &&
+		session_isActive(map_fd) &&
+		char_data )
+	{	//Send the map server the auth of this player.
+		struct online_char_data* data;
+		struct char_auth_node* node;
+
+		//Update the "last map" as this is where the player must be spawned on the new map server.
+		char_data->last_point.map = RFIFOW(fd,18);
+		char_data->last_point.x = RFIFOW(fd,20);
+		char_data->last_point.y = RFIFOW(fd,22);
+		char_data->sex = RFIFOB(fd,30);
+
+		// create temporary auth entry
+		CREATE(node, struct char_auth_node, 1);
+		node->account_id = RFIFOL(fd,2);
+		node->char_id = RFIFOL(fd,14);
+		node->login_id1 = RFIFOL(fd,6);
+		node->login_id2 = RFIFOL(fd,10);
+		node->sex = RFIFOB(fd,30);
+		node->expiration_time = 0; // FIXME (this thing isn't really supported we could as well purge it instead of fixing)
+		node->ip = ntohl(RFIFOL(fd,31));
+		node->group_id = RFIFOL(fd,35);
+		node->changing_mapservers = 1;
+		idb_put(auth_db, RFIFOL(fd,2), node);
+
+		data = idb_ensure(chr->online_char_db, RFIFOL(fd,2), chr->create_online_char_data);
+		data->char_id = char_data->char_id;
+		data->server = map_id; //Update server where char is.
+
+		//Reply with an ack.
+		chr->change_map_server_ack(fd, RFIFOP(fd,2), true);
+	} else { //Reply with nak
+		chr->change_map_server_ack(fd, RFIFOP(fd,2), false);
+	}
+	RFIFOSKIP(fd,39);
+}
+
+void char_parse_frommap_remove_friend(int fd)
+{
+	int char_id = RFIFOL(fd,2);
+	int friend_id = RFIFOL(fd,6);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d' AND `friend_id`='%d' LIMIT 1",
+		friend_db, char_id, friend_id) ) {
+		Sql_ShowDebug(inter->sql_handle);
+	}
+	RFIFOSKIP(fd,10);
+}
+
+void char_char_name_ack(int fd, int char_id)
+{
+	WFIFOHEAD(fd,30);
+	WFIFOW(fd,0) = 0x2b09;
+	WFIFOL(fd,2) = char_id;
+	chr->loadName(char_id, (char*)WFIFOP(fd,6));
+	WFIFOSET(fd,30);
+}
+
+void char_parse_frommap_char_name_request(int fd)
+{
+	chr->char_name_ack(fd, RFIFOL(fd,2));
+	RFIFOSKIP(fd,6);
+}
+
+void char_parse_frommap_change_email(int fd)
+{
+	if (chr->login_fd > 0) { // don't send request if no login-server
+		WFIFOHEAD(chr->login_fd,86);
+		memcpy(WFIFOP(chr->login_fd,0), RFIFOP(fd,0),86); // 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
+		WFIFOW(chr->login_fd,0) = 0x2722;
+		WFIFOSET(chr->login_fd,86);
+	}
+	RFIFOSKIP(fd, 86);
+}
+
+void loginif_block_account(int account_id, int flag)
+{
+	WFIFOHEAD(chr->login_fd,10);
+	WFIFOW(chr->login_fd,0) = 0x2724;
+	WFIFOL(chr->login_fd,2) = account_id;
+	WFIFOL(chr->login_fd,6) = flag; // new account status
+	WFIFOSET(chr->login_fd,10);
+}
+
+void loginif_ban_account(int account_id, short year, short month, short day, short hour, short minute, short second)
+{
+	WFIFOHEAD(chr->login_fd,18);
+	WFIFOW(chr->login_fd, 0) = 0x2725;
+	WFIFOL(chr->login_fd, 2) = account_id;
+	WFIFOW(chr->login_fd, 6) = year;
+	WFIFOW(chr->login_fd, 8) = month;
+	WFIFOW(chr->login_fd,10) = day;
+	WFIFOW(chr->login_fd,12) = hour;
+	WFIFOW(chr->login_fd,14) = minute;
+	WFIFOW(chr->login_fd,16) = second;
+	WFIFOSET(chr->login_fd,18);
+}
+
+void loginif_unban_account(int account_id)
+{
+	WFIFOHEAD(chr->login_fd,6);
+	WFIFOW(chr->login_fd,0) = 0x272a;
+	WFIFOL(chr->login_fd,2) = account_id;
+	WFIFOSET(chr->login_fd,6);
+}
+
+void loginif_changesex(int account_id)
+{
+	WFIFOHEAD(chr->login_fd,6);
+	WFIFOW(chr->login_fd,0) = 0x2727;
+	WFIFOL(chr->login_fd,2) = account_id;
+	WFIFOSET(chr->login_fd,6);
+}
+
+void mapif_char_ban(int char_id, time_t timestamp)
+{
+	unsigned char buf[11];
+	WBUFW(buf,0) = 0x2b14;
+	WBUFL(buf,2) = char_id;
+	WBUFB(buf,6) = 2;
+	WBUFL(buf,7) = (unsigned int)timestamp;
+	mapif->sendall(buf, 11);
+}
+
+void char_ban(int account_id, int char_id, time_t *unban_time, short year, short month, short day, short hour, short minute, short second)
+{
+	time_t timestamp;
+	struct tm *tmtime;
+	SqlStmt* stmt = SQL->StmtMalloc(inter->sql_handle);
+
+	if (*unban_time == 0 || *unban_time < time(NULL))
+		timestamp = time(NULL); // new ban
+	else
+		timestamp = *unban_time; // add to existing ban
+
+	tmtime = localtime(&timestamp);
+	tmtime->tm_year = tmtime->tm_year + year;
+	tmtime->tm_mon  = tmtime->tm_mon + month;
+	tmtime->tm_mday = tmtime->tm_mday + day;
+	tmtime->tm_hour = tmtime->tm_hour + hour;
+	tmtime->tm_min  = tmtime->tm_min + minute;
+	tmtime->tm_sec  = tmtime->tm_sec + second;
+	timestamp = mktime(tmtime);
+
+	if( SQL_SUCCESS != SQL->StmtPrepare(stmt,
+										"UPDATE `%s` SET `unban_time` = ? WHERE `char_id` = ? LIMIT 1",
+										char_db)
+	   || SQL_SUCCESS != SQL->StmtBindParam(stmt,  0, SQLDT_LONG,   (void*)&timestamp,   sizeof(timestamp))
+	   || SQL_SUCCESS != SQL->StmtBindParam(stmt,  1, SQLDT_INT,    (void*)&char_id,     sizeof(char_id))
+	   || SQL_SUCCESS != SQL->StmtExecute(stmt)
+
+	   ) {
+		SqlStmt_ShowDebug(stmt);
+	}
+
+	SQL->StmtFree(stmt);
+
+	// condition applies; send to all map-servers to disconnect the player
+	if( timestamp > time(NULL) ) {
+		mapif->char_ban(char_id, timestamp);
+		// disconnect player if online on char-server
+		chr->disconnect_player(account_id);
+	}
+}
+
+void char_unban(int char_id, int *result)
+{
+	/* handled by char server, so no redirection */
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `unban_time` = '0' WHERE `char_id` = '%d' LIMIT 1", char_db, char_id) ) {
+		Sql_ShowDebug(inter->sql_handle);
+		*result = 1;
+	}
+}
+
+void char_ask_name_ack(int fd, int acc, const char* name, int type, int result)
+{
+	WFIFOHEAD(fd,34);
+	WFIFOW(fd, 0) = 0x2b0f;
+	WFIFOL(fd, 2) = acc;
+	safestrncpy((char*)WFIFOP(fd,6), name, NAME_LENGTH);
+	WFIFOW(fd,30) = type;
+	WFIFOW(fd,32) = result;
+	WFIFOSET(fd,34);
+}
+
+void char_parse_frommap_change_account(int fd)
+{
+	int result = 0; // 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
+	char esc_name[NAME_LENGTH*2+1];
+
+	int acc = RFIFOL(fd,2); // account_id of who ask (-1 if server itself made this request)
+	const char* name = (char*)RFIFOP(fd,6); // name of the target character
+	int type = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban, 5 changesex, 6 charban, 7 charunban
+	short year = RFIFOW(fd,32);
+	short month = RFIFOW(fd,34);
+	short day = RFIFOW(fd,36);
+	short hour = RFIFOW(fd,38);
+	short minute = RFIFOW(fd,40);
+	short second = RFIFOW(fd,42);
+	RFIFOSKIP(fd,44);
+
+	SQL->EscapeStringLen(inter->sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `account_id`,`char_id`,`unban_time` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
+		Sql_ShowDebug(inter->sql_handle);
+	else if( SQL->NumRows(inter->sql_handle) == 0 ) {
+		result = 1; // 1-player not found
+	} else if( SQL_SUCCESS != SQL->NextRow(inter->sql_handle) ) {
+		Sql_ShowDebug(inter->sql_handle);
+		result = 1; // 1-player not found
+	} else {
+		int account_id, char_id;
+		char* data;
+		time_t unban_time;
+
+		SQL->GetData(inter->sql_handle, 0, &data, NULL); account_id = atoi(data);
+		SQL->GetData(inter->sql_handle, 1, &data, NULL); char_id = atoi(data);
+		SQL->GetData(inter->sql_handle, 2, &data, NULL); unban_time = atol(data);
+
+		if( chr->login_fd <= 0 )
+			result = 3; // 3-login-server offline
+		//FIXME: need to move this check to login server [ultramage]
+	//	else
+	//	if( acc != -1 && isGM(acc) < isGM(account_id) )
+	//		result = 2; // 2-gm level too low
+		else {
+			switch( type ) {
+				case 1: // block
+						loginif->block_account(account_id, 5);
+				break;
+				case 2: // ban
+						loginif->ban_account(account_id, year, month, day, hour, minute, second);
+				break;
+				case 3: // unblock
+						loginif->block_account(account_id, 0);
+				break;
+				case 4: // unban
+						loginif->unban_account(account_id);
+				break;
+				case 5: // changesex
+						loginif->changesex(account_id);
+				break;
+				case 6: //char ban
+				/* handled by char server, so no redirection */
+				{
+					chr->ban(account_id, char_id, &unban_time, year, month, day, hour, minute, second);
+				}
+				break;
+			case 7: //char unban
+				chr->unban(char_id, &result);
+				break;
+
+			}
+		}
+	}
+
+	SQL->FreeResult(inter->sql_handle);
+
+	// send answer if a player ask, not if the server ask
+	if( acc != -1 && type != 5 ) { // Don't send answer for changesex
+		chr->ask_name_ack(fd, acc, name, type, result);
+	}
+}
+
+void char_parse_frommap_fame_list(int fd)
+{
+	int cid = RFIFOL(fd, 2);
+	int fame = RFIFOL(fd, 6);
+	char type = RFIFOB(fd, 10);
+	int size;
+	struct fame_list* list;
+	int player_pos;
+	int fame_pos;
+
+	switch(type) {
+		case RANKTYPE_BLACKSMITH: size = fame_list_size_smith;   list = smith_fame_list;   break;
+		case RANKTYPE_ALCHEMIST:  size = fame_list_size_chemist; list = chemist_fame_list; break;
+		case RANKTYPE_TAEKWON:    size = fame_list_size_taekwon; list = taekwon_fame_list; break;
+		default:                  size = 0;                      list = NULL;              break;
+	}
+
+	ARR_FIND(0, size, player_pos, list[player_pos].id == cid);// position of the player
+	ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);// where the player should be
+
+	if( player_pos == size && fame_pos == size )
+		;// not on list and not enough fame to get on it
+	else if( fame_pos == player_pos ) {
+		// same position
+		list[player_pos].fame = fame;
+		chr->update_fame_list(type, player_pos, fame);
+	} else {
+		// move in the list
+		if( player_pos == size ) {
+			// new ranker - not in the list
+			ARR_MOVE(size - 1, fame_pos, list, struct fame_list);
+			list[fame_pos].id = cid;
+			list[fame_pos].fame = fame;
+			chr->loadName(cid, list[fame_pos].name);
+		} else {
+			// already in the list
+			if( fame_pos == size )
+				--fame_pos;// move to the end of the list
+			ARR_MOVE(player_pos, fame_pos, list, struct fame_list);
+			list[fame_pos].fame = fame;
+		}
+		chr->send_fame_list(-1);
+	}
+
+	RFIFOSKIP(fd,11);
+}
+
+void char_parse_frommap_divorce_char(int fd)
+{
+	chr->divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
+	RFIFOSKIP(fd,10);
+}
+
+void char_parse_frommap_ragsrvinfo(int fd)
+{
+	char esc_server_name[sizeof(server_name)*2+1];
+
+	SQL->EscapeString(inter->sql_handle, esc_server_name, server_name);
+
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "INSERT INTO `%s` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d'",
+		ragsrvinfo_db, fd, esc_server_name, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)) )
+	{
+		Sql_ShowDebug(inter->sql_handle);
+	}
+	RFIFOSKIP(fd,14);
+}
+
+void char_parse_frommap_set_char_offline(int fd)
+{
+	chr->set_char_offline(RFIFOL(fd,2),RFIFOL(fd,6));
+	RFIFOSKIP(fd,10);
+}
+
+void char_parse_frommap_set_all_offline(int fd, int id)
+{
+	chr->set_all_offline(id);
+	RFIFOSKIP(fd,2);
+}
+
+void char_parse_frommap_set_char_online(int fd, int id)
+{
+	chr->set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6));
+	RFIFOSKIP(fd,10);
+}
+
+void char_parse_frommap_build_fame_list(int fd)
+{
+	chr->read_fame_list();
+	chr->send_fame_list(-1);
+	RFIFOSKIP(fd,2);
+}
+
+void char_parse_frommap_save_status_change_data(int fd)
+{
+	#ifdef ENABLE_SC_SAVING
+	int aid = RFIFOL(fd, 4);
+	int cid = RFIFOL(fd, 8);
+	int count = RFIFOW(fd, 12);
+
+	/* clear; ensure no left overs e.g. permanent */
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, aid, cid) )
+		Sql_ShowDebug(inter->sql_handle);
+
+	if( count > 0 )
+	{
+		struct status_change_data data;
+		StringBuf buf;
+
+		StrBuf->Init(&buf);
+		StrBuf->Printf(&buf, "INSERT INTO `%s` (`account_id`, `char_id`, `type`, `tick`, `val1`, `val2`, `val3`, `val4`) VALUES ", scdata_db);
+		int i;
+		for( i = 0; i < count; ++i )
+		{
+			memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
+			if( i > 0 )
+				StrBuf->AppendStr(&buf, ", ");
+			StrBuf->Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
+				data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
+		}
+		if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)) )
+			Sql_ShowDebug(inter->sql_handle);
+		StrBuf->Destroy(&buf);
+	}
+	#endif
+	RFIFOSKIP(fd, RFIFOW(fd, 2));
+}
+
+void char_send_pong(int fd)
+{
+	WFIFOHEAD(fd,2);
+	WFIFOW(fd,0) = 0x2b24;
+	WFIFOSET(fd,2);
+}
+
+void char_parse_frommap_ping(int fd)
+{
+	chr->send_pong(fd);
+	RFIFOSKIP(fd,2);
+}
+
+void char_map_auth_ok(int fd, int account_id, struct char_auth_node* node, struct mmo_charstatus* cd)
+{
+	WFIFOHEAD(fd,25 + sizeof(struct mmo_charstatus));
+	WFIFOW(fd,0) = 0x2afd;
+	WFIFOW(fd,2) = 25 + sizeof(struct mmo_charstatus);
+	WFIFOL(fd,4) = account_id;
+	if (node)
+	{
+		WFIFOL(fd,8) = node->login_id1;
+		WFIFOL(fd,12) = node->login_id2;
+		WFIFOL(fd,16) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
+		WFIFOL(fd,20) = node->group_id;
+		WFIFOB(fd,24) = node->changing_mapservers;
+	}
+	else
+	{
+		WFIFOL(fd,8) = 0;
+		WFIFOL(fd,12) = 0;
+		WFIFOL(fd,16) = 0;
+		WFIFOL(fd,20) = 0;
+		WFIFOB(fd,24) = 0;
+	}
+	memcpy(WFIFOP(fd,25), cd, sizeof(struct mmo_charstatus));
+	WFIFOSET(fd, WFIFOW(fd,2));
+}
+
+void char_map_auth_failed(int fd, int account_id, int char_id, int login_id1, char sex, uint32 ip)
+{
+	WFIFOHEAD(fd,19);
+	WFIFOW(fd,0) = 0x2b27;
+	WFIFOL(fd,2) = account_id;
+	WFIFOL(fd,6) = char_id;
+	WFIFOL(fd,10) = login_id1;
+	WFIFOB(fd,14) = sex;
+	WFIFOL(fd,15) = htonl(ip);
+	WFIFOSET(fd,19);
+}
+
+void char_parse_frommap_auth_request(int fd, int id)
+{
+	struct mmo_charstatus char_dat;
+
+	int account_id  = RFIFOL(fd,2);
+	int char_id     = RFIFOL(fd,6);
+	int login_id1   = RFIFOL(fd,10);
+	char sex        = RFIFOB(fd,14);
+	uint32 ip       = ntohl(RFIFOL(fd,15));
+	char standalone = RFIFOB(fd, 19);
+	RFIFOSKIP(fd,20);
+
+	struct char_auth_node* node = (struct char_auth_node*)idb_get(auth_db, account_id);
+	struct mmo_charstatus* cd = (struct mmo_charstatus*)uidb_get(chr->char_db_,char_id);
+
+	if( cd == NULL ) { //Really shouldn't happen.
+		chr->mmo_char_fromsql(char_id, &char_dat, true);
+		cd = (struct mmo_charstatus*)uidb_get(chr->char_db_,char_id);
+	}
+
+	if( runflag == CHARSERVER_ST_RUNNING && cd && standalone ) {
+		cd->sex = sex;
+
+		chr->map_auth_ok(fd, account_id, NULL, cd);
+		chr->set_char_online(id, char_id, account_id);
+		return;
+	}
+
+	if( runflag == CHARSERVER_ST_RUNNING &&
+		cd != NULL &&
+		node != NULL &&
+		node->account_id == account_id &&
+		node->char_id == char_id &&
+		node->login_id1 == login_id1 /*&&
+		node->sex == sex &&
+		node->ip == ip*/ )
+	{// auth ok
+		if( cd->sex == 99 )
+			cd->sex = sex;
+
+		chr->map_auth_ok(fd, account_id, node, cd);
+		// only use the auth once and mark user online
+		idb_remove(auth_db, account_id);
+		chr->set_char_online(id, char_id, account_id);
+	}
+	else
+	{// auth failed
+		chr->map_auth_failed(fd, account_id, char_id, login_id1, sex, ip);
+	}
+}
+
+void char_parse_frommap_update_ip(int fd, int id)
+{
+	server[id].ip = ntohl(RFIFOL(fd, 2));
+	ShowInfo("Updated IP address of map-server #%d to %d.%d.%d.%d.\n", id, CONVIP(server[id].ip));
+	RFIFOSKIP(fd,6);
+}
+
+void char_parse_frommap_request_stats_report(int fd)
+{
+	int sfd;/* stat server fd */
+	struct hSockOpt opt;
+	RFIFOSKIP(fd, 2);/* we skip first 2 bytes which are the 0x3008, so we end up with a buffer equal to the one we send */
+
+	opt.silent = 1;
+	opt.setTimeo = 1;
+
+	if( (sfd = make_connection(host2ip("stats.hercules.ws"),(uint16)25427,&opt) ) == -1 ) {
+		RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+		RFIFOFLUSH(fd);
+		return;/* connection not possible, we drop the report */
+	}
+
+	session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
+	realloc_fifo(sfd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+
+	WFIFOHEAD(sfd, RFIFOW(fd,2) );
+
+	memcpy((char*)WFIFOP(sfd,0), (char*)RFIFOP(fd, 0), RFIFOW(fd,2));
+
+	WFIFOSET(sfd, RFIFOW(fd,2) );
+
+	flush_fifo(sfd);
+
+	do_close(sfd);
+
+	RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+	RFIFOFLUSH(fd);
+}
+
+void char_parse_frommap_scdata_update(int fd)
+{
+	int account_id = RFIFOL(fd, 2);
+	int char_id = RFIFOL(fd, 6);
+	int val1 = RFIFOL(fd, 12);
+	int val2 = RFIFOL(fd, 16);
+	int val3 = RFIFOL(fd, 20);
+	int val4 = RFIFOL(fd, 24);
+	short type = RFIFOW(fd, 10);
+
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "REPLACE INTO `%s` (`account_id`,`char_id`,`type`,`tick`,`val1`,`val2`,`val3`,`val4`) VALUES ('%d','%d','%d',-1,'%d','%d','%d','%d')",
+								scdata_db, account_id, char_id, type, val1, val2, val3, val4) )
+	{
+		Sql_ShowDebug(inter->sql_handle);
+	}
+	RFIFOSKIP(fd, 28);
+}
+
+void char_parse_frommap_scdata_delete(int fd)
+{
+	int account_id = RFIFOL(fd, 2);
+	int char_id = RFIFOL(fd, 6);
+	short type = RFIFOW(fd, 10);
+
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id` = '%d' AND `type` = '%d' LIMIT 1",
+								scdata_db, account_id, char_id, type) )
+	{
+		Sql_ShowDebug(inter->sql_handle);
+	}
+	RFIFOSKIP(fd, 12);
+}
+
+int char_parse_frommap(int fd)
+{
+	int i;
 	int id;
 
 	ARR_FIND( 0, ARRAYLENGTH(server), id, server[id].fd == fd );
 	if( id == ARRAYLENGTH(server) ) {// not a map server
-		ShowDebug("parse_frommap: Disconnecting invalid session #%d (is not a map-server)\n", fd);
+		ShowDebug("chr->parse_frommap: Disconnecting invalid session #%d (is not a map-server)\n", fd);
 		do_close(fd);
 		return 0;
 	}
 	if( session[fd]->flag.eof ) {
 		do_close(fd);
 		server[id].fd = -1;
-		mapif_on_disconnect(id);
+		mapif->on_disconnect(id);
 		return 0;
 	}
 
@@ -3007,184 +3925,39 @@ int parse_frommap(int fd)
 			case 0x2b0a:
 				if( RFIFOREST(fd) < RFIFOW(fd, 2) )
 					return 0;
-				sockt->datasync(fd, false);
-				RFIFOSKIP(fd,RFIFOW(fd,2));
+				chr->parse_frommap_datasync(fd);
 				break;
 
 			case 0x2b0b:
 				if( RFIFOREST(fd) < RFIFOW(fd, 2) )
 					return 0;
-				memset(&skillid2idx, 0, sizeof(skillid2idx));
-				j = RFIFOW(fd, 2) - 4;
-				if( j )
-					j /= 4;
-				for(i = 0; i < j; i++) {
-					if( RFIFOW(fd, 4 + (i*4)) > MAX_SKILL_ID ) {
-						ShowWarning("Error skillid2dx[%d] = %d failed, %d is higher than MAX_SKILL_ID (%d)\n",RFIFOW(fd, 4 + (i*4)), RFIFOW(fd, 6 + (i*4)),RFIFOW(fd, 4 + (i*4)),MAX_SKILL_ID);
-						continue;
-					}
-					skillid2idx[RFIFOW(fd, 4 + (i*4))] = RFIFOW(fd, 6 + (i*4));
-				}
-				RFIFOSKIP(fd, RFIFOW(fd, 2));
+				chr->parse_frommap_skillid2idx(fd);
 				break;
 			case 0x2afa: // Receiving map names list from the map-server
 				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 					return 0;
-				if( server[id].map != NULL ) { aFree(server[id].map); server[id].map = NULL; }
-				
-				server[id].maps = ( RFIFOW(fd, 2) - 4 ) / 4;
-				CREATE(server[id].map, unsigned short, server[id].maps);
-				
-				j = 0;
-				for(i = 4; i < RFIFOW(fd,2); i += 4) {
-					server[id].map[j] = RFIFOW(fd,i);
-					j++;
-				}
-
-				ShowStatus("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
-							id, j, CONVIP(server[id].ip), server[id].port);
-				ShowStatus("Map-server %d loading complete.\n", id);
-
-				// send name for wisp to player
-				WFIFOHEAD(fd, 3 + NAME_LENGTH);
-				WFIFOW(fd,0) = 0x2afb;
-				WFIFOB(fd,2) = 0;
-				memcpy(WFIFOP(fd,3), wisp_server_name, NAME_LENGTH);
-				WFIFOSET(fd,3+NAME_LENGTH);
-
-				char_send_fame_list(fd); //Send fame list.
-
-				{
-				unsigned char buf[16384];
-				int x;
-				if (j == 0) {
-					ShowWarning("Map-server %d has NO maps.\n", id);
-				} else {
-					// Transmitting maps information to the other map-servers
-					WBUFW(buf,0) = 0x2b04;
-					WBUFW(buf,2) = j * 4 + 10;
-					WBUFL(buf,4) = htonl(server[id].ip);
-					WBUFW(buf,8) = htons(server[id].port);
-					memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 4);
-					mapif_sendallwos(fd, buf, WBUFW(buf,2));
-				}
-				// Transmitting the maps of the other map-servers to the new map-server
-				for(x = 0; x < ARRAYLENGTH(server); x++) {
-					if (server[x].fd > 0 && x != id) {
-						WFIFOHEAD(fd,10 +4*ARRAYLENGTH(server[x].map));
-						WFIFOW(fd,0) = 0x2b04;
-						WFIFOL(fd,4) = htonl(server[x].ip);
-						WFIFOW(fd,8) = htons(server[x].port);
-						j = 0;
-						for(i = 0; i < ARRAYLENGTH(server[x].map); i++)
-							if (server[x].map[i])
-								WFIFOW(fd,10+(j++)*4) = server[x].map[i];
-						if (j > 0) {
-							WFIFOW(fd,2) = j * 4 + 10;
-							WFIFOSET(fd,WFIFOW(fd,2));
-						}
-					}
-				}
-				}
-				RFIFOSKIP(fd,RFIFOW(fd,2));
+				chr->parse_frommap_map_names(fd, id);
 			break;
 
 			case 0x2afc: //Packet command is now used for sc_data request. [Skotlex]
 				if (RFIFOREST(fd) < 10)
 					return 0;
 			{
-	#ifdef ENABLE_SC_SAVING
-				int aid, cid;
-				aid = RFIFOL(fd,2);
-				cid = RFIFOL(fd,6);
-				if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `type`, `tick`, `val1`, `val2`, `val3`, `val4` "
-					"FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'",
-					scdata_db, aid, cid) )
-				{
-					Sql_ShowDebug(sql_handle);
-					break;
-				}
-				if( SQL->NumRows(sql_handle) > 0 ) {
-					struct status_change_data scdata;
-					int count;
-					char* data;
-
-					memset(&scdata, 0, sizeof(scdata));
-					WFIFOHEAD(fd,14+50*sizeof(struct status_change_data));
-					WFIFOW(fd,0) = 0x2b1d;
-					WFIFOL(fd,4) = aid;
-					WFIFOL(fd,8) = cid;
-					for( count = 0; count < 50 && SQL_SUCCESS == SQL->NextRow(sql_handle); ++count )
-					{
-						SQL->GetData(sql_handle, 0, &data, NULL); scdata.type = atoi(data);
-						SQL->GetData(sql_handle, 1, &data, NULL); scdata.tick = atoi(data);
-						SQL->GetData(sql_handle, 2, &data, NULL); scdata.val1 = atoi(data);
-						SQL->GetData(sql_handle, 3, &data, NULL); scdata.val2 = atoi(data);
-						SQL->GetData(sql_handle, 4, &data, NULL); scdata.val3 = atoi(data);
-						SQL->GetData(sql_handle, 5, &data, NULL); scdata.val4 = atoi(data);
-						memcpy(WFIFOP(fd, 14+count*sizeof(struct status_change_data)), &scdata, sizeof(struct status_change_data));
-					}
-					if (count >= 50)
-						ShowWarning("Too many status changes for %d:%d, some of them were not loaded.\n", aid, cid);
-					if (count > 0) {
-						WFIFOW(fd,2) = 14 + count*sizeof(struct status_change_data);
-						WFIFOW(fd,12) = count;
-						WFIFOSET(fd,WFIFOW(fd,2));
-
-						//Clear the data once loaded.
-						if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, aid, cid) )
-							Sql_ShowDebug(sql_handle);
-					}
-				} else { //no sc (needs a response)
-					WFIFOHEAD(fd,14);
-					WFIFOW(fd,0) = 0x2b1d;
-					WFIFOW(fd,2) = 14;
-					WFIFOL(fd,4) = aid;
-					WFIFOL(fd,8) = cid;
-					WFIFOW(fd,12) = 0;
-					WFIFOSET(fd,WFIFOW(fd,2));
-				}
-				SQL->FreeResult(sql_handle);
-	#endif
-				RFIFOSKIP(fd, 10);
+				chr->parse_frommap_request_scdata(fd);
 			}
 			break;
 
 			case 0x2afe: //set MAP user count
 				if (RFIFOREST(fd) < 4)
 					return 0;
-				if (RFIFOW(fd,2) != server[id].users) {
-					server[id].users = RFIFOW(fd,2);
-					ShowInfo("User Count: %d (Server: %d)\n", server[id].users, id);
-				}
-				RFIFOSKIP(fd, 4);
+				chr->parse_frommap_set_users_count(fd, id);
 				break;
 
 			case 0x2aff: //set MAP users
 				if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))
 					return 0;
 			{
-				//TODO: When data mismatches memory, update guild/party online/offline states.
-				int aid, cid;
-				struct online_char_data* character;
-
-				server[id].users = RFIFOW(fd,4);
-				online_char_db->foreach(online_char_db,char_db_setoffline,id); //Set all chars from this server as 'unknown'
-				for(i = 0; i < server[id].users; i++) {
-					aid = RFIFOL(fd,6+i*8);
-					cid = RFIFOL(fd,6+i*8+4);
-					character = idb_ensure(online_char_db, aid, create_online_char_data);
-					if( character->server > -1 && character->server != id )
-					{
-						ShowNotice("Set map user: Character (%d:%d) marked on map server %d, but map server %d claims to have (%d:%d) online!\n",
-							character->account_id, character->char_id, character->server, id, aid, cid);
-						mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
-					}
-					character->server = id;
-					character->char_id = cid;
-				}
-				//If any chars remain in -2, they will be cleaned in the cleanup timer.
-				RFIFOSKIP(fd,RFIFOW(fd,2));
+				chr->parse_frommap_set_users(fd, id);
 			}
 			break;
 
@@ -3192,37 +3965,8 @@ int parse_frommap(int fd)
 				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 					return 0;
 			{
-				int aid = RFIFOL(fd,4), cid = RFIFOL(fd,8), size = RFIFOW(fd,2);
-				struct online_char_data* character;
+				chr->parse_frommap_save_character(fd, id);
 
-				if (size - 13 != sizeof(struct mmo_charstatus)) {
-					ShowError("parse_from_map (save-char): Size mismatch! %d != %"PRIuS"\n", size-13, sizeof(struct mmo_charstatus));
-					RFIFOSKIP(fd,size);
-					break;
-				}
-				//Check account only if this ain't final save. Final-save goes through because of the char-map reconnect
-				if (RFIFOB(fd,12) || (
-					(character = (struct online_char_data*)idb_get(online_char_db, aid)) != NULL &&
-					character->char_id == cid))
-				{
-					struct mmo_charstatus char_dat;
-					memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
-					mmo_char_tosql(cid, &char_dat);
-				} else {	//This may be valid on char-server reconnection, when re-sending characters that already logged off.
-					ShowError("parse_from_map (save-char): Received data for non-existing/offline character (%d:%d).\n", aid, cid);
-					set_char_online(id, cid, aid);
-				}
-
-				if (RFIFOB(fd,12))
-				{	//Flag, set character offline after saving. [Skotlex]
-					set_char_offline(cid, aid);
-					WFIFOHEAD(fd,10);
-					WFIFOW(fd,0) = 0x2b21; //Save ack only needed on final save.
-					WFIFOL(fd,2) = aid;
-					WFIFOL(fd,6) = cid;
-					WFIFOSET(fd,10);
-				}
-				RFIFOSKIP(fd,size);
 			}
 			break;
 
@@ -3230,48 +3974,7 @@ int parse_frommap(int fd)
 				if( RFIFOREST(fd) < 22 )
 					return 0;
 			{
-				int account_id = RFIFOL(fd,2);
-				uint32 login_id1 = RFIFOL(fd,6);
-				uint32 login_id2 = RFIFOL(fd,10);
-				uint32 ip = RFIFOL(fd,14);
-				int32 group_id = RFIFOL(fd, 18);
-				RFIFOSKIP(fd,22);
-
-				if( runflag != CHARSERVER_ST_RUNNING )
-				{
-					WFIFOHEAD(fd,7);
-					WFIFOW(fd,0) = 0x2b03;
-					WFIFOL(fd,2) = account_id;
-					WFIFOB(fd,6) = 0;// not ok
-					WFIFOSET(fd,7);
-				}
-				else
-				{
-					struct auth_node* node;
-				
-					// create temporary auth entry
-					CREATE(node, struct auth_node, 1);
-					node->account_id = account_id;
-					node->char_id = 0;
-					node->login_id1 = login_id1;
-					node->login_id2 = login_id2;
-					node->group_id = group_id;
-					//node->sex = 0;
-					node->ip = ntohl(ip);
-					/* sounds troublesome. */
-					//node->expiration_time = 0; // unlimited/unknown time by default (not display in map-server)
-					//node->gmlevel = 0;
-					idb_put(auth_db, account_id, node);
-
-					//Set char to "@ char select" in online db [Kevin]
-					set_char_charselect(account_id);
-
-					WFIFOHEAD(fd,7);
-					WFIFOW(fd,0) = 0x2b03;
-					WFIFOL(fd,2) = account_id;
-					WFIFOB(fd,6) = 1;// ok
-					WFIFOSET(fd,7);
-				}
+				chr->parse_frommap_char_select_req(fd);
 			}
 			break;
 
@@ -3279,63 +3982,7 @@ int parse_frommap(int fd)
 				if (RFIFOREST(fd) < 39)
 					return 0;
 			{
-				int map_id, map_fd = -1;
-				struct mmo_charstatus* char_data;
-
-				map_id = search_mapserver(RFIFOW(fd,18), ntohl(RFIFOL(fd,24)), ntohs(RFIFOW(fd,28))); //Locate mapserver by ip and port.
-				if (map_id >= 0)
-					map_fd = server[map_id].fd;
-				//Char should just had been saved before this packet, so this should be safe. [Skotlex]
-				char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
-				if (char_data == NULL) {	//Really shouldn't happen.
-					struct mmo_charstatus char_dat;
-					mmo_char_fromsql(RFIFOL(fd,14), &char_dat, true);
-					char_data = (struct mmo_charstatus*)uidb_get(char_db_,RFIFOL(fd,14));
-				}
-
-				if( runflag == CHARSERVER_ST_RUNNING &&
-					session_isActive(map_fd) &&
-					char_data )
-				{	//Send the map server the auth of this player.
-					struct online_char_data* data;
-					struct auth_node* node;
-
-					//Update the "last map" as this is where the player must be spawned on the new map server.
-					char_data->last_point.map = RFIFOW(fd,18);
-					char_data->last_point.x = RFIFOW(fd,20);
-					char_data->last_point.y = RFIFOW(fd,22);
-					char_data->sex = RFIFOB(fd,30);
-
-					// create temporary auth entry
-					CREATE(node, struct auth_node, 1);
-					node->account_id = RFIFOL(fd,2);
-					node->char_id = RFIFOL(fd,14);
-					node->login_id1 = RFIFOL(fd,6);
-					node->login_id2 = RFIFOL(fd,10);
-					node->sex = RFIFOB(fd,30);
-					node->expiration_time = 0; // FIXME (this thing isn't really supported we could as well purge it instead of fixing)
-					node->ip = ntohl(RFIFOL(fd,31));
-					node->group_id = RFIFOL(fd,35);
-					node->changing_mapservers = 1;
-					idb_put(auth_db, RFIFOL(fd,2), node);
-
-					data = idb_ensure(online_char_db, RFIFOL(fd,2), create_online_char_data);
-					data->char_id = char_data->char_id;
-					data->server = map_id; //Update server where char is.
-
-					//Reply with an ack.
-					WFIFOHEAD(fd,30);
-					WFIFOW(fd,0) = 0x2b06;
-					memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
-					WFIFOSET(fd,30);
-				} else { //Reply with nak
-					WFIFOHEAD(fd,30);
-					WFIFOW(fd,0) = 0x2b06;
-					memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
-					WFIFOL(fd,6) = 0; //Set login1 to 0.
-					WFIFOSET(fd,30);
-				}
-				RFIFOSKIP(fd,39);
+				chr->parse_frommap_change_map_server(fd);
 			}
 			break;
 
@@ -3343,15 +3990,7 @@ int parse_frommap(int fd)
 				if (RFIFOREST(fd) < 10)
 					return 0;
 				{
-					int char_id, friend_id;
-					char_id = RFIFOL(fd,2);
-					friend_id = RFIFOL(fd,6);
-					if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d' AND `friend_id`='%d' LIMIT 1",
-						friend_db, char_id, friend_id) ) {
-						Sql_ShowDebug(sql_handle);
-						break;
-					}
-					RFIFOSKIP(fd,10);
+					chr->parse_frommap_remove_friend(fd);
 				}
 			break;
 
@@ -3359,182 +3998,20 @@ int parse_frommap(int fd)
 				if (RFIFOREST(fd) < 6)
 					return 0;
 
-				WFIFOHEAD(fd,30);
-				WFIFOW(fd,0) = 0x2b09;
-				WFIFOL(fd,2) = RFIFOL(fd,2);
-				char_loadName((int)RFIFOL(fd,2), (char*)WFIFOP(fd,6));
-				WFIFOSET(fd,30);
-
-				RFIFOSKIP(fd,6);
+				chr->parse_frommap_char_name_request(fd);
 			break;
 
 			case 0x2b0c: // Map server send information to change an email of an account -> login-server
 				if (RFIFOREST(fd) < 86)
 					return 0;
-				if (login_fd > 0) { // don't send request if no login-server
-					WFIFOHEAD(login_fd,86);
-					memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0),86); // 0x2722 <account_id>.L <actual_e-mail>.40B <new_e-mail>.40B
-					WFIFOW(login_fd,0) = 0x2722;
-					WFIFOSET(login_fd,86);
-				}
-				RFIFOSKIP(fd, 86);
+				chr->parse_frommap_change_email(fd);
 			break;
 
 			case 0x2b0e: // Request from map-server to change an account's or character's status (accounts will just be forwarded to login server)
 				if (RFIFOREST(fd) < 44)
 					return 0;
 			{
-				int result = 0; // 0-login-server request done, 1-player not found, 2-gm level too low, 3-login-server offline
-				char esc_name[NAME_LENGTH*2+1];
-
-				int acc = RFIFOL(fd,2); // account_id of who ask (-1 if server itself made this request)
-				const char* name = (char*)RFIFOP(fd,6); // name of the target character
-				int type = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban, 5 changesex, 6 charban, 7 charunban
-				short year = RFIFOW(fd,32);
-				short month = RFIFOW(fd,34);
-				short day = RFIFOW(fd,36);
-				short hour = RFIFOW(fd,38);
-				short minute = RFIFOW(fd,40);
-				short second = RFIFOW(fd,42);
-				RFIFOSKIP(fd,44);
-
-				SQL->EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-				
-				if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `account_id`,`char_id`,`unban_time` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
-					Sql_ShowDebug(sql_handle);
-				else if( SQL->NumRows(sql_handle) == 0 ) {
-					result = 1; // 1-player not found
-				} else if( SQL_SUCCESS != SQL->NextRow(sql_handle) ) {
-					Sql_ShowDebug(sql_handle);
-					result = 1; // 1-player not found
-				} else {
-					int account_id, char_id;
-					char* data;
-					time_t unban_time;
-
-					SQL->GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
-					SQL->GetData(sql_handle, 1, &data, NULL); char_id = atoi(data);
-					SQL->GetData(sql_handle, 2, &data, NULL); unban_time = atol(data);
-
-					if( login_fd <= 0 )
-						result = 3; // 3-login-server offline
-					//FIXME: need to move this check to login server [ultramage]
-	//				else
-	//				if( acc != -1 && isGM(acc) < isGM(account_id) )
-	//					result = 2; // 2-gm level too low
-					else {
-						switch( type ) {
-							case 1: // block
-									WFIFOHEAD(login_fd,10);
-									WFIFOW(login_fd,0) = 0x2724;
-									WFIFOL(login_fd,2) = account_id;
-									WFIFOL(login_fd,6) = 5; // new account status
-									WFIFOSET(login_fd,10);
-							break;
-							case 2: // ban
-									WFIFOHEAD(login_fd,18);
-									WFIFOW(login_fd, 0) = 0x2725;
-									WFIFOL(login_fd, 2) = account_id;
-									WFIFOW(login_fd, 6) = year;
-									WFIFOW(login_fd, 8) = month;
-									WFIFOW(login_fd,10) = day;
-									WFIFOW(login_fd,12) = hour;
-									WFIFOW(login_fd,14) = minute;
-									WFIFOW(login_fd,16) = second;
-									WFIFOSET(login_fd,18);
-							break;
-							case 3: // unblock
-									WFIFOHEAD(login_fd,10);
-									WFIFOW(login_fd,0) = 0x2724;
-									WFIFOL(login_fd,2) = account_id;
-									WFIFOL(login_fd,6) = 0; // new account status
-									WFIFOSET(login_fd,10);
-							break;
-							case 4: // unban
-									WFIFOHEAD(login_fd,6);
-									WFIFOW(login_fd,0) = 0x272a;
-									WFIFOL(login_fd,2) = account_id;
-									WFIFOSET(login_fd,6);
-							break;
-							case 5: // changesex
-									WFIFOHEAD(login_fd,6);
-									WFIFOW(login_fd,0) = 0x2727;
-									WFIFOL(login_fd,2) = account_id;
-									WFIFOSET(login_fd,6);
-							break;
-							case 6: //char ban
-							/* handled by char server, so no redirection */
-							{
-								time_t timestamp;
-								struct tm *tmtime;
-								SqlStmt* stmt = SQL->StmtMalloc(sql_handle);
-
-								if (unban_time == 0 || unban_time < time(NULL))
-									timestamp = time(NULL); // new ban
-								else
-									timestamp = unban_time; // add to existing ban
-								
-								tmtime = localtime(&timestamp);
-								tmtime->tm_year = tmtime->tm_year + year;
-								tmtime->tm_mon  = tmtime->tm_mon + month;
-								tmtime->tm_mday = tmtime->tm_mday + day;
-								tmtime->tm_hour = tmtime->tm_hour + hour;
-								tmtime->tm_min  = tmtime->tm_min + minute;
-								tmtime->tm_sec  = tmtime->tm_sec + second;
-								timestamp = mktime(tmtime);
-																
-								if( SQL_SUCCESS != SQL->StmtPrepare(stmt,
-																	"UPDATE `%s` SET `unban_time` = ? WHERE `char_id` = ? LIMIT 1",
-																	char_db)
-								   || SQL_SUCCESS != SQL->StmtBindParam(stmt,  0, SQLDT_LONG,   (void*)&timestamp,   sizeof(timestamp))
-								   || SQL_SUCCESS != SQL->StmtBindParam(stmt,  1, SQLDT_INT,    (void*)&char_id,     sizeof(char_id))
-								   || SQL_SUCCESS != SQL->StmtExecute(stmt)
-
-								   ) {
-									SqlStmt_ShowDebug(stmt);
-								}
-								
-								SQL->StmtFree(stmt);
-								
-								// condition applies; send to all map-servers to disconnect the player
-								if( timestamp > time(NULL) ) {
-									unsigned char buf[11];
-									
-									WBUFW(buf,0) = 0x2b14;
-									WBUFL(buf,2) = char_id;
-									WBUFB(buf,6) = 2;
-									WBUFL(buf,7) = (unsigned int)timestamp;
-									mapif_sendall(buf, 11);
-									
-									// disconnect player if online on char-server
-									disconnect_player(account_id);
-								}
-							}
-							break;
-						case 7: //char unban
-							/* handled by char server, so no redirection */
-							if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `unban_time` = '0' WHERE `char_id` = '%d' LIMIT 1", char_db, char_id) ) {
-								Sql_ShowDebug(sql_handle);
-								result = 1;
-							}
-							break;
-
-						}
-					}
-				}
-
-				SQL->FreeResult(sql_handle);
-
-				// send answer if a player ask, not if the server ask
-				if( acc != -1 && type != 5 ) { // Don't send answer for changesex
-					WFIFOHEAD(fd,34);
-					WFIFOW(fd, 0) = 0x2b0f;
-					WFIFOL(fd, 2) = acc;
-					safestrncpy((char*)WFIFOP(fd,6), name, NAME_LENGTH);
-					WFIFOW(fd,30) = type;
-					WFIFOW(fd,32) = result;
-					WFIFOSET(fd,34);
-				}
+				chr->parse_frommap_change_account(fd);
 			}
 			break;
 
@@ -3542,49 +4019,7 @@ int parse_frommap(int fd)
 				if (RFIFOREST(fd) < 11)
 					return 0;
 			{
-				int cid = RFIFOL(fd, 2);
-				int fame = RFIFOL(fd, 6);
-				char type = RFIFOB(fd, 10);
-				int size;
-				struct fame_list* list;
-				int player_pos;
-				int fame_pos;
-
-				switch(type) {
-					case RANKTYPE_BLACKSMITH: size = fame_list_size_smith;   list = smith_fame_list;   break;
-					case RANKTYPE_ALCHEMIST:  size = fame_list_size_chemist; list = chemist_fame_list; break;
-					case RANKTYPE_TAEKWON:    size = fame_list_size_taekwon; list = taekwon_fame_list; break;
-					default:                  size = 0;                      list = NULL;              break;
-				}
-
-				ARR_FIND(0, size, player_pos, list[player_pos].id == cid);// position of the player
-				ARR_FIND(0, size, fame_pos, list[fame_pos].fame <= fame);// where the player should be
-
-				if( player_pos == size && fame_pos == size )
-					;// not on list and not enough fame to get on it
-				else if( fame_pos == player_pos ) {
-					// same position
-					list[player_pos].fame = fame;
-					char_update_fame_list(type, player_pos, fame);
-				} else {
-					// move in the list
-					if( player_pos == size ) {
-						// new ranker - not in the list
-						ARR_MOVE(size - 1, fame_pos, list, struct fame_list);
-						list[fame_pos].id = cid;
-						list[fame_pos].fame = fame;
-						char_loadName(cid, list[fame_pos].name);
-					} else {
-						// already in the list
-						if( fame_pos == size )
-							--fame_pos;// move to the end of the list
-						ARR_MOVE(player_pos, fame_pos, list, struct fame_list);
-						list[fame_pos].fame = fame;
-					}
-					char_send_fame_list(-1);
-				}
-
-				RFIFOSKIP(fd,11);
+				chr->parse_frommap_fame_list(fd);
 			}
 			break;
 
@@ -3593,96 +4028,49 @@ int parse_frommap(int fd)
 				if( RFIFOREST(fd) < 10 )
 					return 0;
 
-				divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
-				RFIFOSKIP(fd,10);
+				chr->parse_frommap_divorce_char(fd);
 			break;
 
 			case 0x2b16: // Receive rates [Wizputer]
 				if( RFIFOREST(fd) < 14 )
 					return 0;
 			{
-				char esc_server_name[sizeof(server_name)*2+1];
-
-				SQL->EscapeString(sql_handle, esc_server_name, server_name);
-
-				if( SQL_ERROR == SQL->Query(sql_handle, "INSERT INTO `%s` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d'",
-					ragsrvinfo_db, fd, esc_server_name, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)) )
-					Sql_ShowDebug(sql_handle);
-				RFIFOSKIP(fd,14);
+				chr->parse_frommap_ragsrvinfo(fd);
 			}
 			break;
 
 			case 0x2b17: // Character disconnected set online 0 [Wizputer]
 				if (RFIFOREST(fd) < 6)
 					return 0;
-				set_char_offline(RFIFOL(fd,2),RFIFOL(fd,6));
-				RFIFOSKIP(fd,10);
+				chr->parse_frommap_set_char_offline(fd);
 			break;
 
 			case 0x2b18: // Reset all chars to offline [Wizputer]
-				set_all_offline(id);
-				RFIFOSKIP(fd,2);
+				chr->parse_frommap_set_all_offline(fd, id);
 			break;
 
 			case 0x2b19: // Character set online [Wizputer]
 				if (RFIFOREST(fd) < 10)
 					return 0;
-				set_char_online(id, RFIFOL(fd,2),RFIFOL(fd,6));
-				RFIFOSKIP(fd,10);
+				chr->parse_frommap_set_char_online(fd, id);
 			break;
 
 			case 0x2b1a: // Build and send fame ranking lists [DracoRPG]
 				if (RFIFOREST(fd) < 2)
 					return 0;
-				char_read_fame_list();
-				char_send_fame_list(-1);
-				RFIFOSKIP(fd,2);
+				chr->parse_frommap_build_fame_list(fd);
 			break;
 
 			case 0x2b1c: //Request to save status change data. [Skotlex]
 				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 					return 0;
 			{
-	#ifdef ENABLE_SC_SAVING
-				int count, aid, cid;
-
-				aid = RFIFOL(fd, 4);
-				cid = RFIFOL(fd, 8);
-				count = RFIFOW(fd, 12);
-
-				/* clear; ensure no left overs e.g. permanent */
-				if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", scdata_db, aid, cid) )
-					Sql_ShowDebug(sql_handle);
-				
-				if( count > 0 )
-				{
-					struct status_change_data data;
-					StringBuf buf;
-
-					StrBuf->Init(&buf);
-					StrBuf->Printf(&buf, "INSERT INTO `%s` (`account_id`, `char_id`, `type`, `tick`, `val1`, `val2`, `val3`, `val4`) VALUES ", scdata_db);
-					for( i = 0; i < count; ++i )
-					{
-						memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
-						if( i > 0 )
-							StrBuf->AppendStr(&buf, ", ");
-						StrBuf->Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
-							data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
-					}
-					if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
-						Sql_ShowDebug(sql_handle);
-					StrBuf->Destroy(&buf);
-				}
-	#endif
-				RFIFOSKIP(fd, RFIFOW(fd, 2));
+				chr->parse_frommap_save_status_change_data(fd);
 			}
 			break;
 
 			case 0x2b23: // map-server alive packet
-				WFIFOHEAD(fd,2);
-				WFIFOW(fd,0) = 0x2b24;
-				WFIFOSET(fd,2);
-				RFIFOSKIP(fd,2);
+				chr->parse_frommap_ping(fd);
 			break;
 
 			case 0x2b26: // auth request from map-server
@@ -3690,131 +4078,20 @@ int parse_frommap(int fd)
 					return 0;
 
 			{
-				int account_id;
-				int char_id;
-				int login_id1;
-				char sex, standalone;
-				uint32 ip;
-				struct auth_node* node;
-				struct mmo_charstatus* cd;
-				struct mmo_charstatus char_dat;
-
-				account_id = RFIFOL(fd,2);
-				char_id    = RFIFOL(fd,6);
-				login_id1  = RFIFOL(fd,10);
-				sex        = RFIFOB(fd,14);
-				ip         = ntohl(RFIFOL(fd,15));
-				standalone = RFIFOB(fd, 19);
-				RFIFOSKIP(fd,20);
-
-				node = (struct auth_node*)idb_get(auth_db, account_id);
-				cd = (struct mmo_charstatus*)uidb_get(char_db_,char_id);
-				
-				if( cd == NULL ) { //Really shouldn't happen.
-					mmo_char_fromsql(char_id, &char_dat, true);
-					cd = (struct mmo_charstatus*)uidb_get(char_db_,char_id);
-				}
-
-				if( runflag == CHARSERVER_ST_RUNNING && cd && standalone ) {
-					cd->sex = sex;
-					
-					WFIFOHEAD(fd,25 + sizeof(struct mmo_charstatus));
-					WFIFOW(fd,0) = 0x2afd;
-					WFIFOW(fd,2) = 25 + sizeof(struct mmo_charstatus);
-					WFIFOL(fd,4) = account_id;
-					WFIFOL(fd,8) = 0;
-					WFIFOL(fd,12) = 0;
-					WFIFOL(fd,16) = 0;
-					WFIFOL(fd,20) = 0;
-					WFIFOB(fd,24) = 0;
-					memcpy(WFIFOP(fd,25), cd, sizeof(struct mmo_charstatus));
-					WFIFOSET(fd, WFIFOW(fd,2));
-					
-					set_char_online(id, char_id, account_id);
-					break;
-				}
-				
-				if( runflag == CHARSERVER_ST_RUNNING &&
-					cd != NULL &&
-					node != NULL &&
-					node->account_id == account_id &&
-					node->char_id == char_id &&
-					node->login_id1 == login_id1 /*&&
-					node->sex == sex &&
-					node->ip == ip*/ )
-				{// auth ok
-					if( cd->sex == 99 )
-						cd->sex = sex;
-
-					WFIFOHEAD(fd,25 + sizeof(struct mmo_charstatus));
-					WFIFOW(fd,0) = 0x2afd;
-					WFIFOW(fd,2) = 25 + sizeof(struct mmo_charstatus);
-					WFIFOL(fd,4) = account_id;
-					WFIFOL(fd,8) = node->login_id1;
-					WFIFOL(fd,12) = node->login_id2;
-					WFIFOL(fd,16) = (uint32)node->expiration_time; // FIXME: will wrap to negative after "19-Jan-2038, 03:14:07 AM GMT"
-					WFIFOL(fd,20) = node->group_id;
-					WFIFOB(fd,24) = node->changing_mapservers;
-					memcpy(WFIFOP(fd,25), cd, sizeof(struct mmo_charstatus));
-					WFIFOSET(fd, WFIFOW(fd,2));
-
-					// only use the auth once and mark user online
-					idb_remove(auth_db, account_id);
-					set_char_online(id, char_id, account_id);
-				}
-				else
-				{// auth failed
-					WFIFOHEAD(fd,19);
-					WFIFOW(fd,0) = 0x2b27;
-					WFIFOL(fd,2) = account_id;
-					WFIFOL(fd,6) = char_id;
-					WFIFOL(fd,10) = login_id1;
-					WFIFOB(fd,14) = sex;
-					WFIFOL(fd,15) = htonl(ip);
-					WFIFOSET(fd,19);
-				}
+				chr->parse_frommap_auth_request(fd, id);
 			}
 			break;
 
 			case 0x2736: // ip address update
 				if (RFIFOREST(fd) < 6) return 0;
-				server[id].ip = ntohl(RFIFOL(fd, 2));
-				ShowInfo("Updated IP address of map-server #%d to %d.%d.%d.%d.\n", id, CONVIP(server[id].ip));
-				RFIFOSKIP(fd,6);
+				chr->parse_frommap_update_ip(fd, id);
 			break;
 
 			case 0x3008:
 				if( RFIFOREST(fd) < RFIFOW(fd,4) )
 					return 0;/* packet wasn't fully received yet (still fragmented) */
 				else {
-					int sfd;/* stat server fd */
-					struct hSockOpt opt;
-					RFIFOSKIP(fd, 2);/* we skip first 2 bytes which are the 0x3008, so we end up with a buffer equal to the one we send */
-
-					opt.silent = 1;
-					opt.setTimeo = 1;
-					
-					if( (sfd = make_connection(host2ip("stats.hercules.ws"),(uint16)25427,&opt) ) == -1 ) {
-						RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
-						RFIFOFLUSH(fd);
-						break;/* connection not possible, we drop the report */
-					}
-			
-					session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
-					realloc_fifo(sfd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-					
-					WFIFOHEAD(sfd, RFIFOW(fd,2) );
-
-					memcpy((char*)WFIFOP(sfd,0), (char*)RFIFOP(fd, 0), RFIFOW(fd,2));
-
-					WFIFOSET(sfd, RFIFOW(fd,2) );
-
-					flush_fifo(sfd);
-
-					do_close(sfd);
-					
-					RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
-					RFIFOFLUSH(fd);
+					chr->parse_frommap_request_stats_report(fd);
 			}
 			break;
 				
@@ -3823,16 +4100,7 @@ int parse_frommap(int fd)
 				if( RFIFOREST(fd) < 28 )
 					return 0;
 				else {
-					int account_id = RFIFOL(fd, 2), char_id = RFIFOL(fd, 6),
-						val1 = RFIFOL(fd, 12), val2 = RFIFOL(fd, 16),
-						val3 = RFIFOL(fd, 20), val4 = RFIFOL(fd, 24);
-					short type = RFIFOW(fd, 10);
-
-					if( SQL_ERROR == SQL->Query(sql_handle, "REPLACE INTO `%s` (`account_id`,`char_id`,`type`,`tick`,`val1`,`val2`,`val3`,`val4`) VALUES ('%d','%d','%d',-1,'%d','%d','%d','%d')",
-												scdata_db, account_id, char_id, type, val1, val2, val3, val4) )
-						Sql_ShowDebug(sql_handle);
-
-					RFIFOSKIP(fd, 28);
+					chr->parse_frommap_scdata_update(fd);
 				}
 				break;
 
@@ -3841,14 +4109,7 @@ int parse_frommap(int fd)
 				if( RFIFOREST(fd) < 12 )
 					return 0;
 				else {
-					int account_id = RFIFOL(fd, 2), char_id = RFIFOL(fd, 6);
-					short type = RFIFOW(fd, 10);
-					
-					if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_id` = '%d' AND `type` = '%d' LIMIT 1",
-												scdata_db, account_id, char_id, type) )
-						Sql_ShowDebug(sql_handle);
-					
-					RFIFOSKIP(fd, 12);
+					chr->parse_frommap_scdata_delete(fd);
 				}
 				break;
 
@@ -3856,7 +4117,7 @@ int parse_frommap(int fd)
 			default:
 			{
 				// inter server - packet
-				int r = inter_parse_frommap(fd);
+				int r = inter->parse_frommap(fd);
 				if (r == 1) break;		// processed
 				if (r == 2) return 0;	// need more packet
 
@@ -3875,19 +4136,19 @@ void do_init_mapif(void)
 {
 	int i;
 	for( i = 0; i < ARRAYLENGTH(server); ++i )
-		mapif_server_init(i);
+		mapif->server_init(i);
 }
 
 void do_final_mapif(void)
 {
 	int i;
 	for( i = 0; i < ARRAYLENGTH(server); ++i )
-		mapif_server_destroy(i);
+		mapif->server_destroy(i);
 }
 
 // Searches for the mapserver that has a given map (and optionally ip/port, if not -1).
 // If found, returns the server's index in the 'server' array (otherwise returns -1).
-int search_mapserver(unsigned short map, uint32 ip, uint16 port)
+int char_search_mapserver(unsigned short map, uint32 ip, uint16 port)
 {
 	int i, j;
 
@@ -3909,13 +4170,13 @@ int search_mapserver(unsigned short map, uint32 ip, uint16 port)
 // Initialization process (currently only initialization inter_mapif)
 static int char_mapif_init(int fd)
 {
-	return inter_mapif_init(fd);
+	return inter->mapif_init(fd);
 }
 
 //--------------------------------------------
 // Test to know if an IP come from LAN or WAN.
 //--------------------------------------------
-int lan_subnetcheck(uint32 ip)
+int char_lan_subnetcheck(uint32 ip)
 {
 	int i;
 	ARR_FIND( 0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask) );
@@ -3952,6 +4213,14 @@ void char_delete2_ack(int fd, int char_id, uint32 result, time_t delete_date)
 	WFIFOSET(fd,14);
 }
 
+void char_delete2_accept_actual_ack(int fd, int char_id, uint32 result)
+{
+	WFIFOHEAD(fd,10);
+	WFIFOW(fd,0) = 0x82a;
+	WFIFOL(fd,2) = char_id;
+	WFIFOL(fd,6) = result;
+	WFIFOSET(fd,10);
+}
 
 /// @param result
 /// 0 (0x718): An unknown error has occurred.
@@ -3967,18 +4236,12 @@ void char_delete2_accept_ack(int fd, int char_id, uint32 result)
 #if PACKETVER >= 20130000 /* not sure the exact date -- must refresh or client gets stuck */
 	if( result == 1 ) {
 		struct char_session_data* sd = (struct char_session_data*)session[fd]->session_data;
-		mmo_char_send099d(fd, sd);
+		chr->mmo_char_send099d(fd, sd);
 	}
 #endif
-	
-	WFIFOHEAD(fd,10);
-	WFIFOW(fd,0) = 0x82a;
-	WFIFOL(fd,2) = char_id;
-	WFIFOL(fd,6) = result;
-	WFIFOSET(fd,10);
+	chr->delete2_accept_actual_ack(fd, char_id, result);
 }
 
-
 /// @param result
 /// 1 (0x718): none/success, (if char id not in deletion process): An unknown error has occurred.
 /// 2 (0x719): A database error occurred.
@@ -3992,7 +4255,6 @@ void char_delete2_cancel_ack(int fd, int char_id, uint32 result)
 	WFIFOSET(fd,10);
 }
 
-
 static void char_delete2_req(int fd, struct char_session_data* sd)
 {// CH: <0827>.W <char id>.L
 	int char_id, party_id, guild_id, i;
@@ -4004,21 +4266,21 @@ static void char_delete2_req(int fd, struct char_session_data* sd)
 	ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == char_id );
 	if( i == MAX_CHARS )
 	{// character not found
-		char_delete2_ack(fd, char_id, 3, 0);
+		chr->delete2_ack(fd, char_id, 3, 0);
 		return;
 	}
 
-	if( SQL_SUCCESS != SQL->Query(sql_handle, "SELECT `delete_date` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) || SQL_SUCCESS != SQL->NextRow(sql_handle) )
+	if( SQL_SUCCESS != SQL->Query(inter->sql_handle, "SELECT `delete_date` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) || SQL_SUCCESS != SQL->NextRow(inter->sql_handle) )
 	{
-		Sql_ShowDebug(sql_handle);
-		char_delete2_ack(fd, char_id, 3, 0);
+		Sql_ShowDebug(inter->sql_handle);
+		chr->delete2_ack(fd, char_id, 3, 0);
 		return;
 	}
 
-	SQL->GetData(sql_handle, 0, &data, NULL); delete_date = strtoul(data, NULL, 10);
+	SQL->GetData(inter->sql_handle, 0, &data, NULL); delete_date = strtoul(data, NULL, 10);
 
 	if( delete_date ) {// character already queued for deletion
-		char_delete2_ack(fd, char_id, 0, 0);
+		chr->delete2_ack(fd, char_id, 0, 0);
 		return;
 	}
 
@@ -4027,26 +4289,26 @@ static void char_delete2_req(int fd, struct char_session_data* sd)
 	// see issue: 7338
 	if( char_aegis_delete )
 	{
-		if( SQL_SUCCESS != SQL->Query(sql_handle, "SELECT `party_id`, `guild_id` FROM `%s` WHERE `char_id`='%d'", char_db, char_id)
-		|| SQL_SUCCESS != SQL->NextRow(sql_handle)
+		if( SQL_SUCCESS != SQL->Query(inter->sql_handle, "SELECT `party_id`, `guild_id` FROM `%s` WHERE `char_id`='%d'", char_db, char_id)
+		|| SQL_SUCCESS != SQL->NextRow(inter->sql_handle)
 		)
 		{
-			Sql_ShowDebug(sql_handle);
-			char_delete2_ack(fd, char_id, 3, 0);
+			Sql_ShowDebug(inter->sql_handle);
+			chr->delete2_ack(fd, char_id, 3, 0);
 			return;
 		}
-		SQL->GetData(sql_handle, 0, &data, NULL); party_id = atoi(data);
-		SQL->GetData(sql_handle, 1, &data, NULL); guild_id = atoi(data);
+		SQL->GetData(inter->sql_handle, 0, &data, NULL); party_id = atoi(data);
+		SQL->GetData(inter->sql_handle, 1, &data, NULL); guild_id = atoi(data);
 
 		if( guild_id )
 		{
-			char_delete2_ack(fd, char_id, 4, 0);
+			chr->delete2_ack(fd, char_id, 4, 0);
 			return;
 		}
 
 		if( party_id )
 		{
-			char_delete2_ack(fd, char_id, 5, 0);
+			chr->delete2_ack(fd, char_id, 5, 0);
 			return;
 		}
 	}
@@ -4054,17 +4316,16 @@ static void char_delete2_req(int fd, struct char_session_data* sd)
 	// success
 	delete_date = time(NULL)+char_del_delay;
 
-	if( SQL_SUCCESS != SQL->Query(sql_handle, "UPDATE `%s` SET `delete_date`='%lu' WHERE `char_id`='%d'", char_db, (unsigned long)delete_date, char_id) )
+	if( SQL_SUCCESS != SQL->Query(inter->sql_handle, "UPDATE `%s` SET `delete_date`='%lu' WHERE `char_id`='%d'", char_db, (unsigned long)delete_date, char_id) )
 	{
-		Sql_ShowDebug(sql_handle);
-		char_delete2_ack(fd, char_id, 3, 0);
+		Sql_ShowDebug(inter->sql_handle);
+		chr->delete2_ack(fd, char_id, 3, 0);
 		return;
 	}
 
-	char_delete2_ack(fd, char_id, 1, delete_date);
+	chr->delete2_ack(fd, char_id, 1, delete_date);
 }
 
-
 static void char_delete2_accept(int fd, struct char_session_data* sd)
 {// CH: <0829>.W <char id>.L <birth date:YYMMDD>.6B
 	char birthdate[8+1];
@@ -4091,52 +4352,51 @@ static void char_delete2_accept(int fd, struct char_session_data* sd)
 	ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == char_id );
 	if( i == MAX_CHARS )
 	{// character not found
-		char_delete2_accept_ack(fd, char_id, 3);
+		chr->delete2_accept_ack(fd, char_id, 3);
 		return;
 	}
 
-	if( SQL_SUCCESS != SQL->Query(sql_handle, "SELECT `base_level`,`delete_date` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) || SQL_SUCCESS != SQL->NextRow(sql_handle) )
+	if( SQL_SUCCESS != SQL->Query(inter->sql_handle, "SELECT `base_level`,`delete_date` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) || SQL_SUCCESS != SQL->NextRow(inter->sql_handle) )
 	{// data error
-		Sql_ShowDebug(sql_handle);
-		char_delete2_accept_ack(fd, char_id, 3);
+		Sql_ShowDebug(inter->sql_handle);
+		chr->delete2_accept_ack(fd, char_id, 3);
 		return;
 	}
 
-	SQL->GetData(sql_handle, 0, &data, NULL); base_level = (unsigned int)strtoul(data, NULL, 10);
-	SQL->GetData(sql_handle, 1, &data, NULL); delete_date = strtoul(data, NULL, 10);
+	SQL->GetData(inter->sql_handle, 0, &data, NULL); base_level = (unsigned int)strtoul(data, NULL, 10);
+	SQL->GetData(inter->sql_handle, 1, &data, NULL); delete_date = strtoul(data, NULL, 10);
 
 	if( !delete_date || delete_date>time(NULL) )
 	{// not queued or delay not yet passed
-		char_delete2_accept_ack(fd, char_id, 4);
+		chr->delete2_accept_ack(fd, char_id, 4);
 		return;
 	}
 
 	if( strcmp(sd->birthdate+2, birthdate) )  // +2 to cut off the century
 	{// birth date is wrong
-		char_delete2_accept_ack(fd, char_id, 5);
+		chr->delete2_accept_ack(fd, char_id, 5);
 		return;
 	}
 
 	if( ( char_del_level > 0 && base_level >= (unsigned int)char_del_level ) || ( char_del_level < 0 && base_level <= (unsigned int)(-char_del_level) ) )
 	{// character level config restriction
-		char_delete2_accept_ack(fd, char_id, 2);
+		chr->delete2_accept_ack(fd, char_id, 2);
 		return;
 	}
 
 	// success
-	if( delete_char_sql(char_id) < 0 )
+	if( chr->delete_char_sql(char_id) < 0 )
 	{
-		char_delete2_accept_ack(fd, char_id, 3);
+		chr->delete2_accept_ack(fd, char_id, 3);
 		return;
 	}
 
 	// refresh character list cache
 	sd->found_char[i] = -1;
 	
-	char_delete2_accept_ack(fd, char_id, 1);
+	chr->delete2_accept_ack(fd, char_id, 1);
 }
 
-
 static void char_delete2_cancel(int fd, struct char_session_data* sd)
 {// CH: <082b>.W <char id>.L
 	int char_id, i;
@@ -4146,47 +4406,674 @@ static void char_delete2_cancel(int fd, struct char_session_data* sd)
 	ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == char_id );
 	if( i == MAX_CHARS )
 	{// character not found
-		char_delete2_cancel_ack(fd, char_id, 2);
+		chr->delete2_cancel_ack(fd, char_id, 2);
 		return;
 	}
 
 	// there is no need to check, whether or not the character was
 	// queued for deletion, as the client prints an error message by
-	// itself, if it was not the case (@see char_delete2_cancel_ack)
-	if( SQL_SUCCESS != SQL->Query(sql_handle, "UPDATE `%s` SET `delete_date`='0' WHERE `char_id`='%d'", char_db, char_id) )
+	// itself, if it was not the case (@see chr->delete2_cancel_ack)
+	if( SQL_SUCCESS != SQL->Query(inter->sql_handle, "UPDATE `%s` SET `delete_date`='0' WHERE `char_id`='%d'", char_db, char_id) )
 	{
-		Sql_ShowDebug(sql_handle);
-		char_delete2_cancel_ack(fd, char_id, 2);
+		Sql_ShowDebug(inter->sql_handle);
+		chr->delete2_cancel_ack(fd, char_id, 2);
 		return;
 	}
 
-	char_delete2_cancel_ack(fd, char_id, 1);
+	chr->delete2_cancel_ack(fd, char_id, 1);
 }
 
+void char_send_account_id(int fd, int account_id)
+{
+	WFIFOHEAD(fd,4);
+	WFIFOL(fd,0) = account_id;
+	WFIFOSET(fd,4);
+}
+
+void loginif_auth(int fd, struct char_session_data* sd, uint32 ipl)
+{
+	WFIFOHEAD(chr->login_fd,23);
+	WFIFOW(chr->login_fd,0) = 0x2712; // ask login-server to authenticate an account
+	WFIFOL(chr->login_fd,2) = sd->account_id;
+	WFIFOL(chr->login_fd,6) = sd->login_id1;
+	WFIFOL(chr->login_fd,10) = sd->login_id2;
+	WFIFOB(chr->login_fd,14) = sd->sex;
+	WFIFOL(chr->login_fd,15) = htonl(ipl);
+	WFIFOL(chr->login_fd,19) = fd;
+	WFIFOSET(chr->login_fd,23);
+}
+
+void char_parse_char_connect(int fd, struct char_session_data* sd, uint32 ipl)
+{
+	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);
+
+	if (sd) {
+		//Received again auth packet for already authenticated account?? Discard it.
+		//TODO: Perhaps log this as a hack attempt?
+		//TODO: and perhaps send back a reply?
+		return;
+	}
+
+	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
+	chr->send_account_id(fd, account_id);
+
+	if( runflag != CHARSERVER_ST_RUNNING ) {
+		chr->auth_error(fd, 0);
+		return;
+	}
+
+	// search authentication
+	struct char_auth_node* node = (struct char_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)
+		/* restrictions apply */
+		if( char_server_type == CST_MAINTENANCE && node->group_id < char_maintenance_min_group_id ) {
+			chr->auth_error(fd, 0);
+			return;
+		}
+		/* the client will already deny this request, this check is to avoid someone bypassing. */
+		if( char_server_type == CST_PAYING && (time_t)node->expiration_time < time(NULL) ) {
+			chr->auth_error(fd, 0);
+			return;
+		}
+		idb_remove(auth_db, account_id);
+		chr->auth_ok(fd, sd);
+	}
+	else
+	{// authentication not found (coming from login server)
+		if (chr->login_fd > 0) { // don't send request if no login-server
+			loginif->auth(fd, sd, ipl);
+		} else { // if no login-server, we must refuse connection
+			chr->auth_error(fd, 0);
+		}
+	}
+}
+
+void char_send_map_info(int fd, int i, uint32 subnet_map_ip, struct mmo_charstatus *cd)
+{
+	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));
+	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);
+}
+
+void char_send_wait_char_server(int fd)
+{
+	WFIFOHEAD(fd, 24);
+	WFIFOW(fd, 0) = 0x840;
+	WFIFOW(fd, 2) = 24;
+	safestrncpy((char*)WFIFOP(fd,4), "0", 20);/* we can't send empty (otherwise the list will pop up) */
+	WFIFOSET(fd, 24);
+}
+
+int char_search_default_maps_mapserver(struct mmo_charstatus *cd)
+{
+	int i;
+	int j;
+	if ((i = chr->search_mapserver((j=mapindex->name2id(MAP_PRONTERA)),-1,-1)) >= 0) {
+		cd->last_point.x = 273;
+		cd->last_point.y = 354;
+	} else if ((i = chr->search_mapserver((j=mapindex->name2id(MAP_GEFFEN)),-1,-1)) >= 0) {
+		cd->last_point.x = 120;
+		cd->last_point.y = 100;
+	} else if ((i = chr->search_mapserver((j=mapindex->name2id(MAP_MORROC)),-1,-1)) >= 0) {
+		cd->last_point.x = 160;
+		cd->last_point.y = 94;
+	} else if ((i = chr->search_mapserver((j=mapindex->name2id(MAP_ALBERTA)),-1,-1)) >= 0) {
+		cd->last_point.x = 116;
+		cd->last_point.y = 57;
+	} else if ((i = chr->search_mapserver((j=mapindex->name2id(MAP_PAYON)),-1,-1)) >= 0) {
+		cd->last_point.x = 87;
+		cd->last_point.y = 117;
+	} else if ((i = chr->search_mapserver((j=mapindex->name2id(MAP_IZLUDE)),-1,-1)) >= 0) {
+		cd->last_point.x = 94;
+		cd->last_point.y = 103;
+	}
+	if (i >= 0)
+	{
+		cd->last_point.map = j;
+		ShowWarning("Unable to find map-server for '%s', sending to major city '%s'.\n", mapindex_id2name(cd->last_point.map), mapindex_id2name(j));
+	}
+	return i;
+}
+
+void char_parse_char_select(int fd, struct char_session_data* sd, uint32 ipl)
+{
+	struct mmo_charstatus char_dat;
+	struct mmo_charstatus *cd;
+	char* data;
+	int char_id;
+	int server_id = 0;
+	int i;
+
+	int slot = RFIFOB(fd,2);
+	RFIFOSKIP(fd,3);
+
+#if PACKETVER >= 20110309
+	if( *pincode->enabled ){ // hack check
+		struct online_char_data* character;
+		character = (struct online_char_data*)idb_get(chr->online_char_db, sd->account_id);
+		if( character && character->pincode_enable == -1){
+			chr->auth_error(fd, 0);
+			return;
+		}
+	}
+#endif
+
+	ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map );
+	/* not available, tell it to wait (client wont close; char select will respawn).
+	 * magic response found by Ind thanks to Yommy <3 */
+	if( server_id == ARRAYLENGTH(server) ) {
+		chr->send_wait_char_server(fd);
+		return;
+	}
+
+	if ( SQL_SUCCESS != SQL->Query(inter->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(inter->sql_handle)
+	  || SQL_SUCCESS != SQL->GetData(inter->sql_handle, 0, &data, NULL) )
+	{	//Not found?? May be forged packet.
+		Sql_ShowDebug(inter->sql_handle);
+		SQL->FreeResult(inter->sql_handle);
+		chr->auth_error(fd, 0);
+		return;
+	}
+
+	char_id = atoi(data);
+	SQL->FreeResult(inter->sql_handle);
 
-int parse_char(int fd)
+	/* client doesn't let it get to this point if you're banned, so its a forged packet */
+	if( sd->found_char[slot] == char_id && sd->unban_time[slot] > time(NULL) ) {
+		chr->auth_error(fd, 0);
+		return;
+	}
+
+	/* set char as online prior to loading its data so 3rd party applications will realize the sql data is not reliable */
+	chr->set_char_online(-2,char_id,sd->account_id);
+	if( !chr->mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
+		chr->set_char_offline(char_id, sd->account_id);
+		/* failed to load something. REJECT! */
+		chr->auth_error(fd, 0);
+		return;/* jump off this boat */
+	}
+
+	//Have to switch over to the DB instance otherwise data won't propagate [Kevin]
+	cd = (struct mmo_charstatus *)idb_get(chr->char_db_, char_id);
+	if( cd->sex == 99 )
+		cd->sex = sd->sex;
+
+	if (log_char) {
+		char esc_name[NAME_LENGTH*2+1];
+		// FIXME: Why are we re-escaping the name if it was already escaped in rename/make_new_char? [Panikon]
+		SQL->EscapeStringLen(inter->sql_handle, esc_name, char_dat.name, strnlen(char_dat.name, NAME_LENGTH));
+		if( SQL_ERROR == SQL->Query(inter->sql_handle,
+			"INSERT INTO `%s`(`time`, `account_id`, `char_id`, `char_num`, `name`) VALUES (NOW(), '%d', '%d', '%d', '%s')",
+			charlog_db, sd->account_id, cd->char_id, slot, esc_name) )
+			Sql_ShowDebug(inter->sql_handle);
+	}
+	ShowInfo("Selected char: (Account %d: %d - %s)\n", sd->account_id, slot, char_dat.name);
+
+	// searching map server
+	i = chr->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 );
+		if (j == ARRAYLENGTH(server)) {
+			ShowInfo("Connection Closed. No map servers available.\n");
+			chr->authfail_fd(fd, 1);
+			return;
+		}
+		i = chr->search_default_maps_mapserver(cd);
+		if (i < 0)
+		{
+			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));
+			chr->authfail_fd(fd, 1);
+			return;
+		}
+	}
+
+	int map_fd;
+	//Send NEW auth packet [Kevin]
+	//FIXME: is this case even possible? [ultramage]
+	if ((map_fd = server[i].fd) < 1 || session[map_fd] == NULL)
+	{
+		ShowError("chr->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.
+		chr->authfail_fd(fd, 1);
+		return;
+	}
+
+	uint32 subnet_map_ip = chr->lan_subnetcheck(ipl); // Advanced subnet check [LuzZza]
+	//Send player to map
+	chr->send_map_info(fd, i, subnet_map_ip, cd);
+
+	struct char_auth_node* node;
+	// create temporary auth entry
+	CREATE(node, struct char_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);
+}
+
+void char_creation_failed(int fd, int result)
+{
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x6e;
+	/* Others I found [Ind] */
+	/* 0x02 = Symbols in Character Names are forbidden */
+	/* 0x03 = You are not eligible to open the Character Slot. */
+	/* 0x0B = This service is only available for premium users.  */
+	switch (result) {
+		case -1: WFIFOB(fd,2) = 0x00; break; // 'Charname already exists'
+		case -2: WFIFOB(fd,2) = 0xFF; break; // 'Char creation denied'
+		case -3: WFIFOB(fd,2) = 0x01; break; // 'You are underaged'
+		case -4: WFIFOB(fd,2) = 0x03; break; // 'You are not eligible to open the Character Slot.'
+		case -5: WFIFOB(fd,2) = 0x02; break; // 'Symbols in Character Names are forbidden'
+
+		default:
+			ShowWarning("chr->parse_char: Unknown result received from chr->make_new_char_sql!\n");
+			WFIFOB(fd,2) = 0xFF;
+			break;
+	}
+	WFIFOSET(fd,3);
+}
+
+void char_creation_ok(int fd, struct mmo_charstatus *char_dat)
+{
+	// send to player
+	WFIFOHEAD(fd,2+MAX_CHAR_BUF);
+	WFIFOW(fd,0) = 0x6d;
+	int len = 2 + chr->mmo_char_tobuf(WFIFOP(fd,2), char_dat);
+	WFIFOSET(fd,len);
+}
+
+void char_parse_char_create_new_char(int fd, struct char_session_data* sd)
 {
+	int result;
+	if( !char_new ) //turn character creation on/off [Kevin]
+		result = -2;
+	else
+	#if PACKETVER >= 20120307
+		result = chr->make_new_char_sql(sd, (char*)RFIFOP(fd,2), 1, 1, 1, 1, 1, 1, RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
+	#else
+		result = chr->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
+
+	if (result < 0) {
+		chr->creation_failed(fd, result);
+	} else {
+		// retrieve data
+		struct mmo_charstatus char_dat;
+		chr->mmo_char_fromsql(result, &char_dat, false); //Only the short data is needed.
+		chr->creation_ok(fd, &char_dat);
+
+		// add new entry to the chars list
+		sd->found_char[char_dat.slot] = result; // the char_id of the new char
+	}
+	#if PACKETVER >= 20120307
+	RFIFOSKIP(fd,31);
+	#else
+	RFIFOSKIP(fd,37);
+	#endif
+}
+
+// flag:
+// 0 = Incorrect Email address
+void char_delete_char_failed(int fd, int flag)
+{
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x70;
+	WFIFOB(fd,2) = flag;
+	WFIFOSET(fd,3);
+}
+
+void char_delete_char_ok(int fd)
+{
+	WFIFOHEAD(fd,2);
+	WFIFOW(fd,0) = 0x6f;
+	WFIFOSET(fd,2);
+}
+
+void char_parse_char_delete_char(int fd, struct char_session_data* sd, unsigned short cmd)
+{
+	int cid = RFIFOL(fd,2);
+	int i;
+#if PACKETVER >= 20110309
+	if( *pincode->enabled ){ // hack check
+		struct online_char_data* character;
+		character = (struct online_char_data*)idb_get(chr->online_char_db, sd->account_id);
+		if( character && character->pincode_enable == -1 ){
+			chr->auth_error(fd, 0);
+			RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
+			return;
+		}
+	}
+#endif
+	ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
 	char email[40];
+	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
+		chr->delete_char_failed(fd, 0);
+		return;
+	}
+
+	// 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
+		chr->delete_char_failed(fd, 0);
+		return;
+	}
+
+	// remove char from list and compact it
+	sd->found_char[i] = -1;
+
+	/* Delete character */
+	if(chr->delete_char_sql(cid)<0){
+		//can't delete the char
+		//either SQL error or can't delete by some CONFIG conditions
+		//del fail
+		chr->delete_char_failed(fd, 0);
+		return;
+	}
+	/* Char successfully deleted.*/
+	chr->delete_char_ok(fd);
+}
+
+void char_parse_char_ping(int fd)
+{
+	RFIFOSKIP(fd,6);
+}
+
+void char_allow_rename(int fd, int flag)
+{
+	WFIFOHEAD(fd, 4);
+	WFIFOW(fd,0) = 0x28e;
+	WFIFOW(fd,2) = flag;
+	WFIFOSET(fd,4);
+}
+
+void char_parse_char_rename_char(int fd, struct char_session_data* sd)
+{
+	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 )
+		return;
+
+	normalize_name(name,TRIM_CHARS);
+	SQL->EscapeStringLen(inter->sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+	if( !chr->check_char_name(name,esc_name) ) {
+		i = 1;
+		safestrncpy(sd->new_name, name, NAME_LENGTH);
+	} else {
+		i = 0;
+	}
+
+	chr->allow_rename(fd, i);
+}
+
+void char_parse_char_rename_char2(int fd, struct char_session_data* sd)
+{
+	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 )
+		return;
+	ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+	if( i == MAX_CHARS )
+		return;
+
+	normalize_name(name,TRIM_CHARS);
+	SQL->EscapeStringLen(inter->sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+	if( !chr->check_char_name(name,esc_name) )
+	{
+		i = 1;
+		safestrncpy(sd->new_name, name, NAME_LENGTH);
+	}
+	else
+		i = 0;
+
+	chr->allow_rename(fd, i);
+}
+
+void char_rename_char_ack(int fd, int flag)
+{
+	WFIFOHEAD(fd, 4);
+	WFIFOW(fd,0) = 0x290;
+	WFIFOW(fd,2) = flag;
+	WFIFOSET(fd,4);
+}
+
+void char_parse_char_rename_char_confirm(int fd, struct char_session_data* sd)
+{
+	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 )
+		return;
+	i = chr->rename_char_sql(sd, cid);
+
+	chr->rename_char_ack(fd, i);
+}
+
+void char_captcha_notsupported(int fd)
+{
+	WFIFOHEAD(fd,5);
+	WFIFOW(fd,0) = 0x7e9;
+	WFIFOW(fd,2) = 5;
+	WFIFOB(fd,4) = 1;
+	WFIFOSET(fd,5);
+}
+
+void char_parse_char_request_captcha(int fd)
+{
+	chr->captcha_notsupported(fd);
+	RFIFOSKIP(fd,8);
+}
+
+void char_parse_char_check_captcha(int fd)
+{
+	chr->captcha_notsupported(fd);
+	RFIFOSKIP(fd,32);
+}
+
+void char_parse_char_delete2_req(int fd, struct char_session_data* sd)
+{
+	chr->delete2_req(fd, sd);
+	RFIFOSKIP(fd,6);
+}
+
+void char_parse_char_delete2_accept(int fd, struct char_session_data* sd)
+{
+	chr->delete2_accept(fd, sd);
+	RFIFOSKIP(fd,12);
+}
+
+void char_parse_char_delete2_cancel(int fd, struct char_session_data* sd)
+{
+	chr->delete2_cancel(fd, sd);
+	RFIFOSKIP(fd,6);
+}
+
+// flag:
+// 0 - ok
+// 3 - error
+void char_login_map_server_ack(int fd, uint8 flag)
+{
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x2af9;
+	WFIFOB(fd,2) = flag;
+	WFIFOSET(fd,3);
+}
+
+void char_parse_char_login_map_server(int fd)
+{
+	char* l_user = (char*)RFIFOP(fd,2);
+	char* l_pass = (char*)RFIFOP(fd,26);
+	int i;
+	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 )
+	{
+		chr->login_map_server_ack(fd, 3);
+	} else {
+		chr->login_map_server_ack(fd, 0);
+
+		server[i].fd = fd;
+		server[i].ip = ntohl(RFIFOL(fd,54));
+		server[i].port = ntohs(RFIFOW(fd,58));
+		server[i].users = 0;
+		session[fd]->func_parse = chr->parse_frommap;
+		session[fd]->flag.server = 1;
+		realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+		chr->mapif_init(fd);
+	}
+	sockt->datasync(fd, true);
+
+	RFIFOSKIP(fd,60);
+}
+
+void char_parse_char_pincode_check(int fd, struct char_session_data* sd)
+{
+	if( RFIFOL(fd,2) == sd->account_id )
+		pincode->check( fd, sd );
+
+	RFIFOSKIP(fd,10);
+}
+
+void char_parse_char_pincode_window(int fd, struct char_session_data* sd)
+{
+	if( RFIFOL(fd,2) == sd->account_id )
+		pincode->sendstate( fd, sd, PINCODE_NOTSET );
+
+	RFIFOSKIP(fd,6);
+}
+
+void char_parse_char_pincode_change(int fd, struct char_session_data* sd)
+{
+	if( RFIFOL(fd,2) == sd->account_id )
+		pincode->change( fd, sd );
+
+	RFIFOSKIP(fd,14);
+}
+
+void char_parse_char_pincode_first_pin(int fd, struct char_session_data* sd)
+{
+	if( RFIFOL(fd,2) == sd->account_id )
+		pincode->setnew( fd, sd );
+	RFIFOSKIP(fd,10);
+}
+
+void char_parse_char_request_chars(int fd, struct char_session_data* sd)
+{
+	chr->mmo_char_send099d(fd, sd);
+	RFIFOSKIP(fd,2);
+}
+
+void char_change_character_slot_ack(int fd, bool ret)
+{
+	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);
+}
+
+void char_parse_char_move_character(int fd, struct char_session_data* sd)
+{
+	bool ret = chr->char_slotchange(sd, fd, RFIFOW(fd, 2), RFIFOW(fd, 4));
+	chr->change_character_slot_ack(fd, ret);
+	/* for some stupid reason it requires the char data again (gravity -_-) */
+	if( ret )
+#if PACKETVER >= 20130000
+		chr->mmo_char_send099d(fd, sd);
+#else
+		chr->mmo_char_send_characters(fd, sd);
+#endif
+	RFIFOSKIP(fd, 8);
+}
+
+int char_parse_char_unknown_packet(int fd, uint32 ipl)
+{
+	ShowError("chr->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 1;
+}
+
+int char_parse_char(int fd)
+{
 	unsigned short cmd;
-	int map_fd;
 	struct char_session_data* sd;
 	uint32 ipl = session[fd]->client_addr;
 
 	sd = (struct char_session_data*)session[fd]->session_data;
 
 	// disconnect any player if no login-server.
-	if(login_fd < 0)
+	if(chr->login_fd < 0)
 		set_eof(fd);
 
 	if(session[fd]->flag.eof)
 	{
 		if( sd != NULL && sd->auth )
 		{	// already authed client
-			struct online_char_data* data = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
+			struct online_char_data* data = (struct online_char_data*)idb_get(chr->online_char_db, sd->account_id);
 			if( data != NULL && data->fd == fd)
 				data->fd = -1;
 			if( data == NULL || data->server == -1) //If it is not in any server, send it offline. [Skotlex]
-				set_char_offline(-1,sd->account_id);
+				chr->set_char_offline(-1,sd->account_id);
 		}
 		do_close(fd);
 		return 0;
@@ -4212,90 +5099,7 @@ int parse_char(int fd)
 				if( RFIFOREST(fd) < 17 )
 					return 0;
 			{
-				struct auth_node* node;
-
-				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);
-
-				if (sd) {
-					//Received again auth packet for already authenticated account?? Discard it.
-					//TODO: Perhaps log this as a hack attempt?
-					//TODO: and perhaps send back a reply?
-					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);
-
-				if( runflag != CHARSERVER_ST_RUNNING ) {
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x6c;
-					WFIFOB(fd,2) = 0;// rejected from server
-					WFIFOSET(fd,3);
-					break;
-				}
-
-				// search authentication
-				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)
-					/* restrictions apply */
-					if( char_server_type == CST_MAINTENANCE && node->group_id < char_maintenance_min_group_id ) {
-						WFIFOHEAD(fd,3);
-						WFIFOW(fd,0) = 0x6c;
-						WFIFOB(fd,2) = 0;// rejected from server
-						WFIFOSET(fd,3);
-						break;
-					}
-					/* the client will already deny this request, this check is to avoid someone bypassing. */
-					if( char_server_type == CST_PAYING && (time_t)node->expiration_time < time(NULL) ) {
-						WFIFOHEAD(fd,3);
-						WFIFOW(fd,0) = 0x6c;
-						WFIFOB(fd,2) = 0;// rejected from server
-						WFIFOSET(fd,3);
-						break;
-					}
-					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 authenticate 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);
-					}
-				}
+				chr->parse_char_connect(fd, sd, ipl);
 			}
 			break;
 
@@ -4303,179 +5107,7 @@ int parse_char(int fd)
 			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 server_id = 0;
-				int i;
-
-				int slot = RFIFOB(fd,2);
-				RFIFOSKIP(fd,3);
-				
-#if PACKETVER >= 20110309
-				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;
-					}
-				}
-#endif
-				
-				ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map );
-				/* not available, tell it to wait (client wont close; char select will respawn).
-				 * magic response found by Ind thanks to Yommy <3 */
-				if( server_id == ARRAYLENGTH(server) ) {
-					WFIFOHEAD(fd, 24);
-					WFIFOW(fd, 0) = 0x840;
-					WFIFOW(fd, 2) = 24;
-					safestrncpy((char*)WFIFOP(fd,4), "0", 20);/* we can't send empty (otherwise the list will pop up) */
-					WFIFOSET(fd, 24);
-					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);
-					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);
-				
-				/* client doesn't let it get to this point if you're banned, so its a forged packet */
-				if( sd->found_char[slot] == char_id && sd->unban_time[slot] > time(NULL) ) {
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x6c;
-					WFIFOB(fd,2) = 0; // rejected from server
-					WFIFOSET(fd,3);
-					break;
-				}
-				
-				/* set char as online prior to loading its data so 3rd party applications will realize 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);
-				if( cd->sex == 99 )
-					cd->sex = sd->sex;
-
-				if (log_char) {
-					char esc_name[NAME_LENGTH*2+1];
-					// FIXME: Why are we re-escaping the name if it was already escaped in rename/make_new_char? [Panikon]
-					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_id`, `char_num`, `name`) VALUES (NOW(), '%d', '%d', '%d', '%s')",
-						charlog_db, sd->account_id, cd->char_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 );
-					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;
-				}
-
-				//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);
+				chr->parse_char_select(fd, sd, ipl);
 
 			}
 			break;
@@ -4485,65 +5117,15 @@ int parse_char(int fd)
 			// S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
 			case 0x970:
 			{
-				int result;
 				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:
 			{
-				int result;
 				FIFOSD_CHECK(37);
 	#endif
 
-				if( !char_new ) //turn character creation on/off [Kevin]
-					result = -2;
-				else
-	#if PACKETVER >= 20120307
-					result = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
-	#else
-					result = 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
-
-				if (result < 0) {
-					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x6e;
-					/* Others I found [Ind] */
-					/* 0x02 = Symbols in Character Names are forbidden */
-					/* 0x03 = You are not eligible to open the Character Slot. */
-					/* 0x0B = This service is only available for premium users.  */
-					switch (result) {
-						case -1: WFIFOB(fd,2) = 0x00; break; // 'Charname already exists'
-						case -2: WFIFOB(fd,2) = 0xFF; break; // 'Char creation denied'
-						case -3: WFIFOB(fd,2) = 0x01; break; // 'You are underaged'
-						case -4: WFIFOB(fd,2) = 0x03; break; // 'You are not eligible to open the Character Slot.'
-						case -5: WFIFOB(fd,2) = 0x02; break; // 'Symbols in Character Names are forbidden'
-
-						default:
-							ShowWarning("parse_char: Unknown result received from make_new_char_sql!\n");
-							WFIFOB(fd,2) = 0xFF;
-							break;
-					}
-					WFIFOSET(fd,3);
-				} else {
-					int len;
-					// retrieve data
-					struct mmo_charstatus char_dat;
-					mmo_char_fromsql(result, &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
-					sd->found_char[char_dat.slot] = result; // the char_id of the new char
-				}
-	#if PACKETVER >= 20120307
-				RFIFOSKIP(fd,31);
-	#else
-				RFIFOSKIP(fd,37);
-	#endif
+				chr->parse_char_create_new_char(fd, sd);
 			}
 			break;
 
@@ -4554,68 +5136,7 @@ int parse_char(int fd)
 				if (cmd == 0x68) FIFOSD_CHECK(46);
 				if (cmd == 0x1fb) FIFOSD_CHECK(56);
 			{
-				int cid = RFIFOL(fd,2);
-				int i;
-#if PACKETVER >= 20110309
-				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);
-						RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
-						break;
-					}
-				}
-#endif
-				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
-				sd->found_char[i] = -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);
+				chr->parse_char_delete_char(fd, sd, cmd);
 			}
 			break;
 
@@ -4624,35 +5145,14 @@ int parse_char(int fd)
 			case 0x187:
 				if (RFIFOREST(fd) < 6)
 					return 0;
-				RFIFOSKIP(fd,6);
+				chr->parse_char_ping(fd);
 			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);
+					chr->parse_char_rename_char(fd, sd);
 				}
 				break;
 
@@ -4661,32 +5161,7 @@ int parse_char(int fd)
 			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) = 0x28e;
-					WFIFOW(fd,2) = i;
-					WFIFOSET(fd,4);
+					chr->parse_char_rename_char2(fd, sd);
 				}
 				break;
 			//Confirm change name.
@@ -4699,63 +5174,38 @@ int parse_char(int fd)
 				// 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);
+					chr->parse_char_rename_char_confirm(fd, sd);
 				}
 				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);
+				chr->parse_char_request_captcha(fd);
 				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);
+				chr->parse_char_check_captcha(fd);
 			break;
 
 			// deletion timer request
 			case 0x827:
 				FIFOSD_CHECK(6);
-				char_delete2_req(fd, sd);
-				RFIFOSKIP(fd,6);
+				chr->parse_char_delete2_req(fd, sd);
 			break;
 
 			// deletion accept request
 			case 0x829:
 				FIFOSD_CHECK(12);
-				char_delete2_accept(fd, sd);
-				RFIFOSKIP(fd,12);
+				chr->parse_char_delete2_accept(fd, sd);
 			break;
 
 			// deletion cancel request
 			case 0x82b:
 				FIFOSD_CHECK(6);
-				char_delete2_cancel(fd, sd);
-				RFIFOSKIP(fd,6);
+				chr->parse_char_delete2_cancel(fd, sd);
 			break;
 
 			// login as map-server
@@ -4763,116 +5213,51 @@ int parse_char(int fd)
 				if (RFIFOREST(fd) < 60)
 					return 0;
 			{
-				char* l_user = (char*)RFIFOP(fd,2);
-				char* l_pass = (char*)RFIFOP(fd,26);
-				int i;
-				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;
-					session[fd]->func_parse = parse_frommap;
-					session[fd]->flag.server = 1;
-					realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-					char_mapif_init(fd);
-				}
-				sockt->datasync(fd, true);
-
-				RFIFOSKIP(fd,60);
+				chr->parse_char_login_map_server(fd);
 			}
 			return 0; // avoid processing of follow-up packets here
 				
 			// checks the entered pin
 			case 0x8b8:
 				FIFOSD_CHECK(10);
-				
-				if( RFIFOL(fd,2) == sd->account_id )
-					pincode->check( fd, sd );
-					
-				RFIFOSKIP(fd,10);
+				chr->parse_char_pincode_check(fd, sd);
 			break;
 				
 			// request for PIN window
 			case 0x8c5:
 				FIFOSD_CHECK(6);
-
-				if( RFIFOL(fd,2) == sd->account_id )
-					pincode->sendstate( fd, sd, PINCODE_NOTSET );
-							
-				RFIFOSKIP(fd,6);
+				chr->parse_char_pincode_window(fd, sd);
 			break;
 				
 			// pincode change request
 			case 0x8be:
 				FIFOSD_CHECK(14);
-
-				if( RFIFOL(fd,2) == sd->account_id )
-					pincode->change( fd, sd );
-				
-				RFIFOSKIP(fd,14);
+				chr->parse_char_pincode_change(fd, sd);
 			break;
 				
 			// activate PIN system and set first PIN
 			case 0x8ba:
 				FIFOSD_CHECK(10);
-
-				if( RFIFOL(fd,2) == sd->account_id )
-					pincode->setnew( fd, sd );
-				RFIFOSKIP(fd,10);
+				chr->parse_char_pincode_first_pin(fd, sd);
 			break;
 			
 			case 0x9a1:
 				FIFOSD_CHECK(2);
-				mmo_char_send099d(fd, sd);
-				RFIFOSKIP(fd,2);
+				chr->parse_char_request_chars(fd, sd);
 			break;
 				
 			/* 0x8d4 <from>.W <to>.W <unused>.W (2+2+2+2) */
 			case 0x8d4:
 				FIFOSD_CHECK(8);
 				{
-					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 )
-#if PACKETVER >= 20130000
-						mmo_char_send099d(fd, sd);
-#else
-						mmo_char_send006b(fd, sd);
-#endif
-						
-					RFIFOSKIP(fd, 8);
+					chr->parse_char_move_character(fd, sd);
 				}
 			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 (chr->parse_char_unknown_packet(fd, ipl))
+					return 0;
 			}
 	}
 
@@ -4932,9 +5317,25 @@ int mapif_send(int fd, unsigned char *buf, unsigned int len)
 	return 0;
 }
 
-int broadcast_user_count(int tid, int64 tick, int id, intptr_t data) {
+void loginif_send_users_count(int users)
+{
+	WFIFOHEAD(chr->login_fd,6);
+	WFIFOW(chr->login_fd,0) = 0x2714;
+	WFIFOL(chr->login_fd,2) = users;
+	WFIFOSET(chr->login_fd,6);
+}
+
+void mapif_send_users_count(int users)
+{
 	uint8 buf[6];
-	int users = count_users();
+	// send number of players to all map-servers
+	WBUFW(buf,0) = 0x2b00;
+	WBUFL(buf,2) = users;
+	mapif->sendall(buf,6);
+}
+
+int char_broadcast_user_count(int tid, int64 tick, int id, intptr_t data) {
+	int users = chr->count_users();
 
 	// only send an update when needed
 	static int prev_users = 0;
@@ -4942,19 +5343,13 @@ int broadcast_user_count(int tid, int64 tick, int id, intptr_t data) {
 		return 0;
 	prev_users = users;
 
-	if( login_fd > 0 && session[login_fd] )
+	if( chr->login_fd > 0 && session[chr->login_fd] )
 	{
 		// send number of user to login server
-		WFIFOHEAD(login_fd,6);
-		WFIFOW(login_fd,0) = 0x2714;
-		WFIFOL(login_fd,2) = users;
-		WFIFOSET(login_fd,6);
+		loginif->send_users_count(users);
 	}
 
-	// send number of players to all map-servers
-	WBUFW(buf,0) = 0x2b00;
-	WBUFL(buf,2) = users;
-	mapif_sendall(buf,6);
+	mapif->send_users_count(users);
 
 	return 0;
 }
@@ -4963,78 +5358,83 @@ int broadcast_user_count(int tid, int64 tick, int id, intptr_t data) {
  * Load this character's account id into the 'online accounts' packet
  * @see DBApply
  */
-static int send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap)
+static int char_send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap)
 {
 	struct online_char_data* character = DB->data2ptr(data);
 	int* i = va_arg(ap, int*);
 
 	if(character->server > -1)
 	{
-		WFIFOL(login_fd,8+(*i)*4) = character->account_id;
+		WFIFOL(chr->login_fd,8+(*i)*4) = character->account_id;
 		(*i)++;
 		return 1;
 	}
 	return 0;
 }
 
-int send_accounts_tologin(int tid, int64 tick, int id, intptr_t data) {
-	if (login_fd > 0 && session[login_fd])
+int char_send_accounts_tologin(int tid, int64 tick, int id, intptr_t data) {
+	if (chr->login_fd > 0 && session[chr->login_fd])
 	{
 		// send account list to login server
-		int users = online_char_db->size(online_char_db);
+		int users = chr->online_char_db->size(chr->online_char_db);
 		int i = 0;
 
-		WFIFOHEAD(login_fd,8+users*4);
-		WFIFOW(login_fd,0) = 0x272d;
-		online_char_db->foreach(online_char_db, send_accounts_tologin_sub, &i, users);
-		WFIFOW(login_fd,2) = 8+ i*4;
-		WFIFOL(login_fd,4) = i;
-		WFIFOSET(login_fd,WFIFOW(login_fd,2));
+		WFIFOHEAD(chr->login_fd,8+users*4);
+		WFIFOW(chr->login_fd,0) = 0x272d;
+		chr->online_char_db->foreach(chr->online_char_db, chr->send_accounts_tologin_sub, &i, users);
+		WFIFOW(chr->login_fd,2) = 8+ i*4;
+		WFIFOL(chr->login_fd,4) = i;
+		WFIFOSET(chr->login_fd,WFIFOW(chr->login_fd,2));
 	}
 	return 0;
 }
 
-int check_connect_login_server(int tid, int64 tick, int id, intptr_t data) {
-	if (login_fd > 0 && session[login_fd] != NULL)
+void loginif_connect_to_server(void)
+{
+	WFIFOHEAD(chr->login_fd,86);
+	WFIFOW(chr->login_fd,0) = 0x2710;
+	memcpy(WFIFOP(chr->login_fd,2), userid, 24);
+	memcpy(WFIFOP(chr->login_fd,26), passwd, 24);
+	WFIFOL(chr->login_fd,50) = 0;
+	WFIFOL(chr->login_fd,54) = htonl(char_ip);
+	WFIFOW(chr->login_fd,58) = htons(char_port);
+	memcpy(WFIFOP(chr->login_fd,60), server_name, 20);
+	WFIFOW(chr->login_fd,80) = 0;
+	WFIFOW(chr->login_fd,82) = char_server_type;
+	WFIFOW(chr->login_fd,84) = char_new_display; //only display (New) if they want to [Kevin]
+	WFIFOSET(chr->login_fd,86);
+}
+
+int char_check_connect_login_server(int tid, int64 tick, int id, intptr_t data) {
+	if (chr->login_fd > 0 && session[chr->login_fd] != NULL)
 		return 0;
 
 	ShowInfo("Attempt to connect to login-server...\n");
 
-	if ( (login_fd = make_connection(login_ip, login_port, NULL)) == -1) { //Try again later. [Skotlex]
-		login_fd = 0;
+	if ( (chr->login_fd = make_connection(login_ip, login_port, NULL)) == -1) { //Try again later. [Skotlex]
+		chr->login_fd = 0;
 		return 0;
 	}
 	
-	session[login_fd]->func_parse = parse_fromlogin;
-	session[login_fd]->flag.server = 1;
-	realloc_fifo(login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-
-	WFIFOHEAD(login_fd,86);
-	WFIFOW(login_fd,0) = 0x2710;
-	memcpy(WFIFOP(login_fd,2), userid, 24);
-	memcpy(WFIFOP(login_fd,26), passwd, 24);
-	WFIFOL(login_fd,50) = 0;
-	WFIFOL(login_fd,54) = htonl(char_ip);
-	WFIFOW(login_fd,58) = htons(char_port);
-	memcpy(WFIFOP(login_fd,60), server_name, 20);
-	WFIFOW(login_fd,80) = 0;
-	WFIFOW(login_fd,82) = char_server_type;
-	WFIFOW(login_fd,84) = char_new_display; //only display (New) if they want to [Kevin]
-	WFIFOSET(login_fd,86);
+	session[chr->login_fd]->func_parse = chr->parse_fromlogin;
+	session[chr->login_fd]->flag.server = 1;
+	realloc_fifo(chr->login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+
+	loginif->connect_to_server();
 
 	return 1;
 }
 
 //------------------------------------------------
-//Invoked 15 seconds after mapif_disconnectplayer in case the map server doesn't
+//Invoked 15 seconds after mapif->disconnectplayer in case the map server doesn't
 //replies/disconnect the player we tried to kick. [Skotlex]
 //------------------------------------------------
-static int chardb_waiting_disconnect(int tid, int64 tick, int id, intptr_t data) {
+static int char_waiting_disconnect(int tid, int64 tick, int id, intptr_t data) {
 	struct online_char_data* character;
-	if ((character = (struct online_char_data*)idb_get(online_char_db, id)) != NULL && character->waiting_disconnect == tid)
+	if ((character = (struct online_char_data*)idb_get(chr->online_char_db, id)) != NULL && character->waiting_disconnect == tid)
 	{	//Mark it offline due to timeout.
 		character->waiting_disconnect = INVALID_TIMER;
-		set_char_offline(character->char_id, character->account_id);
+		chr->set_char_offline(character->char_id, character->account_id);
 	}
 	return 0;
 }
@@ -5042,21 +5442,21 @@ static int chardb_waiting_disconnect(int tid, int64 tick, int id, intptr_t data)
 /**
  * @see DBApply
  */
-static int online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
+static int char_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap)
 {
 	struct online_char_data *character= DB->data2ptr(data);
 	if (character->fd != -1)
 		return 0; //Character still connected
 	if (character->server == -2) //Unknown server.. set them offline
-		set_char_offline(character->char_id, character->account_id);
+		chr->set_char_offline(character->char_id, character->account_id);
 	if (character->server < 0)
 		//Free data from players that have not been online for a while.
-		db_remove(online_char_db, key);
+		db_remove(chr->online_char_db, key);
 	return 0;
 }
 
-static int online_data_cleanup(int tid, int64 tick, int id, intptr_t data) {
-	online_char_db->foreach(online_char_db, online_data_cleanup_sub);
+static int char_online_data_cleanup(int tid, int64 tick, int id, intptr_t data) {
+	chr->online_char_db->foreach(chr->online_char_db, chr->online_data_cleanup_sub);
 	return 0;
 }
 
@@ -5114,7 +5514,7 @@ int char_lan_config_read(const char *lancfgName)
 	return 0;
 }
 
-void sql_config_read(const char* cfgName)
+void char_sql_config_read(const char* cfgName)
 {
 	char line[1024], w1[1024], w2[1024];
 	FILE* fp;
@@ -5207,11 +5607,12 @@ void sql_config_read(const char* cfgName)
 
 		//support the import command, just like any other config
 		else if(!strcmpi(w1,"import"))
-			sql_config_read(w2);
+			chr->sql_config_read(w2);
 	}
 	fclose(fp);
 	ShowInfo("Done reading %s.\n", cfgName);
 }
+
 void char_config_dispatch(char *w1, char *w2) {
 	bool (*dispatch_to[]) (char *w1, char *w2) = {
 		/* as many as it needs */
@@ -5223,6 +5624,7 @@ void char_config_dispatch(char *w1, char *w2) {
 			break;/* we found who this belongs to, can stop */
 	}
 }
+
 int char_config_read(const char* cfgName)
 {
 	char line[1024], w1[1024], w2[1024];
@@ -5333,7 +5735,7 @@ int char_config_read(const char* cfgName)
 			// Format is: id1,quantity1,stackable1,idN,quantityN,stackableN
 			if( i%3 )
 			{
-				ShowWarning("char_config_read: There are not enough parameters in start_items, ignoring last item...\n");
+				ShowWarning("chr->config_read: There are not enough parameters in start_items, ignoring last item...\n");
 				if( i%3 == 1 )
 					start_items[i-1] = 0;
 				else
@@ -5385,9 +5787,9 @@ int char_config_read(const char* cfgName)
 		} else if (strcmpi(w1, "char_maintenance_min_group_id") == 0) {
 			char_maintenance_min_group_id = atoi(w2);
 		} else if (strcmpi(w1, "import") == 0) {
-			char_config_read(w2);
+			chr->config_read(w2);
 		} else
-			char_config_dispatch(w1,w2);
+			chr->config_dispatch(w1,w2);
 	}
 	fclose(fp);
 
@@ -5402,31 +5804,31 @@ int do_final(void) {
 
 	HPM->event(HPET_FINAL);
 	
-	set_all_offline(-1);
-	set_all_offline_sql();
+	chr->set_all_offline(-1);
+	chr->set_all_offline_sql();
 
-	inter_final();
+	inter->final();
 
 	flush_fifos();
 
 	do_final_mapif();
 	do_final_loginif();
 
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s`", ragsrvinfo_db) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s`", ragsrvinfo_db) )
+		Sql_ShowDebug(inter->sql_handle);
 
-	char_db_->destroy(char_db_, NULL);
-	online_char_db->destroy(online_char_db, NULL);
+	chr->char_db_->destroy(chr->char_db_, NULL);
+	chr->online_char_db->destroy(chr->online_char_db, NULL);
 	auth_db->destroy(auth_db, NULL);
 
-	if( char_fd != -1 ) {
-		do_close(char_fd);
-		char_fd = -1;
+	if( chr->char_fd != -1 ) {
+		do_close(chr->char_fd);
+		chr->char_fd = -1;
 	}
 
 	HPM_char_do_final();
 
-	SQL->Free(sql_handle);
+	SQL->Free(inter->sql_handle);
 	mapindex->final();
 
 	for(i = 0; i < MAX_MAP_SERVERS; i++ )
@@ -5451,7 +5853,6 @@ void set_server_type(void) {
 	SERVER_TYPE = SERVER_TYPE_CHAR;
 }
 
-
 /// Called when a terminate signal is received.
 void do_shutdown(void)
 {
@@ -5462,15 +5863,31 @@ void do_shutdown(void)
 		ShowStatus("Shutting down...\n");
 		// TODO proper shutdown procedure; wait for acks?, kick all characters, ... [FlavoJS]
 		for( id = 0; id < ARRAYLENGTH(server); ++id )
-			mapif_server_reset(id);
-		loginif_check_shutdown();
+			mapif->server_reset(id);
+		loginif->check_shutdown();
 		flush_fifos();
 		runflag = CORE_ST_STOP;
 	}
 }
 
 void char_hp_symbols(void) {
-	HPM->share(sql_handle,"sql_handle");
+	HPM->share(chr, "chr");
+	HPM->share(geoip, "geoip");
+	HPM->share(inter_auction, "inter_auction");
+	HPM->share(inter_elemental, "inter_elemental");
+	HPM->share(inter_guild, "inter_guild");
+	HPM->share(inter_homunculus, "inter_homunculus");
+	HPM->share(inter_mail, "inter_mail");
+	HPM->share(inter_mercenary, "inter_mercenary");
+	HPM->share(inter_party, "inter_party");
+	HPM->share(inter_pet, "inter_pet");
+	HPM->share(inter_quest, "inter_quest");
+	HPM->share(inter_storage, "inter_storage");
+	HPM->share(inter, "inter");
+	HPM->share(loginif, "loginif");
+	HPM->share(mapif, "mapif");
+	HPM->share(pincode, "pincode");
+	HPM->share(inter->sql_handle, "sql_handle");
 }
 
 int do_init(int argc, char **argv) {
@@ -5480,8 +5897,7 @@ int do_init(int argc, char **argv) {
 	for(i = 0; i < MAX_MAP_SERVERS; i++ )
 		server[i].map = NULL;
 
-	mapindex_defaults();
-	pincode_defaults();
+	char_load_defaults();
 
 	HPM_char_do_init();
 	HPM->symbol_defaults_sub = char_hp_symbols;
@@ -5510,9 +5926,9 @@ int do_init(int argc, char **argv) {
 	mapindex->init();
 	start_point.map = mapindex->name2id("new_zone01");
 		
-	char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
-	char_lan_config_read((argc > 3) ? argv[3] : LAN_CONF_NAME);
-	sql_config_read(SQL_CONF_NAME);
+	chr->config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
+	chr->lan_config_read((argc > 3) ? argv[3] : LAN_CONF_NAME);
+	chr->sql_config_read(SQL_CONF_NAME);
 
 	if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {
 		ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
@@ -5520,15 +5936,15 @@ int do_init(int argc, char **argv) {
 		ShowNotice("And then change the user/password to use in conf/char-server.conf (or conf/import/char_conf.txt)\n");
 	}
 	
-	inter_init_sql((argc > 2) ? argv[2] : inter_cfgName); // inter server configuration
+	inter->init_sql((argc > 2) ? argv[2] : inter_cfgName); // inter server configuration
 
 	auth_db = idb_alloc(DB_OPT_RELEASE_DATA);
-	online_char_db = idb_alloc(DB_OPT_RELEASE_DATA);
+	chr->online_char_db = idb_alloc(DB_OPT_RELEASE_DATA);
 
 	HPM->event(HPET_INIT);
 	
-	mmo_char_sql_init();
-	char_read_fame_list(); //Read fame lists.
+	chr->mmo_char_sql_init();
+	chr->read_fame_list(); //Read fame lists.
 
 	if ((sockt->naddr_ != 0) && (!login_ip || !char_ip)) {
 		char ip_str[16];
@@ -5552,39 +5968,39 @@ int do_init(int argc, char **argv) {
 	do_init_mapif();
 
 	// periodically update the overall user count on all mapservers + login server
-	timer->add_func_list(broadcast_user_count, "broadcast_user_count");
-	timer->add_interval(timer->gettick() + 1000, broadcast_user_count, 0, 0, 5 * 1000);
+	timer->add_func_list(chr->broadcast_user_count, "chr->broadcast_user_count");
+	timer->add_interval(timer->gettick() + 1000, chr->broadcast_user_count, 0, 0, 5 * 1000);
 
-	// Timer to clear (online_char_db)
-	timer->add_func_list(chardb_waiting_disconnect, "chardb_waiting_disconnect");
+	// Timer to clear (chr->online_char_db)
+	timer->add_func_list(chr->waiting_disconnect, "chr->waiting_disconnect");
 
 	// Online Data timers (checking if char still connected)
-	timer->add_func_list(online_data_cleanup, "online_data_cleanup");
-	timer->add_interval(timer->gettick() + 1000, online_data_cleanup, 0, 0, 600 * 1000);
+	timer->add_func_list(chr->online_data_cleanup, "chr->online_data_cleanup");
+	timer->add_interval(timer->gettick() + 1000, chr->online_data_cleanup, 0, 0, 600 * 1000);
 
 	//Cleaning the tables for NULL entries @ startup [Sirius]
 	//Chardb clean
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '0'", char_db) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `account_id` = '0'", char_db) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	//guilddb clean
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `guild_lv` = '0' AND `max_member` = '0' AND `exp` = '0' AND `next_exp` = '0' AND `average_lv` = '0'", guild_db) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `guild_lv` = '0' AND `max_member` = '0' AND `exp` = '0' AND `next_exp` = '0' AND `average_lv` = '0'", guild_db) )
+		Sql_ShowDebug(inter->sql_handle);
 
 	//guildmemberdb clean
-	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '0' AND `account_id` = '0' AND `char_id` = '0'", guild_member_db) )
-		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '0' AND `account_id` = '0' AND `char_id` = '0'", guild_member_db) )
+		Sql_ShowDebug(inter->sql_handle);
 
-	set_defaultparse(parse_char);
+	set_defaultparse(chr->parse_char);
 	
-	if( (char_fd = make_listen_bind(bind_ip,char_port)) == -1 ) {
+	if( (chr->char_fd = make_listen_bind(bind_ip,char_port)) == -1 ) {
 		ShowFatalError("Failed to bind to port '"CL_WHITE"%d"CL_RESET"'\n",char_port);
 		exit(EXIT_FAILURE);
 	}
 	
-	Sql_HerculesUpdateCheck(sql_handle);
+	Sql_HerculesUpdateCheck(inter->sql_handle);
 #ifdef CONSOLE_INPUT
-	console->input->setSQL(sql_handle);
+	console->input->setSQL(inter->sql_handle);
 #endif
 	ShowStatus("The char-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %d).\n\n", char_port);
 	
@@ -5598,3 +6014,193 @@ int do_init(int argc, char **argv) {
 	
 	return 0;
 }
+
+void char_load_defaults(void)
+{
+	mapindex_defaults();
+	pincode_defaults();
+	char_defaults();
+	loginif_defaults();
+	mapif_defaults();
+	inter_auction_defaults();
+	inter_elemental_defaults();
+	inter_guild_defaults();
+	inter_homunculus_defaults();
+	inter_mail_defaults();
+	inter_mercenary_defaults();
+	inter_party_defaults();
+	inter_pet_defaults();
+	inter_quest_defaults();
+	inter_storage_defaults();
+	inter_defaults();
+	geoip_defaults();
+}
+
+void char_defaults(void)
+{
+    chr = &char_s;
+
+    chr->login_fd = 0;
+    chr->char_fd = -1;
+    chr->online_char_db = NULL;
+    chr->char_db_ = NULL;
+
+    chr->waiting_disconnect = char_waiting_disconnect;
+    chr->delete_char_sql = char_delete_char_sql;
+    chr->create_online_char_data = char_create_online_char_data;
+    chr->set_account_online = char_set_account_online;
+    chr->set_account_offline = char_set_account_offline;
+    chr->set_char_charselect = char_set_char_charselect;
+    chr->set_char_online = char_set_char_online;
+    chr->set_char_offline = char_set_char_offline;
+    chr->db_setoffline = char_db_setoffline;
+    chr->db_kickoffline = char_db_kickoffline;
+    chr->set_login_all_offline = char_set_login_all_offline;
+    chr->set_all_offline = char_set_all_offline;
+    chr->set_all_offline_sql = char_set_all_offline_sql;
+    chr->create_charstatus = char_create_charstatus;
+    chr->mmo_char_tosql = char_mmo_char_tosql;
+    chr->memitemdata_to_sql = char_memitemdata_to_sql;
+    chr->inventory_to_sql = char_inventory_to_sql;
+    chr->mmo_chars_fromsql = char_mmo_chars_fromsql;
+    chr->mmo_char_fromsql = char_mmo_char_fromsql;
+    chr->mmo_char_sql_init = char_mmo_char_sql_init;
+    chr->char_slotchange = char_char_slotchange;
+    chr->rename_char_sql = char_rename_char_sql;
+    chr->check_char_name = char_check_char_name;
+    chr->make_new_char_sql = char_make_new_char_sql;
+    chr->divorce_char_sql = char_divorce_char_sql;
+    chr->count_users = char_count_users;
+    chr->mmo_char_tobuf = char_mmo_char_tobuf;
+    chr->mmo_char_send099d = char_mmo_char_send099d;
+    chr->mmo_char_send_ban_list = char_mmo_char_send_ban_list;
+    chr->mmo_char_send_slots_info = char_mmo_char_send_slots_info;
+    chr->mmo_char_send_characters = char_mmo_char_send_characters;
+    chr->char_married = char_char_married;
+    chr->char_child = char_char_child;
+    chr->char_family = char_char_family;
+    chr->disconnect_player = char_disconnect_player;
+    chr->authfail_fd = char_authfail_fd;
+    chr->request_account_data = char_request_account_data;
+    chr->auth_ok = char_auth_ok;
+    chr->ping_login_server = char_ping_login_server;
+    chr->parse_fromlogin_connection_state = char_parse_fromlogin_connection_state;
+    chr->auth_error = char_auth_error;
+    chr->parse_fromlogin_auth_state = char_parse_fromlogin_auth_state;
+    chr->parse_fromlogin_account_data = char_parse_fromlogin_account_data;
+    chr->parse_fromlogin_login_pong = char_parse_fromlogin_login_pong;
+    chr->changesex = char_changesex;
+    chr->parse_fromlogin_changesex_reply = char_parse_fromlogin_changesex_reply;
+    chr->parse_fromlogin_account_reg2 = char_parse_fromlogin_account_reg2;
+    chr->parse_fromlogin_ban = char_parse_fromlogin_ban;
+    chr->parse_fromlogin_kick = char_parse_fromlogin_kick;
+    chr->update_ip = char_update_ip;
+    chr->parse_fromlogin_update_ip = char_parse_fromlogin_update_ip;
+    chr->parse_fromlogin_accinfo2_failed = char_parse_fromlogin_accinfo2_failed;
+    chr->parse_fromlogin_accinfo2_ok = char_parse_fromlogin_accinfo2_ok;
+    chr->parse_fromlogin = char_parse_fromlogin;
+    chr->request_accreg2 = char_request_accreg2;
+    chr->global_accreg_to_login_start = char_global_accreg_to_login_start;
+    chr->global_accreg_to_login_send = char_global_accreg_to_login_send;
+    chr->global_accreg_to_login_add = char_global_accreg_to_login_add;
+    chr->read_fame_list = char_read_fame_list;
+    chr->send_fame_list = char_send_fame_list;
+    chr->update_fame_list = char_update_fame_list;
+    chr->loadName = char_loadName;
+    chr->parse_frommap_datasync = char_parse_frommap_datasync;
+    chr->parse_frommap_skillid2idx = char_parse_frommap_skillid2idx;
+    chr->map_received_ok = char_map_received_ok;
+    chr->send_maps = char_send_maps;
+    chr->parse_frommap_map_names = char_parse_frommap_map_names;
+    chr->send_scdata = char_send_scdata;
+    chr->parse_frommap_request_scdata = char_parse_frommap_request_scdata;
+    chr->parse_frommap_set_users_count = char_parse_frommap_set_users_count;
+    chr->parse_frommap_set_users = char_parse_frommap_set_users;
+    chr->save_character_ack = char_save_character_ack;
+    chr->parse_frommap_save_character = char_parse_frommap_save_character;
+    chr->select_ack = char_select_ack;
+    chr->parse_frommap_char_select_req = char_parse_frommap_char_select_req;
+    chr->change_map_server_ack = char_change_map_server_ack;
+    chr->parse_frommap_change_map_server = char_parse_frommap_change_map_server;
+    chr->parse_frommap_remove_friend = char_parse_frommap_remove_friend;
+    chr->char_name_ack = char_char_name_ack;
+    chr->parse_frommap_char_name_request = char_parse_frommap_char_name_request;
+    chr->parse_frommap_change_email = char_parse_frommap_change_email;
+    chr->ban = char_ban;
+    chr->unban = char_unban;
+    chr->ask_name_ack = char_ask_name_ack;
+    chr->parse_frommap_change_account = char_parse_frommap_change_account;
+    chr->parse_frommap_fame_list = char_parse_frommap_fame_list;
+    chr->parse_frommap_divorce_char = char_parse_frommap_divorce_char;
+    chr->parse_frommap_ragsrvinfo = char_parse_frommap_ragsrvinfo;
+    chr->parse_frommap_set_char_offline = char_parse_frommap_set_char_offline;
+    chr->parse_frommap_set_all_offline = char_parse_frommap_set_all_offline;
+    chr->parse_frommap_set_char_online = char_parse_frommap_set_char_online;
+    chr->parse_frommap_build_fame_list = char_parse_frommap_build_fame_list;
+    chr->parse_frommap_save_status_change_data = char_parse_frommap_save_status_change_data;
+    chr->send_pong = char_send_pong;
+    chr->parse_frommap_ping = char_parse_frommap_ping;
+    chr->map_auth_ok = char_map_auth_ok;
+    chr->map_auth_failed = char_map_auth_failed;
+    chr->parse_frommap_auth_request = char_parse_frommap_auth_request;
+    chr->parse_frommap_update_ip = char_parse_frommap_update_ip;
+    chr->parse_frommap_request_stats_report = char_parse_frommap_request_stats_report;
+    chr->parse_frommap_scdata_update = char_parse_frommap_scdata_update;
+    chr->parse_frommap_scdata_delete = char_parse_frommap_scdata_delete;
+    chr->parse_frommap = char_parse_frommap;
+    chr->search_mapserver = char_search_mapserver;
+    chr->mapif_init = char_mapif_init;
+    chr->lan_subnetcheck = char_lan_subnetcheck;
+    chr->delete2_ack = char_delete2_ack;
+    chr->delete2_accept_actual_ack = char_delete2_accept_actual_ack;
+    chr->delete2_accept_ack = char_delete2_accept_ack;
+    chr->delete2_cancel_ack = char_delete2_cancel_ack;
+    chr->delete2_req = char_delete2_req;
+    chr->delete2_accept = char_delete2_accept;
+    chr->delete2_cancel = char_delete2_cancel;
+    chr->send_account_id = char_send_account_id;
+    chr->parse_char_connect = char_parse_char_connect;
+    chr->send_map_info = char_send_map_info;
+    chr->send_wait_char_server = char_send_wait_char_server;
+    chr->search_default_maps_mapserver = char_search_default_maps_mapserver;
+    chr->parse_char_select = char_parse_char_select;
+    chr->creation_failed = char_creation_failed;
+    chr->creation_ok = char_creation_ok;
+    chr->parse_char_create_new_char = char_parse_char_create_new_char;
+    chr->delete_char_failed = char_delete_char_failed;
+    chr->delete_char_ok = char_delete_char_ok;
+    chr->parse_char_delete_char = char_parse_char_delete_char;
+    chr->parse_char_ping = char_parse_char_ping;
+    chr->allow_rename = char_allow_rename;
+    chr->parse_char_rename_char = char_parse_char_rename_char;
+    chr->parse_char_rename_char2 = char_parse_char_rename_char2;
+    chr->rename_char_ack = char_rename_char_ack;
+    chr->parse_char_rename_char_confirm = char_parse_char_rename_char_confirm;
+    chr->captcha_notsupported = char_captcha_notsupported;
+    chr->parse_char_request_captcha = char_parse_char_request_captcha;
+    chr->parse_char_check_captcha = char_parse_char_check_captcha;
+    chr->parse_char_delete2_req = char_parse_char_delete2_req;
+    chr->parse_char_delete2_accept = char_parse_char_delete2_accept;
+    chr->parse_char_delete2_cancel = char_parse_char_delete2_cancel;
+    chr->login_map_server_ack = char_login_map_server_ack;
+    chr->parse_char_login_map_server = char_parse_char_login_map_server;
+    chr->parse_char_pincode_check = char_parse_char_pincode_check;
+    chr->parse_char_pincode_window = char_parse_char_pincode_window;
+    chr->parse_char_pincode_change = char_parse_char_pincode_change;
+    chr->parse_char_pincode_first_pin = char_parse_char_pincode_first_pin;
+    chr->parse_char_request_chars = char_parse_char_request_chars;
+    chr->change_character_slot_ack = char_change_character_slot_ack;
+    chr->parse_char_move_character = char_parse_char_move_character;
+    chr->parse_char_unknown_packet = char_parse_char_unknown_packet;
+    chr->parse_char = char_parse_char;
+    chr->broadcast_user_count = char_broadcast_user_count;
+    chr->send_accounts_tologin_sub = char_send_accounts_tologin_sub;
+    chr->send_accounts_tologin = char_send_accounts_tologin;
+    chr->check_connect_login_server = char_check_connect_login_server;
+    chr->online_data_cleanup_sub = char_online_data_cleanup_sub;
+    chr->online_data_cleanup = char_online_data_cleanup;
+    chr->lan_config_read = char_lan_config_read;
+    chr->sql_config_read = char_sql_config_read;
+    chr->config_dispatch = char_config_dispatch;
+    chr->config_read = char_config_read;
+}