- Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).

[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

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

19 files changed, 9087 insertions, 9195 deletions

diff --git a/src/char/char.c b/src/char/char.c
index dc1dd6a72..234a91b79 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -30,9 +30,9 @@
 #include <stdlib.h>
 
 // private declarations
-#define CHAR_CONF_NAME  "conf/char_athena.conf"
-#define LAN_CONF_NAME   "conf/subnet_athena.conf"
-#define SQL_CONF_NAME   "conf/inter_athena.conf"
+#define CHAR_CONF_NAME	"conf/char_athena.conf"
+#define LAN_CONF_NAME	"conf/subnet_athena.conf"
+#define SQL_CONF_NAME	"conf/inter_athena.conf"
 
 char char_db[256] = "char";
 char scdata_db[256] = "sc_data";
@@ -68,18 +68,18 @@ char ragsrvinfo_db[256] = "ragsrvinfo";
 // show loading/saving messages
 int save_log = 1;
 
-static DBMap *char_db_; // int char_id -> struct mmo_charstatus*
+static DBMap* char_db_; // int char_id -> struct mmo_charstatus*
 
 char db_path[1024] = "db";
 
 int db_use_sqldbs;
 
 struct mmo_map_server {
-    int fd;
-    uint32 ip;
-    uint16 port;
-    int users;
-    unsigned short map[MAX_MAP_PER_SERVER];
+	int fd;
+	uint32 ip;
+	uint16 port;
+	int users;
+	unsigned short map[MAX_MAP_PER_SERVER];
 } server[MAX_MAP_SERVERS];
 
 int login_fd=-1, char_fd=-1;
@@ -109,28 +109,28 @@ int char_per_account = 0; //Maximum chars per account (default unlimited) [Siriu
 int char_del_level = 0; //From which level u can delete character [Lupus]
 int char_del_delay = 86400;
 
-int log_char = 1;   // loggin char or not [devil]
-int log_inter = 1;  // loggin inter or not [devil]
+int log_char = 1;	// loggin char or not [devil]
+int log_inter = 1;	// loggin inter or not [devil]
 
 // Advanced subnet check [LuzZza]
 struct s_subnet {
-    uint32 mask;
-    uint32 char_ip;
-    uint32 map_ip;
+	uint32 mask;
+	uint32 char_ip;
+	uint32 map_ip;
 } subnet[16];
 int subnet_count = 0;
 
 struct char_session_data {
-    bool auth; // whether the session is authed or not
-    int account_id, login_id1, login_id2, sex;
-    int found_char[MAX_CHARS]; // ids of chars on this account
-    char email[40]; // e-mail (default: a@a.com) by [Yor]
-    time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-    int group_id; // permission
-    uint32 version;
-    uint8 clienttype;
-    char new_name[NAME_LENGTH];
-    char birthdate[10+1];  // YYYY-MM-DD
+	bool auth; // whether the session is authed or not
+	int account_id, login_id1, login_id2, sex;
+	int found_char[MAX_CHARS]; // ids of chars on this account
+	char email[40]; // e-mail (default: a@a.com) by [Yor]
+	time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
+	int group_id; // permission
+	uint32 version;
+	uint8 clienttype;
+	char new_name[NAME_LENGTH];
+	char birthdate[10+1];  // YYYY-MM-DD
 };
 
 int max_connect_user = 0;
@@ -167,32 +167,32 @@ int console = 0;
 #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;
+	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 auth_node*
 
 //-----------------------------------------------------
 // Online User Database
 //-----------------------------------------------------
 
 struct online_char_data {
-    int account_id;
-    int char_id;
-    int fd;
-    int waiting_disconnect;
-    short server; // -2: unknown server, -1: not connected, 0+: id of server
+	int account_id;
+	int char_id;
+	int fd;
+	int waiting_disconnect;
+	short server; // -2: unknown server, -1: not connected, 0+: id of server
 };
 
-static DBMap *online_char_db; // int account_id -> struct online_char_data*
+static DBMap* online_char_db; // int account_id -> struct online_char_data*
 static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_t data);
 int delete_char_sql(int char_id);
 
@@ -201,129 +201,137 @@ int delete_char_sql(int char_id);
  */
 static DBData create_online_char_data(DBKey key, va_list args)
 {
-    struct online_char_data *character;
-    CREATE(character, struct online_char_data, 1);
-    character->account_id = key.i;
-    character->char_id = -1;
-    character->server = -1;
-    character->fd = -1;
-    character->waiting_disconnect = INVALID_TIMER;
-    return db_ptr2data(character);
+	struct online_char_data* character;
+	CREATE(character, struct online_char_data, 1);
+	character->account_id = key.i;
+	character->char_id = -1;
+  	character->server = -1;
+	character->fd = -1;
+	character->waiting_disconnect = INVALID_TIMER;
+	return db_ptr2data(character);
 }
 
 void set_char_charselect(int account_id)
 {
-    struct online_char_data *character;
+	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(online_char_db, account_id, create_online_char_data);
 
-    if (character->server > -1)
-        if (server[character->server].users > 0)  // Prevent this value from going negative.
-            server[character->server].users--;
+	if( character->server > -1 )
+		if( server[character->server].users > 0 ) // Prevent this value from going negative.
+			server[character->server].users--;
 
-    character->char_id = -1;
-    character->server = -1;
+	character->char_id = -1;
+	character->server = -1;
 
-    if (character->waiting_disconnect != INVALID_TIMER) {
-        delete_timer(character->waiting_disconnect, chardb_waiting_disconnect);
-        character->waiting_disconnect = INVALID_TIMER;
-    }
+	if(character->waiting_disconnect != INVALID_TIMER) {
+		delete_timer(character->waiting_disconnect, chardb_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 (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);
+	}
 
 }
 
 void 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);
-
-    //Check to see for online conflicts
-    character = (struct online_char_data *)idb_ensure(online_char_db, account_id, 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",
-                   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);
-    }
-
-    //Update state data
-    character->char_id = char_id;
-    character->server = map_id;
-
-    if (character->server > -1)
-        server[character->server].users++;
-
-    //Get rid of disconnect timer
-    if (character->waiting_disconnect != INVALID_TIMER) {
-        delete_timer(character->waiting_disconnect, chardb_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);
-
-    //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);
-    }
+	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);
+
+	//Check to see for online conflicts
+	character = (struct online_char_data*)idb_ensure(online_char_db, account_id, 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",
+			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);
+	}
+
+	//Update state data
+	character->char_id = char_id;
+	character->server = map_id;
+
+	if( character->server > -1 )
+		server[character->server].users++;
+
+	//Get rid of disconnect timer
+	if(character->waiting_disconnect != INVALID_TIMER) {
+		delete_timer(character->waiting_disconnect, chardb_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);
+
+	//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);
+	}
 }
 
 void 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);
-    } else {
-        struct mmo_charstatus *cp = (struct mmo_charstatus *)idb_get(char_db_,char_id);
-        inter_guild_CharOffline(char_id, cp?cp->guild_id:-1);
-        if (cp)
-            idb_remove(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 ((character = (struct online_char_data *)idb_get(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) {
-            delete_timer(character->waiting_disconnect, chardb_waiting_disconnect);
-            character->waiting_disconnect = INVALID_TIMER;
-        }
-
-        if (character->char_id == char_id) {
-            character->char_id = -1;
-            character->server = -1;
-        }
-
-        //FIXME? Why Kevin free'd the online information when the char was effectively in the map-server?
-    }
-
-    //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);
-    }
+	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);
+	}
+	else
+	{
+		struct mmo_charstatus* cp = (struct mmo_charstatus*)idb_get(char_db_,char_id);
+		inter_guild_CharOffline(char_id, cp?cp->guild_id:-1);
+		if (cp)
+			idb_remove(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 ((character = (struct online_char_data*)idb_get(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){
+			delete_timer(character->waiting_disconnect, chardb_waiting_disconnect);
+			character->waiting_disconnect = INVALID_TIMER;
+		}
+
+		if(character->char_id == char_id)
+		{
+			character->char_id = -1;
+			character->server = -1;
+		}
+
+		//FIXME? Why Kevin free'd the online information when the char was effectively in the map-server?
+	}
+
+	//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);
+	}
 }
 
 /**
@@ -331,18 +339,18 @@ void set_char_offline(int char_id, int account_id)
  */
 static int char_db_setoffline(DBKey key, DBData *data, va_list ap)
 {
-    struct online_char_data *character = (struct online_char_data *)db_data2ptr(data);
-    int server = va_arg(ap, int);
-    if (server == -1) {
-        character->char_id = -1;
-        character->server = -1;
-        if (character->waiting_disconnect != INVALID_TIMER) {
-            delete_timer(character->waiting_disconnect, chardb_waiting_disconnect);
-            character->waiting_disconnect = INVALID_TIMER;
-        }
-    } else if (character->server == server)
-        character->server = -2; //In some map server that we aren't connected to.
-    return 0;
+	struct online_char_data* character = (struct online_char_data*)db_data2ptr(data);
+	int server = va_arg(ap, int);
+	if (server == -1) {
+		character->char_id = -1;
+		character->server = -1;
+		if(character->waiting_disconnect != INVALID_TIMER){
+			delete_timer(character->waiting_disconnect, chardb_waiting_disconnect);
+			character->waiting_disconnect = INVALID_TIMER;
+		}
+	} else if (character->server == server)
+		character->server = -2; //In some map server that we aren't connected to.
+	return 0;
 }
 
 /**
@@ -350,48 +358,48 @@ static int char_db_setoffline(DBKey key, DBData *data, va_list ap)
  */
 static int char_db_kickoffline(DBKey key, DBData *data, va_list ap)
 {
-    struct online_char_data *character = (struct online_char_data *)db_data2ptr(data);
-    int server_id = va_arg(ap, int);
+	struct online_char_data* character = (struct online_char_data*)db_data2ptr(data);
+	int server_id = va_arg(ap, int);
 
-    if (server_id > -1 && character->server != server_id)
-        return 0;
+	if (server_id > -1 && character->server != server_id)
+		return 0;
 
-    //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);
-    else if (character->waiting_disconnect == INVALID_TIMER)
-        set_char_offline(character->char_id, character->account_id);
-    else
-        return 0; // fail
+	//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);
+	else if (character->waiting_disconnect == INVALID_TIMER)
+		set_char_offline(character->char_id, character->account_id);
+	else
+		return 0; // fail
 
-    return 1;
+	return 1;
 }
 
 void 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);
-
-    if (id >= 0 || login_fd <= 0 || session[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);
+	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);
+
+	if (id >= 0 || login_fd <= 0 || session[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);
 }
 
 void 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);
+	//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);
 }
 
 /**
@@ -399,920 +407,949 @@ void set_all_offline_sql(void)
  */
 static DBData create_charstatus(DBKey key, va_list args)
 {
-    struct mmo_charstatus *cp;
-    cp = (struct mmo_charstatus *) aCalloc(1,sizeof(struct mmo_charstatus));
-    cp->char_id = key.i;
-    return db_ptr2data(cp);
+	struct mmo_charstatus *cp;
+	cp = (struct mmo_charstatus *) aCalloc(1,sizeof(struct mmo_charstatus));
+	cp->char_id = key.i;
+	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 mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 {
-    int i = 0;
-    int count = 0;
-    int diff = 0;
-    char save_status[128]; //For displaying save information. [Skotlex]
-    struct mmo_charstatus *cp;
-    int errors = 0; //If there are any errors while saving, "cp" will not be updated at the end.
-    StringBuf buf;
-
-    if (char_id!=p->char_id) return 0;
-
-    cp = idb_ensure(char_db_, char_id, create_charstatus);
-
-    StringBuf_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))
-            strcat(save_status, " inventory");
-        else
-            errors++;
-    }
-
-    //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))
-            strcat(save_status, " cart");
-        else
-            errors++;
-    }
-
-    //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))
-            strcat(save_status, " storage");
-        else
-            errors++;
-    }
-
-    if (
-        (p->base_exp != cp->base_exp) || (p->base_level != cp->base_level) ||
-        (p->job_level != cp->job_level) || (p->job_exp != cp->job_exp) ||
-        (p->zeny != cp->zeny) ||
-        (p->last_point.map != cp->last_point.map) ||
-        (p->last_point.x != cp->last_point.x) || (p->last_point.y != cp->last_point.y) ||
-        (p->max_hp != cp->max_hp) || (p->hp != cp->hp) ||
-        (p->max_sp != cp->max_sp) || (p->sp != cp->sp) ||
-        (p->status_point != cp->status_point) || (p->skill_point != cp->skill_point) ||
-        (p->str != cp->str) || (p->agi != cp->agi) || (p->vit != cp->vit) ||
-        (p->int_ != cp->int_) || (p->dex != cp->dex) || (p->luk != cp->luk) ||
-        (p->option != cp->option) ||
-        (p->party_id != cp->party_id) || (p->guild_id != cp->guild_id) ||
-        (p->pet_id != cp->pet_id) || (p->weapon != cp->weapon) || (p->hom_id != cp->hom_id) ||
-        (p->ele_id != cp->ele_id) || (p->shield != cp->shield) || (p->head_top != cp->head_top) ||
-        (p->head_mid != cp->head_mid) || (p->head_bottom != cp->head_bottom) || (p->delete_date != cp->delete_date) ||
-        (p->rename != cp->rename) || (p->robe != cp->robe)
-    ) {
-        //Save status
-        if (SQL_ERROR == Sql_Query(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',"
-                                   "`option`='%d',`party_id`='%d',`guild_id`='%d',`pet_id`='%d',`homun_id`='%d',`elemental_id`='%d',"
-                                   "`weapon`='%d',`shield`='%d',`head_top`='%d',`head_mid`='%d',`head_bottom`='%d',"
-                                   "`last_map`='%s',`last_x`='%d',`last_y`='%d',`save_map`='%s',`save_x`='%d',`save_y`='%d', `rename`='%d',"
-                                   "`delete_date`='%lu',`robe`='%d'"
-                                   " WHERE  `account_id`='%d' AND `char_id` = '%d'",
-                                   char_db, p->base_level, p->job_level,
-                                   p->base_exp, p->job_exp, p->zeny,
-                                   p->max_hp, p->hp, p->max_sp, p->sp, p->status_point, p->skill_point,
-                                   p->str, p->agi, p->vit, p->int_, p->dex, p->luk,
-                                   p->option, p->party_id, p->guild_id, p->pet_id, p->hom_id, p->ele_id,
-                                   p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom,
-                                   mapindex_id2name(p->last_point.map), p->last_point.x, p->last_point.y,
-                                   mapindex_id2name(p->save_point.map), p->save_point.x, p->save_point.y, p->rename,
-                                   (unsigned long)p->delete_date,  // FIXME: platform-dependent size
-                                   p->robe,
-                                   p->account_id, p->char_id)) {
-            Sql_ShowDebug(sql_handle);
-            errors++;
-        } else
-            strcat(save_status, " status");
-    }
-
-    //Values that will seldom change (to speed up saving)
-    if (
-        (p->hair != cp->hair) || (p->hair_color != cp->hair_color) || (p->clothes_color != cp->clothes_color) ||
-        (p->class_ != cp->class_) ||
-        (p->partner_id != cp->partner_id) || (p->father != cp->father) ||
-        (p->mother != cp->mother) || (p->child != cp->child) ||
-        (p->karma != cp->karma) || (p->manner != cp->manner) ||
-        (p->fame != cp->fame)
-    ) {
-        if (SQL_ERROR == Sql_Query(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'"
-                                   " WHERE  `account_id`='%d' AND `char_id` = '%d'",
-                                   char_db, p->class_,
-                                   p->hair, p->hair_color, p->clothes_color,
-                                   p->partner_id, p->father, p->mother, p->child,
-                                   p->karma, p->manner, p->fame,
-                                   p->account_id, p->char_id)) {
-            Sql_ShowDebug(sql_handle);
-            errors++;
-        } else
-            strcat(save_status, " status2");
-    }
-
-    /* Mercenary Owner */
-    if ((p->mer_id != cp->mer_id) ||
-        (p->arch_calls != cp->arch_calls) || (p->arch_faith != cp->arch_faith) ||
-        (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))
-            strcat(save_status, " mercenary");
-        else
-            errors++;
-    }
-
-    //memo points
-    if (memcmp(p->memo_point, cp->memo_point, sizeof(p->memo_point))) {
-        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)) {
-            Sql_ShowDebug(sql_handle);
-            errors++;
-        }
-
-        //insert here.
-        StringBuf_Clear(&buf);
-        StringBuf_Printf(&buf, "INSERT INTO `%s`(`char_id`,`map`,`x`,`y`) VALUES ", memo_db);
-        for (i = 0, count = 0; i < MAX_MEMOPOINTS; ++i) {
-            if (p->memo_point[i].map) {
-                if (count)
-                    StringBuf_AppendStr(&buf, ",");
-                Sql_EscapeString(sql_handle, esc_mapname, mapindex_id2name(p->memo_point[i].map));
-                StringBuf_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, StringBuf_Value(&buf))) {
-                Sql_ShowDebug(sql_handle);
-                errors++;
-            }
-        }
-        strcat(save_status, " memo");
-    }
-
-    //FIXME: is this neccessary? [ultramage]
-    for (i=0; i<MAX_SKILL; i++)
-        if ((p->skill[i].lv != 0) && (p->skill[i].id == 0))
-            p->skill[i].id = i; // Fix skill tree
-
-
-    //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);
-            errors++;
-        }
-
-        StringBuf_Clear(&buf);
-        StringBuf_Printf(&buf, "INSERT INTO `%s`(`char_id`,`id`,`lv`) VALUES ", skill_db);
-        //insert here.
-        for (i = 0, count = 0; i < MAX_SKILL; ++i) {
-            if (p->skill[i].id != 0 && p->skill[i].flag != SKILL_FLAG_TEMPORARY) {
-                if (p->skill[i].flag == SKILL_FLAG_PERMANENT && p->skill[i].lv == 0)
-                    continue;
-                if (p->skill[i].flag != SKILL_FLAG_PERMANENT && (p->skill[i].flag - SKILL_FLAG_REPLACED_LV_0) == 0)
-                    continue;
-                if (count)
-                    StringBuf_AppendStr(&buf, ",");
-                StringBuf_Printf(&buf, "('%d','%d','%d')", char_id, p->skill[i].id, (p->skill[i].flag == SKILL_FLAG_PERMANENT ? p->skill[i].lv : p->skill[i].flag - SKILL_FLAG_REPLACED_LV_0));
-                ++count;
-            }
-        }
-        if (count) {
-            if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
-                Sql_ShowDebug(sql_handle);
-                errors++;
-            }
-        }
-
-        strcat(save_status, " skills");
-    }
-
-    diff = 0;
-    for (i = 0; i < MAX_FRIENDS; i++) {
-        if (p->friends[i].char_id != cp->friends[i].char_id ||
-            p->friends[i].account_id != cp->friends[i].account_id) {
-            diff = 1;
-            break;
-        }
-    }
-
-    if (diff == 1) {
-        //Save friends
-        if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", friend_db, char_id)) {
-            Sql_ShowDebug(sql_handle);
-            errors++;
-        }
-
-        StringBuf_Clear(&buf);
-        StringBuf_Printf(&buf, "INSERT INTO `%s` (`char_id`, `friend_account`, `friend_id`) VALUES ", friend_db);
-        for (i = 0, count = 0; i < MAX_FRIENDS; ++i) {
-            if (p->friends[i].char_id > 0) {
-                if (count)
-                    StringBuf_AppendStr(&buf, ",");
-                StringBuf_Printf(&buf, "('%d','%d','%d')", char_id, p->friends[i].account_id, p->friends[i].char_id);
-                count++;
-            }
-        }
-        if (count) {
-            if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
-                Sql_ShowDebug(sql_handle);
-                errors++;
-            }
-        }
-        strcat(save_status, " friends");
-    }
+	int i = 0;
+	int count = 0;
+	int diff = 0;
+	char save_status[128]; //For displaying save information. [Skotlex]
+	struct mmo_charstatus *cp;
+	int errors = 0; //If there are any errors while saving, "cp" will not be updated at the end.
+	StringBuf buf;
+
+	if (char_id!=p->char_id) return 0;
+
+	cp = idb_ensure(char_db_, char_id, create_charstatus);
+
+	StringBuf_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))
+			strcat(save_status, " inventory");
+		else
+			errors++;
+	}
+
+	//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))
+			strcat(save_status, " cart");
+		else
+			errors++;
+	}
+
+	//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))
+			strcat(save_status, " storage");
+		else
+			errors++;
+	}
+
+	if (
+		(p->base_exp != cp->base_exp) || (p->base_level != cp->base_level) ||
+		(p->job_level != cp->job_level) || (p->job_exp != cp->job_exp) ||
+		(p->zeny != cp->zeny) ||
+		(p->last_point.map != cp->last_point.map) ||
+		(p->last_point.x != cp->last_point.x) || (p->last_point.y != cp->last_point.y) ||
+		(p->max_hp != cp->max_hp) || (p->hp != cp->hp) ||
+		(p->max_sp != cp->max_sp) || (p->sp != cp->sp) ||
+		(p->status_point != cp->status_point) || (p->skill_point != cp->skill_point) ||
+		(p->str != cp->str) || (p->agi != cp->agi) || (p->vit != cp->vit) ||
+		(p->int_ != cp->int_) || (p->dex != cp->dex) || (p->luk != cp->luk) ||
+		(p->option != cp->option) ||
+		(p->party_id != cp->party_id) || (p->guild_id != cp->guild_id) ||
+		(p->pet_id != cp->pet_id) || (p->weapon != cp->weapon) || (p->hom_id != cp->hom_id) ||
+		(p->ele_id != cp->ele_id) || (p->shield != cp->shield) || (p->head_top != cp->head_top) ||
+		(p->head_mid != cp->head_mid) || (p->head_bottom != cp->head_bottom) || (p->delete_date != cp->delete_date) ||
+		(p->rename != cp->rename) || (p->robe != cp->robe)
+	)
+	{	//Save status
+		if( SQL_ERROR == Sql_Query(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',"
+			"`option`='%d',`party_id`='%d',`guild_id`='%d',`pet_id`='%d',`homun_id`='%d',`elemental_id`='%d',"
+			"`weapon`='%d',`shield`='%d',`head_top`='%d',`head_mid`='%d',`head_bottom`='%d',"
+			"`last_map`='%s',`last_x`='%d',`last_y`='%d',`save_map`='%s',`save_x`='%d',`save_y`='%d', `rename`='%d',"
+			"`delete_date`='%lu',`robe`='%d'"
+			" WHERE  `account_id`='%d' AND `char_id` = '%d'",
+			char_db, p->base_level, p->job_level,
+			p->base_exp, p->job_exp, p->zeny,
+			p->max_hp, p->hp, p->max_sp, p->sp, p->status_point, p->skill_point,
+			p->str, p->agi, p->vit, p->int_, p->dex, p->luk,
+			p->option, p->party_id, p->guild_id, p->pet_id, p->hom_id, p->ele_id,
+			p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom,
+			mapindex_id2name(p->last_point.map), p->last_point.x, p->last_point.y,
+			mapindex_id2name(p->save_point.map), p->save_point.x, p->save_point.y, p->rename,
+			(unsigned long)p->delete_date,  // FIXME: platform-dependent size
+			p->robe,
+			p->account_id, p->char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			errors++;
+		} else
+			strcat(save_status, " status");
+	}
+
+	//Values that will seldom change (to speed up saving)
+	if (
+		(p->hair != cp->hair) || (p->hair_color != cp->hair_color) || (p->clothes_color != cp->clothes_color) ||
+		(p->class_ != cp->class_) ||
+		(p->partner_id != cp->partner_id) || (p->father != cp->father) ||
+		(p->mother != cp->mother) || (p->child != cp->child) ||
+ 		(p->karma != cp->karma) || (p->manner != cp->manner) ||
+		(p->fame != cp->fame)
+	)
+	{
+		if( SQL_ERROR == Sql_Query(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'"
+			" WHERE  `account_id`='%d' AND `char_id` = '%d'",
+			char_db, p->class_,
+			p->hair, p->hair_color, p->clothes_color,
+			p->partner_id, p->father, p->mother, p->child,
+			p->karma, p->manner, p->fame,
+			p->account_id, p->char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			errors++;
+		} else
+			strcat(save_status, " status2");
+	}
+
+	/* Mercenary Owner */
+	if( (p->mer_id != cp->mer_id) ||
+		(p->arch_calls != cp->arch_calls) || (p->arch_faith != cp->arch_faith) ||
+		(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))
+			strcat(save_status, " mercenary");
+		else
+			errors++;
+	}
+
+	//memo points
+	if( memcmp(p->memo_point, cp->memo_point, sizeof(p->memo_point)) )
+	{
+		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) )
+		{
+			Sql_ShowDebug(sql_handle);
+			errors++;
+		}
+
+		//insert here.
+		StringBuf_Clear(&buf);
+		StringBuf_Printf(&buf, "INSERT INTO `%s`(`char_id`,`map`,`x`,`y`) VALUES ", memo_db);
+		for( i = 0, count = 0; i < MAX_MEMOPOINTS; ++i )
+		{
+			if( p->memo_point[i].map )
+			{
+				if( count )
+					StringBuf_AppendStr(&buf, ",");
+				Sql_EscapeString(sql_handle, esc_mapname, mapindex_id2name(p->memo_point[i].map));
+				StringBuf_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, StringBuf_Value(&buf)) )
+			{
+				Sql_ShowDebug(sql_handle);
+				errors++;
+			}
+		}
+		strcat(save_status, " memo");
+	}
+
+	//FIXME: is this neccessary? [ultramage]
+	for(i=0;i<MAX_SKILL;i++)
+		if ((p->skill[i].lv != 0) && (p->skill[i].id == 0))
+			p->skill[i].id = i; // Fix skill tree
+
+
+	//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);
+			errors++;
+		}
+
+		StringBuf_Clear(&buf);
+		StringBuf_Printf(&buf, "INSERT INTO `%s`(`char_id`,`id`,`lv`) VALUES ", skill_db);
+		//insert here.
+		for( i = 0, count = 0; i < MAX_SKILL; ++i )
+		{
+			if( p->skill[i].id != 0 && p->skill[i].flag != SKILL_FLAG_TEMPORARY )
+			{
+				if( p->skill[i].flag == SKILL_FLAG_PERMANENT && p->skill[i].lv == 0 )
+					continue;
+				if( p->skill[i].flag != SKILL_FLAG_PERMANENT && (p->skill[i].flag - SKILL_FLAG_REPLACED_LV_0) == 0 )
+					continue;
+				if( count )
+					StringBuf_AppendStr(&buf, ",");
+				StringBuf_Printf(&buf, "('%d','%d','%d')", char_id, p->skill[i].id, (p->skill[i].flag == SKILL_FLAG_PERMANENT ? p->skill[i].lv : p->skill[i].flag - SKILL_FLAG_REPLACED_LV_0));
+				++count;
+			}
+		}
+		if( count )
+		{
+			if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+			{
+				Sql_ShowDebug(sql_handle);
+				errors++;
+			}
+		}
+
+		strcat(save_status, " skills");
+	}
+
+	diff = 0;
+	for(i = 0; i < MAX_FRIENDS; i++){
+		if(p->friends[i].char_id != cp->friends[i].char_id ||
+			p->friends[i].account_id != cp->friends[i].account_id){
+			diff = 1;
+			break;
+		}
+	}
+
+	if(diff == 1)
+	{	//Save friends
+		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", friend_db, char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			errors++;
+		}
+
+		StringBuf_Clear(&buf);
+		StringBuf_Printf(&buf, "INSERT INTO `%s` (`char_id`, `friend_account`, `friend_id`) VALUES ", friend_db);
+		for( i = 0, count = 0; i < MAX_FRIENDS; ++i )
+		{
+			if( p->friends[i].char_id > 0 )
+			{
+				if( count )
+					StringBuf_AppendStr(&buf, ",");
+				StringBuf_Printf(&buf, "('%d','%d','%d')", char_id, p->friends[i].account_id, p->friends[i].char_id);
+				count++;
+			}
+		}
+		if( count )
+		{
+			if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+			{
+				Sql_ShowDebug(sql_handle);
+				errors++;
+			}
+		}
+		strcat(save_status, " friends");
+	}
 
 #ifdef HOTKEY_SAVING
-    // hotkeys
-    StringBuf_Clear(&buf);
-    StringBuf_Printf(&buf, "REPLACE INTO `%s` (`char_id`, `hotkey`, `type`, `itemskill_id`, `skill_lvl`) VALUES ", hotkey_db);
-    diff = 0;
-    for (i = 0; i < ARRAYLENGTH(p->hotkeys); i++) {
-        if (memcmp(&p->hotkeys[i], &cp->hotkeys[i], sizeof(struct hotkey))) {
-            if (diff)
-                StringBuf_AppendStr(&buf, ",");// not the first hotkey
-            StringBuf_Printf(&buf, "('%d','%u','%u','%u','%u')", char_id, (unsigned int)i, (unsigned int)p->hotkeys[i].type, p->hotkeys[i].id , (unsigned int)p->hotkeys[i].lv);
-            diff = 1;
-        }
-    }
-    if (diff) {
-        if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
-            Sql_ShowDebug(sql_handle);
-            errors++;
-        } else
-            strcat(save_status, " hotkeys");
-    }
+	// hotkeys
+	StringBuf_Clear(&buf);
+	StringBuf_Printf(&buf, "REPLACE INTO `%s` (`char_id`, `hotkey`, `type`, `itemskill_id`, `skill_lvl`) VALUES ", hotkey_db);
+	diff = 0;
+	for(i = 0; i < ARRAYLENGTH(p->hotkeys); i++){
+		if(memcmp(&p->hotkeys[i], &cp->hotkeys[i], sizeof(struct hotkey)))
+		{
+			if( diff )
+				StringBuf_AppendStr(&buf, ",");// not the first hotkey
+			StringBuf_Printf(&buf, "('%d','%u','%u','%u','%u')", char_id, (unsigned int)i, (unsigned int)p->hotkeys[i].type, p->hotkeys[i].id , (unsigned int)p->hotkeys[i].lv);
+			diff = 1;
+		}
+	}
+	if(diff) {
+		if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+		{
+			Sql_ShowDebug(sql_handle);
+			errors++;
+		} else
+			strcat(save_status, " hotkeys");
+	}
 #endif
-    StringBuf_Destroy(&buf);
-    if (save_status[0]!='\0' && save_log)
-        ShowInfo("Saved char %d - %s:%s.\n", char_id, p->name, save_status);
-    if (!errors)
-        memcpy(cp, p, sizeof(struct mmo_charstatus));
-    return 0;
+	StringBuf_Destroy(&buf);
+	if (save_status[0]!='\0' && save_log)
+		ShowInfo("Saved char %d - %s:%s.\n", char_id, p->name, save_status);
+	if (!errors)
+		memcpy(cp, p, sizeof(struct mmo_charstatus));
+	return 0;
 }
 
 /// Saves an array of 'item' entries into the specified table.
 int memitemdata_to_sql(const struct item items[], int max, int id, int tableswitch)
 {
-    StringBuf buf;
-    SqlStmt *stmt;
-    int i;
-    int j;
-    const char *tablename;
-    const char *selectoption;
-    struct item item; // temp storage variable
-    bool *flag; // bit array for inventory matching
-    bool found;
-    int errors = 0;
-
-    switch (tableswitch) {
-        case TABLE_INVENTORY:
-            tablename = inventory_db;
-            selectoption = "char_id";
-            break;
-        case TABLE_CART:
-            tablename = cart_db;
-            selectoption = "char_id";
-            break;
-        case TABLE_STORAGE:
-            tablename = storage_db;
-            selectoption = "account_id";
-            break;
-        case TABLE_GUILD_STORAGE:
-            tablename = guild_storage_db;
-            selectoption = "guild_id";
-            break;
-        default:
-            ShowError("Invalid table name!\n");
-            return 1;
-    }
-
-
-    // The following code compares inventory with current database values
-    // and performs modification/deletion/insertion only on relevant rows.
-    // This approach is more complicated than a trivial delete&insert, but
-    // it significantly reduces cpu load on the database server.
-
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`");
-    for (j = 0; j < MAX_SLOTS; ++j)
-        StringBuf_Printf(&buf, ", `card%d`", j);
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `%s`='%d'", tablename, selectoption, id);
-
-    stmt = SqlStmt_Malloc(sql_handle);
-    if (SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)) {
-        SqlStmt_ShowDebug(stmt);
-        SqlStmt_Free(stmt);
-        StringBuf_Destroy(&buf);
-        return 1;
-    }
-
-    SqlStmt_BindColumn(stmt, 0, SQLDT_INT,       &item.id,          0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,     &item.nameid,      0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,     &item.amount,      0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT,    &item.equip,       0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 4, SQLDT_CHAR,      &item.identify,    0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 5, SQLDT_CHAR,      &item.refine,      0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 6, SQLDT_CHAR,      &item.attribute,   0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 7, SQLDT_UINT,      &item.expire_time, 0, NULL, NULL);
-    for (j = 0; j < MAX_SLOTS; ++j)
-        SqlStmt_BindColumn(stmt, 8+j, SQLDT_SHORT, &item.card[j], 0, NULL, NULL);
-
-    // bit array indicating which inventory items have already been matched
-    flag = (bool *) aCalloc(max, sizeof(bool));
-
-    while (SQL_SUCCESS == SqlStmt_NextRow(stmt)) {
-        found = false;
-        // search for the presence of the item in the char's inventory
-        for (i = 0; i < max; ++i) {
-            // skip empty and already matched entries
-            if (items[i].nameid == 0 || flag[i])
-                continue;
-
-            if (items[i].nameid == item.nameid
-                &&  items[i].card[0] == item.card[0]
-                &&  items[i].card[2] == item.card[2]
-                &&  items[i].card[3] == item.card[3]
-               ) { //They are the same item.
-                ARR_FIND(0, MAX_SLOTS, j, items[i].card[j] != item.card[j]);
-                if (j == MAX_SLOTS &&
-                    items[i].amount == item.amount &&
-                    items[i].equip == item.equip &&
-                    items[i].identify == item.identify &&
-                    items[i].refine == item.refine &&
-                    items[i].attribute == item.attribute &&
-                    items[i].expire_time == item.expire_time)
-                    ;   //Do nothing.
-                else {
-                    // update all fields.
-                    StringBuf_Clear(&buf);
-                    StringBuf_Printf(&buf, "UPDATE `%s` SET `amount`='%d', `equip`='%d', `identify`='%d', `refine`='%d',`attribute`='%d', `expire_time`='%u'",
-                                     tablename, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time);
-                    for (j = 0; j < MAX_SLOTS; ++j)
-                        StringBuf_Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
-                    StringBuf_Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
-
-                    if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
-                        Sql_ShowDebug(sql_handle);
-                        errors++;
-                    }
-                }
-
-                found = flag[i] = true; //Item dealt with,
-                break; //skip to next item in the db.
-            }
-        }
-        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)) {
-                Sql_ShowDebug(sql_handle);
-                errors++;
-            }
-        }
-    }
-    SqlStmt_Free(stmt);
-
-    StringBuf_Clear(&buf);
-    StringBuf_Printf(&buf, "INSERT INTO `%s`(`%s`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`", tablename, selectoption);
-    for (j = 0; j < MAX_SLOTS; ++j)
-        StringBuf_Printf(&buf, ", `card%d`", j);
-    StringBuf_AppendStr(&buf, ") VALUES ");
-
-    found = false;
-    // insert non-matched items into the db as new items
-    for (i = 0; i < max; ++i) {
-        // skip empty and already matched entries
-        if (items[i].nameid == 0 || flag[i])
-            continue;
-
-        if (found)
-            StringBuf_AppendStr(&buf, ",");
-        else
-            found = true;
-
-        StringBuf_Printf(&buf, "('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u'",
-                         id, items[i].nameid, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time);
-        for (j = 0; j < MAX_SLOTS; ++j)
-            StringBuf_Printf(&buf, ", '%d'", items[i].card[j]);
-        StringBuf_AppendStr(&buf, ")");
-    }
-
-    if (found && SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
-        Sql_ShowDebug(sql_handle);
-        errors++;
-    }
-
-    StringBuf_Destroy(&buf);
-    aFree(flag);
-
-    return errors;
+	StringBuf buf;
+	SqlStmt* stmt;
+	int i;
+	int j;
+	const char* tablename;
+	const char* selectoption;
+	struct item item; // temp storage variable
+	bool* flag; // bit array for inventory matching
+	bool found;
+	int errors = 0;
+
+	switch (tableswitch) {
+	case TABLE_INVENTORY:     tablename = inventory_db;     selectoption = "char_id";    break;
+	case TABLE_CART:          tablename = cart_db;          selectoption = "char_id";    break;
+	case TABLE_STORAGE:       tablename = storage_db;       selectoption = "account_id"; break;
+	case TABLE_GUILD_STORAGE: tablename = guild_storage_db; selectoption = "guild_id";   break;
+	default:
+		ShowError("Invalid table name!\n");
+		return 1;
+	}
+
+
+	// The following code compares inventory with current database values
+	// and performs modification/deletion/insertion only on relevant rows.
+	// This approach is more complicated than a trivial delete&insert, but
+	// it significantly reduces cpu load on the database server.
+
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`");
+	for( j = 0; j < MAX_SLOTS; ++j )
+		StringBuf_Printf(&buf, ", `card%d`", j);
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `%s`='%d'", tablename, selectoption, id);
+
+	stmt = SqlStmt_Malloc(sql_handle);
+	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	||  SQL_ERROR == SqlStmt_Execute(stmt) )
+	{
+		SqlStmt_ShowDebug(stmt);
+		SqlStmt_Free(stmt);
+		StringBuf_Destroy(&buf);
+		return 1;
+	}
+
+	SqlStmt_BindColumn(stmt, 0, SQLDT_INT,       &item.id,          0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,     &item.nameid,      0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,     &item.amount,      0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT,    &item.equip,       0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 4, SQLDT_CHAR,      &item.identify,    0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 5, SQLDT_CHAR,      &item.refine,      0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 6, SQLDT_CHAR,      &item.attribute,   0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 7, SQLDT_UINT,      &item.expire_time, 0, NULL, NULL);
+	for( j = 0; j < MAX_SLOTS; ++j )
+		SqlStmt_BindColumn(stmt, 8+j, SQLDT_SHORT, &item.card[j], 0, NULL, NULL);
+
+	// bit array indicating which inventory items have already been matched
+	flag = (bool*) aCalloc(max, sizeof(bool));
+
+	while( SQL_SUCCESS == SqlStmt_NextRow(stmt) )
+	{
+		found = false;
+		// search for the presence of the item in the char's inventory
+		for( i = 0; i < max; ++i )
+		{
+			// skip empty and already matched entries
+			if( items[i].nameid == 0 || flag[i] )
+				continue;
+
+			if( items[i].nameid == item.nameid
+			&&  items[i].card[0] == item.card[0]
+			&&  items[i].card[2] == item.card[2]
+			&&  items[i].card[3] == item.card[3]
+			) {	//They are the same item.
+				ARR_FIND( 0, MAX_SLOTS, j, items[i].card[j] != item.card[j] );
+				if( j == MAX_SLOTS &&
+				    items[i].amount == item.amount &&
+				    items[i].equip == item.equip &&
+				    items[i].identify == item.identify &&
+				    items[i].refine == item.refine &&
+				    items[i].attribute == item.attribute &&
+				    items[i].expire_time == item.expire_time )
+				;	//Do nothing.
+				else
+				{
+					// update all fields.
+					StringBuf_Clear(&buf);
+					StringBuf_Printf(&buf, "UPDATE `%s` SET `amount`='%d', `equip`='%d', `identify`='%d', `refine`='%d',`attribute`='%d', `expire_time`='%u'",
+						tablename, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time);
+					for( j = 0; j < MAX_SLOTS; ++j )
+						StringBuf_Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
+					StringBuf_Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
+					
+					if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+					{
+						Sql_ShowDebug(sql_handle);
+						errors++;
+					}
+				}
+
+				found = flag[i] = true; //Item dealt with,
+				break; //skip to next item in the db.
+			}
+		}
+		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) )
+			{
+				Sql_ShowDebug(sql_handle);
+				errors++;
+			}
+		}
+	}
+	SqlStmt_Free(stmt);
+
+	StringBuf_Clear(&buf);
+	StringBuf_Printf(&buf, "INSERT INTO `%s`(`%s`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`", tablename, selectoption);
+	for( j = 0; j < MAX_SLOTS; ++j )
+		StringBuf_Printf(&buf, ", `card%d`", j);
+	StringBuf_AppendStr(&buf, ") VALUES ");
+
+	found = false;
+	// insert non-matched items into the db as new items
+	for( i = 0; i < max; ++i )
+	{
+		// skip empty and already matched entries
+		if( items[i].nameid == 0 || flag[i] )
+			continue;
+
+		if( found )
+			StringBuf_AppendStr(&buf, ",");
+		else
+			found = true;
+
+		StringBuf_Printf(&buf, "('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u'",
+			id, items[i].nameid, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time);
+		for( j = 0; j < MAX_SLOTS; ++j )
+			StringBuf_Printf(&buf, ", '%d'", items[i].card[j]);
+		StringBuf_AppendStr(&buf, ")");
+	}
+
+	if( found && SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+	{
+		Sql_ShowDebug(sql_handle);
+		errors++;
+	}
+
+	StringBuf_Destroy(&buf);
+	aFree(flag);
+
+	return errors;
 }
 /* pretty much a copy of 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)
-{
-    StringBuf buf;
-    SqlStmt *stmt;
-    int i;
-    int j;
-    struct item item; // temp storage variable
-    bool *flag; // bit array for inventory matching
-    bool found;
-    int errors = 0;
-
-
-    // The following code compares inventory with current database values
-    // and performs modification/deletion/insertion only on relevant rows.
-    // This approach is more complicated than a trivial delete&insert, but
-    // it significantly reduces cpu load on the database server.
-
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`");
-    for (j = 0; j < MAX_SLOTS; ++j)
-        StringBuf_Printf(&buf, ", `card%d`", j);
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `char_id`='%d'", inventory_db, id);
-
-    stmt = SqlStmt_Malloc(sql_handle);
-    if (SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)) {
-        SqlStmt_ShowDebug(stmt);
-        SqlStmt_Free(stmt);
-        StringBuf_Destroy(&buf);
-        return 1;
-    }
-
-    SqlStmt_BindColumn(stmt, 0, SQLDT_INT,       &item.id,          0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,     &item.nameid,      0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,     &item.amount,      0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT,    &item.equip,       0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 4, SQLDT_CHAR,      &item.identify,    0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 5, SQLDT_CHAR,      &item.refine,      0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 6, SQLDT_CHAR,      &item.attribute,   0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 7, SQLDT_UINT,      &item.expire_time, 0, NULL, NULL);
-    SqlStmt_BindColumn(stmt, 8, SQLDT_CHAR,      &item.favorite,    0, NULL, NULL);
-    for (j = 0; j < MAX_SLOTS; ++j)
-        SqlStmt_BindColumn(stmt, 9+j, SQLDT_SHORT, &item.card[j], 0, NULL, NULL);
-
-    // bit array indicating which inventory items have already been matched
-    flag = (bool *) aCalloc(max, sizeof(bool));
-
-    while (SQL_SUCCESS == SqlStmt_NextRow(stmt)) {
-        found = false;
-        // search for the presence of the item in the char's inventory
-        for (i = 0; i < max; ++i) {
-            // skip empty and already matched entries
-            if (items[i].nameid == 0 || flag[i])
-                continue;
-
-            if (items[i].nameid == item.nameid
-                &&  items[i].card[0] == item.card[0]
-                &&  items[i].card[2] == item.card[2]
-                &&  items[i].card[3] == item.card[3]
-               ) {  //They are the same item.
-                ARR_FIND(0, MAX_SLOTS, j, items[i].card[j] != item.card[j]);
-                if (j == MAX_SLOTS &&
-                    items[i].amount == item.amount &&
-                    items[i].equip == item.equip &&
-                    items[i].identify == item.identify &&
-                    items[i].refine == item.refine &&
-                    items[i].attribute == item.attribute &&
-                    items[i].expire_time == item.expire_time &&
-                    items[i].favorite == item.favorite)
-                    ;   //Do nothing.
-                else {
-                    // update all fields.
-                    StringBuf_Clear(&buf);
-                    StringBuf_Printf(&buf, "UPDATE `%s` SET `amount`='%d', `equip`='%d', `identify`='%d', `refine`='%d',`attribute`='%d', `expire_time`='%u', `favorite`='%d'",
-                                     inventory_db, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time, items[i].favorite);
-                    for (j = 0; j < MAX_SLOTS; ++j)
-                        StringBuf_Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
-                    StringBuf_Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
-
-                    if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
-                        Sql_ShowDebug(sql_handle);
-                        errors++;
-                    }
-                }
-
-                found = flag[i] = true; //Item dealt with,
-                break; //skip to next item in the db.
-            }
-        }
-        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);
-                errors++;
-            }
-        }
-    }
-    SqlStmt_Free(stmt);
-
-    StringBuf_Clear(&buf);
-    StringBuf_Printf(&buf, "INSERT INTO `%s` (`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`", inventory_db);
-    for (j = 0; j < MAX_SLOTS; ++j)
-        StringBuf_Printf(&buf, ", `card%d`", j);
-    StringBuf_AppendStr(&buf, ") VALUES ");
-
-    found = false;
-    // insert non-matched items into the db as new items
-    for (i = 0; i < max; ++i) {
-        // skip empty and already matched entries
-        if (items[i].nameid == 0 || flag[i])
-            continue;
-
-        if (found)
-            StringBuf_AppendStr(&buf, ",");
-        else
-            found = true;
-
-        StringBuf_Printf(&buf, "('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%d'",
-                         id, items[i].nameid, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time, items[i].favorite);
-        for (j = 0; j < MAX_SLOTS; ++j)
-            StringBuf_Printf(&buf, ", '%d'", items[i].card[j]);
-        StringBuf_AppendStr(&buf, ")");
-    }
-
-    if (found && SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
-        Sql_ShowDebug(sql_handle);
-        errors++;
-    }
-
-    StringBuf_Destroy(&buf);
-    aFree(flag);
-
-    return errors;
+int inventory_to_sql(const struct item items[], int max, int id) {
+	StringBuf buf;
+	SqlStmt* stmt;
+	int i;
+	int j;
+	struct item item; // temp storage variable
+	bool* flag; // bit array for inventory matching
+	bool found;
+	int errors = 0;
+		
+	
+	// The following code compares inventory with current database values
+	// and performs modification/deletion/insertion only on relevant rows.
+	// This approach is more complicated than a trivial delete&insert, but
+	// it significantly reduces cpu load on the database server.
+	
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`");
+	for( j = 0; j < MAX_SLOTS; ++j )
+		StringBuf_Printf(&buf, ", `card%d`", j);
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `char_id`='%d'", inventory_db, id);
+	
+	stmt = SqlStmt_Malloc(sql_handle);
+	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	   ||  SQL_ERROR == SqlStmt_Execute(stmt) )
+	{
+		SqlStmt_ShowDebug(stmt);
+		SqlStmt_Free(stmt);
+		StringBuf_Destroy(&buf);
+		return 1;
+	}
+	
+	SqlStmt_BindColumn(stmt, 0, SQLDT_INT,       &item.id,          0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,     &item.nameid,      0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,     &item.amount,      0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT,    &item.equip,       0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 4, SQLDT_CHAR,      &item.identify,    0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 5, SQLDT_CHAR,      &item.refine,      0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 6, SQLDT_CHAR,      &item.attribute,   0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 7, SQLDT_UINT,      &item.expire_time, 0, NULL, NULL);
+	SqlStmt_BindColumn(stmt, 8, SQLDT_CHAR,      &item.favorite,    0, NULL, NULL);
+	for( j = 0; j < MAX_SLOTS; ++j )
+		SqlStmt_BindColumn(stmt, 9+j, SQLDT_SHORT, &item.card[j], 0, NULL, NULL);
+	
+	// bit array indicating which inventory items have already been matched
+	flag = (bool*) aCalloc(max, sizeof(bool));
+	
+	while( SQL_SUCCESS == SqlStmt_NextRow(stmt) ) {
+		found = false;
+		// search for the presence of the item in the char's inventory
+		for( i = 0; i < max; ++i ) {
+			// skip empty and already matched entries
+			if( items[i].nameid == 0 || flag[i] )
+				continue;
+			
+			if( items[i].nameid == item.nameid
+			   &&  items[i].card[0] == item.card[0]
+			   &&  items[i].card[2] == item.card[2]
+			   &&  items[i].card[3] == item.card[3]
+			   ) {	//They are the same item.
+				ARR_FIND( 0, MAX_SLOTS, j, items[i].card[j] != item.card[j] );
+				if( j == MAX_SLOTS &&
+				   items[i].amount == item.amount &&
+				   items[i].equip == item.equip &&
+				   items[i].identify == item.identify &&
+				   items[i].refine == item.refine &&
+				   items[i].attribute == item.attribute &&
+				   items[i].expire_time == item.expire_time &&
+				   items[i].favorite == item.favorite )
+					;	//Do nothing.
+				else {
+					// update all fields.
+					StringBuf_Clear(&buf);
+					StringBuf_Printf(&buf, "UPDATE `%s` SET `amount`='%d', `equip`='%d', `identify`='%d', `refine`='%d',`attribute`='%d', `expire_time`='%u', `favorite`='%d'",
+									 inventory_db, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time, items[i].favorite);
+					for( j = 0; j < MAX_SLOTS; ++j )
+						StringBuf_Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
+					StringBuf_Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
+					
+					if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) ) {
+						Sql_ShowDebug(sql_handle);
+						errors++;
+					}
+				}
+				
+				found = flag[i] = true; //Item dealt with,
+				break; //skip to next item in the db.
+			}
+		}
+		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);
+				errors++;
+			}
+		}
+	}
+	SqlStmt_Free(stmt);
+	
+	StringBuf_Clear(&buf);
+	StringBuf_Printf(&buf, "INSERT INTO `%s` (`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`", inventory_db);
+	for( j = 0; j < MAX_SLOTS; ++j )
+		StringBuf_Printf(&buf, ", `card%d`", j);
+	StringBuf_AppendStr(&buf, ") VALUES ");
+	
+	found = false;
+	// insert non-matched items into the db as new items
+	for( i = 0; i < max; ++i ) {
+		// skip empty and already matched entries
+		if( items[i].nameid == 0 || flag[i] )
+			continue;
+		
+		if( found )
+			StringBuf_AppendStr(&buf, ",");
+		else
+			found = true;
+		
+		StringBuf_Printf(&buf, "('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%d'",
+						 id, items[i].nameid, items[i].amount, items[i].equip, items[i].identify, items[i].refine, items[i].attribute, items[i].expire_time, items[i].favorite);
+		for( j = 0; j < MAX_SLOTS; ++j )
+			StringBuf_Printf(&buf, ", '%d'", items[i].card[j]);
+		StringBuf_AppendStr(&buf, ")");
+	}
+	
+	if( found && SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) ) {
+		Sql_ShowDebug(sql_handle);
+		errors++;
+	}
+	
+	StringBuf_Destroy(&buf);
+	aFree(flag);
+	
+	return errors;
 }
 
 
-int mmo_char_tobuf(uint8 *buf, struct mmo_charstatus *p);
+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 mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 {
-    SqlStmt *stmt;
-    struct mmo_charstatus p;
-    int j = 0, i;
-    char last_map[MAP_NAME_LENGTH_EXT];
-
-    stmt = SqlStmt_Malloc(sql_handle);
-    if (stmt == NULL) {
-        SqlStmt_ShowDebug(stmt);
-        return 0;
-    }
-    memset(&p, 0, sizeof(p));
-
-    // read char data
-    if (SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT "
-                                     "`char_id`,`char_num`,`name`,`class`,`base_level`,`job_level`,`base_exp`,`job_exp`,`zeny`,"
-                                     "`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
-                                     "`status_point`,`skill_point`,`option`,`karma`,`manner`,`hair`,`hair_color`,"
-                                     "`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`rename`,`delete_date`,"
-                                     "`robe`"
-                                     " FROM `%s` WHERE `account_id`='%d' AND `char_num` < '%d'", char_db, sd->account_id, MAX_CHARS)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0,  SQLDT_INT,    &p.char_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1,  SQLDT_UCHAR,  &p.slot, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2,  SQLDT_STRING, &p.name, sizeof(p.name), NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 3,  SQLDT_SHORT,  &p.class_, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 4,  SQLDT_UINT,   &p.base_level, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 5,  SQLDT_UINT,   &p.job_level, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 6,  SQLDT_UINT,   &p.base_exp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 7,  SQLDT_UINT,   &p.job_exp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 8,  SQLDT_INT,    &p.zeny, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 9,  SQLDT_SHORT,  &p.str, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 10, SQLDT_SHORT,  &p.agi, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 11, SQLDT_SHORT,  &p.vit, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 12, SQLDT_SHORT,  &p.int_, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 13, SQLDT_SHORT,  &p.dex, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 14, SQLDT_SHORT,  &p.luk, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 15, SQLDT_INT,    &p.max_hp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 16, SQLDT_INT,    &p.hp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 17, SQLDT_INT,    &p.max_sp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 18, SQLDT_INT,    &p.sp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 19, SQLDT_UINT,   &p.status_point, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 20, SQLDT_UINT,   &p.skill_point, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 21, SQLDT_UINT,   &p.option, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 22, SQLDT_UCHAR,  &p.karma, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 23, SQLDT_SHORT,  &p.manner, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 24, SQLDT_SHORT,  &p.hair, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 25, SQLDT_SHORT,  &p.hair_color, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 26, SQLDT_SHORT,  &p.clothes_color, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 27, SQLDT_SHORT,  &p.weapon, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 28, SQLDT_SHORT,  &p.shield, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 29, SQLDT_SHORT,  &p.head_top, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 30, SQLDT_SHORT,  &p.head_mid, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 31, SQLDT_SHORT,  &p.head_bottom, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_STRING, &last_map, sizeof(last_map), NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_SHORT,  &p.rename, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 34, SQLDT_UINT32, &p.delete_date, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 35, SQLDT_SHORT,  &p.robe, 0, NULL, NULL)
-       ) {
-        SqlStmt_ShowDebug(stmt);
-        SqlStmt_Free(stmt);
-        return 0;
-    }
-    for (i = 0; i < MAX_CHARS && SQL_SUCCESS == SqlStmt_NextRow(stmt); i++) {
-        p.last_point.map = mapindex_name2id(last_map);
-        sd->found_char[i] = p.char_id;
-        j += mmo_char_tobuf(WBUFP(buf, j), &p);
-    }
-    for (; i < MAX_CHARS; i++)
-        sd->found_char[i] = -1;
-
-    memset(sd->new_name,0,sizeof(sd->new_name));
-
-    SqlStmt_Free(stmt);
-    return j;
+	SqlStmt* stmt;
+	struct mmo_charstatus p;
+	int j = 0, i;
+	char last_map[MAP_NAME_LENGTH_EXT];
+
+	stmt = SqlStmt_Malloc(sql_handle);
+	if( stmt == NULL )
+	{
+		SqlStmt_ShowDebug(stmt);
+		return 0;
+	}
+	memset(&p, 0, sizeof(p));
+
+	// read char data
+	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT "
+		"`char_id`,`char_num`,`name`,`class`,`base_level`,`job_level`,`base_exp`,`job_exp`,`zeny`,"
+		"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
+		"`status_point`,`skill_point`,`option`,`karma`,`manner`,`hair`,`hair_color`,"
+		"`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`rename`,`delete_date`,"
+		"`robe`"
+		" FROM `%s` WHERE `account_id`='%d' AND `char_num` < '%d'", char_db, sd->account_id, MAX_CHARS)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0,  SQLDT_INT,    &p.char_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1,  SQLDT_UCHAR,  &p.slot, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2,  SQLDT_STRING, &p.name, sizeof(p.name), NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 3,  SQLDT_SHORT,  &p.class_, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 4,  SQLDT_UINT,   &p.base_level, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 5,  SQLDT_UINT,   &p.job_level, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 6,  SQLDT_UINT,   &p.base_exp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 7,  SQLDT_UINT,   &p.job_exp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 8,  SQLDT_INT,    &p.zeny, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 9,  SQLDT_SHORT,  &p.str, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 10, SQLDT_SHORT,  &p.agi, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 11, SQLDT_SHORT,  &p.vit, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 12, SQLDT_SHORT,  &p.int_, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 13, SQLDT_SHORT,  &p.dex, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 14, SQLDT_SHORT,  &p.luk, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 15, SQLDT_INT,    &p.max_hp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 16, SQLDT_INT,    &p.hp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 17, SQLDT_INT,    &p.max_sp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 18, SQLDT_INT,    &p.sp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 19, SQLDT_UINT,   &p.status_point, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 20, SQLDT_UINT,   &p.skill_point, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 21, SQLDT_UINT,   &p.option, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 22, SQLDT_UCHAR,  &p.karma, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 23, SQLDT_SHORT,  &p.manner, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 24, SQLDT_SHORT,  &p.hair, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 25, SQLDT_SHORT,  &p.hair_color, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 26, SQLDT_SHORT,  &p.clothes_color, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 27, SQLDT_SHORT,  &p.weapon, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 28, SQLDT_SHORT,  &p.shield, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 29, SQLDT_SHORT,  &p.head_top, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 30, SQLDT_SHORT,  &p.head_mid, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 31, SQLDT_SHORT,  &p.head_bottom, 0, NULL, NULL)
+	||  SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_STRING, &last_map, sizeof(last_map), NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_SHORT,	&p.rename, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 34, SQLDT_UINT32, &p.delete_date, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 35, SQLDT_SHORT,  &p.robe, 0, NULL, NULL)
+	)
+	{
+		SqlStmt_ShowDebug(stmt);
+		SqlStmt_Free(stmt);
+		return 0;
+	}
+	for( i = 0; i < MAX_CHARS && SQL_SUCCESS == SqlStmt_NextRow(stmt); i++ )
+	{
+		p.last_point.map = mapindex_name2id(last_map);
+		sd->found_char[i] = p.char_id;
+		j += mmo_char_tobuf(WBUFP(buf, j), &p);
+	}
+	for( ; i < MAX_CHARS; i++ )
+		sd->found_char[i] = -1;
+
+	memset(sd->new_name,0,sizeof(sd->new_name));
+
+	SqlStmt_Free(stmt);
+	return j;
 }
 
 //=====================================================================================================
-int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, bool load_everything)
+int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything)
 {
-    int i,j;
-    char t_msg[128] = "";
-    struct mmo_charstatus *cp;
-    StringBuf buf;
-    SqlStmt *stmt;
-    char last_map[MAP_NAME_LENGTH_EXT];
-    char save_map[MAP_NAME_LENGTH_EXT];
-    char point_map[MAP_NAME_LENGTH_EXT];
-    struct point tmp_point;
-    struct item tmp_item;
-    struct s_skill tmp_skill;
-    struct s_friend tmp_friend;
+	int i,j;
+	char t_msg[128] = "";
+	struct mmo_charstatus* cp;
+	StringBuf buf;
+	SqlStmt* stmt;
+	char last_map[MAP_NAME_LENGTH_EXT];
+	char save_map[MAP_NAME_LENGTH_EXT];
+	char point_map[MAP_NAME_LENGTH_EXT];
+	struct point tmp_point;
+	struct item tmp_item;
+	struct s_skill tmp_skill;
+	struct s_friend tmp_friend;
 #ifdef HOTKEY_SAVING
-    struct hotkey tmp_hotkey;
-    int hotkey_num;
+	struct hotkey tmp_hotkey;
+	int hotkey_num;
 #endif
 
-    memset(p, 0, sizeof(struct mmo_charstatus));
-
-    if (save_log) ShowInfo("Char load request (%d)\n", char_id);
-
-    stmt = SqlStmt_Malloc(sql_handle);
-    if (stmt == NULL) {
-        SqlStmt_ShowDebug(stmt);
-        return 0;
-    }
-
-    // read char data
-    if (SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT "
-                                     "`char_id`,`account_id`,`char_num`,`name`,`class`,`base_level`,`job_level`,`base_exp`,`job_exp`,`zeny`,"
-                                     "`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
-                                     "`status_point`,`skill_point`,`option`,`karma`,`manner`,`party_id`,`guild_id`,`pet_id`,`homun_id`,`elemental_id`,`hair`,"
-                                     "`hair_color`,`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`last_x`,`last_y`,"
-                                     "`save_map`,`save_x`,`save_y`,`partner_id`,`father`,`mother`,`child`,`fame`,`rename`,`delete_date`,`robe`"
-                                     " FROM `%s` WHERE `char_id`=? LIMIT 1", char_db)
-        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0,  SQLDT_INT,    &p->char_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1,  SQLDT_INT,    &p->account_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2,  SQLDT_UCHAR,  &p->slot, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 3,  SQLDT_STRING, &p->name, sizeof(p->name), NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 4,  SQLDT_SHORT,  &p->class_, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 5,  SQLDT_UINT,   &p->base_level, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 6,  SQLDT_UINT,   &p->job_level, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 7,  SQLDT_UINT,   &p->base_exp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 8,  SQLDT_UINT,   &p->job_exp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 9,  SQLDT_INT,    &p->zeny, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 10, SQLDT_SHORT,  &p->str, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 11, SQLDT_SHORT,  &p->agi, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 12, SQLDT_SHORT,  &p->vit, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 13, SQLDT_SHORT,  &p->int_, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 14, SQLDT_SHORT,  &p->dex, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 15, SQLDT_SHORT,  &p->luk, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 16, SQLDT_INT,    &p->max_hp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 17, SQLDT_INT,    &p->hp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 18, SQLDT_INT,    &p->max_sp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 19, SQLDT_INT,    &p->sp, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 20, SQLDT_UINT,   &p->status_point, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 21, SQLDT_UINT,   &p->skill_point, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 22, SQLDT_UINT,   &p->option, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 23, SQLDT_UCHAR,  &p->karma, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 24, SQLDT_SHORT,  &p->manner, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 25, SQLDT_INT,    &p->party_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 26, SQLDT_INT,    &p->guild_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 27, SQLDT_INT,    &p->pet_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 28, SQLDT_INT,    &p->hom_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 29, SQLDT_INT,    &p->ele_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 30, SQLDT_SHORT,  &p->hair, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 31, SQLDT_SHORT,  &p->hair_color, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_SHORT,  &p->clothes_color, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_SHORT,  &p->weapon, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 34, SQLDT_SHORT,  &p->shield, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 35, SQLDT_SHORT,  &p->head_top, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 36, SQLDT_SHORT,  &p->head_mid, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 37, SQLDT_SHORT,  &p->head_bottom, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 38, SQLDT_STRING, &last_map, sizeof(last_map), NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 39, SQLDT_SHORT,  &p->last_point.x, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 40, SQLDT_SHORT,  &p->last_point.y, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 41, SQLDT_STRING, &save_map, sizeof(save_map), NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 42, SQLDT_SHORT,  &p->save_point.x, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 43, SQLDT_SHORT,  &p->save_point.y, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 44, SQLDT_INT,    &p->partner_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 45, SQLDT_INT,    &p->father, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 46, SQLDT_INT,    &p->mother, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 47, SQLDT_INT,    &p->child, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 48, SQLDT_INT,    &p->fame, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 49, SQLDT_SHORT,  &p->rename, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 50, SQLDT_UINT32, &p->delete_date, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 51, SQLDT_SHORT,  &p->robe, 0, NULL, NULL)
-       ) {
-        SqlStmt_ShowDebug(stmt);
-        SqlStmt_Free(stmt);
-        return 0;
-    }
-    if (SQL_ERROR == SqlStmt_NextRow(stmt)) {
-        ShowError("Requested non-existant character id: %d!\n", char_id);
-        SqlStmt_Free(stmt);
-        return 0;
-    }
-    p->last_point.map = mapindex_name2id(last_map);
-    p->save_point.map = mapindex_name2id(save_map);
-
-    strcat(t_msg, " status");
-
-    if (!load_everything) { // For quick selection of data when displaying the char menu
-        SqlStmt_Free(stmt);
-        return 1;
-    }
-
-    //read memo data
-    //`memo` (`memo_id`,`char_id`,`map`,`x`,`y`)
-    if (SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `map`,`x`,`y` FROM `%s` WHERE `char_id`=? ORDER by `memo_id` LIMIT %d", memo_db, MAX_MEMOPOINTS)
-        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_STRING, &point_map, sizeof(point_map), NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,  &tmp_point.x, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,  &tmp_point.y, 0, NULL, NULL))
-        SqlStmt_ShowDebug(stmt);
-
-    for (i = 0; i < MAX_MEMOPOINTS && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i) {
-        tmp_point.map = mapindex_name2id(point_map);
-        memcpy(&p->memo_point[i], &tmp_point, sizeof(tmp_point));
-    }
-    strcat(t_msg, " memo");
-
-    //read inventory
-    //`inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`");
-    for (i = 0; i < MAX_SLOTS; ++i)
-        StringBuf_Printf(&buf, ", `card%d`", i);
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `char_id`=? LIMIT %d", inventory_db, MAX_INVENTORY);
-
-    if (SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
-        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,       &tmp_item.id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,     &tmp_item.nameid, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,     &tmp_item.amount, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT,    &tmp_item.equip, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 4, SQLDT_CHAR,      &tmp_item.identify, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 5, SQLDT_CHAR,      &tmp_item.refine, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 6, SQLDT_CHAR,      &tmp_item.attribute, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 7, SQLDT_UINT,      &tmp_item.expire_time, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 8, SQLDT_CHAR,      &tmp_item.favorite, 0, NULL, NULL))
-        SqlStmt_ShowDebug(stmt);
-    for (i = 0; i < MAX_SLOTS; ++i)
-        if (SQL_ERROR == SqlStmt_BindColumn(stmt, 9+i, SQLDT_SHORT, &tmp_item.card[i], 0, NULL, NULL))
-            SqlStmt_ShowDebug(stmt);
-
-    for (i = 0; i < MAX_INVENTORY && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i)
-        memcpy(&p->inventory[i], &tmp_item, sizeof(tmp_item));
-
-    strcat(t_msg, " inventory");
-
-    //read cart
-    //`cart_inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)
-    StringBuf_Clear(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`");
-    for (j = 0; j < MAX_SLOTS; ++j)
-        StringBuf_Printf(&buf, ", `card%d`", j);
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `char_id`=? LIMIT %d", cart_db, MAX_CART);
-
-    if (SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
-        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,         &tmp_item.id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,       &tmp_item.nameid, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,       &tmp_item.amount, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT,      &tmp_item.equip, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 4, SQLDT_CHAR,        &tmp_item.identify, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 5, SQLDT_CHAR,        &tmp_item.refine, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 6, SQLDT_CHAR,        &tmp_item.attribute, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 7, SQLDT_UINT,        &tmp_item.expire_time, 0, NULL, NULL))
-        SqlStmt_ShowDebug(stmt);
-    for (i = 0; i < MAX_SLOTS; ++i)
-        if (SQL_ERROR == SqlStmt_BindColumn(stmt, 8+i, SQLDT_SHORT, &tmp_item.card[i], 0, NULL, NULL))
-            SqlStmt_ShowDebug(stmt);
-
-    for (i = 0; i < MAX_CART && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i)
-        memcpy(&p->cart[i], &tmp_item, sizeof(tmp_item));
-    strcat(t_msg, " cart");
-
-    //read storage
-    storage_fromsql(p->account_id, &p->storage);
-    strcat(t_msg, " storage");
-
-    //read skill
-    //`skill` (`char_id`, `id`, `lv`)
-    if (SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `id`, `lv` FROM `%s` WHERE `char_id`=? LIMIT %d", skill_db, MAX_SKILL)
-        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_USHORT, &tmp_skill.id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_USHORT, &tmp_skill.lv, 0, NULL, NULL))
-        SqlStmt_ShowDebug(stmt);
-    tmp_skill.flag = SKILL_FLAG_PERMANENT;
-
-    for (i = 0; i < MAX_SKILL && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i) {
-        if (tmp_skill.id < ARRAYLENGTH(p->skill))
-            memcpy(&p->skill[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);
-    }
-    strcat(t_msg, " skills");
-
-    //read friends
-    //`friends` (`char_id`, `friend_account`, `friend_id`)
-    if (SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT c.`account_id`, c.`char_id`, c.`name` FROM `%s` c LEFT JOIN `%s` f ON f.`friend_account` = c.`account_id` AND f.`friend_id` = c.`char_id` WHERE f.`char_id`=? LIMIT %d", char_db, friend_db, MAX_FRIENDS)
-        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,    &tmp_friend.account_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_INT,    &tmp_friend.char_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_STRING, &tmp_friend.name, sizeof(tmp_friend.name), NULL, NULL))
-        SqlStmt_ShowDebug(stmt);
-
-    for (i = 0; i < MAX_FRIENDS && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i)
-        memcpy(&p->friends[i], &tmp_friend, sizeof(tmp_friend));
-    strcat(t_msg, " friends");
+	memset(p, 0, sizeof(struct mmo_charstatus));
+	
+	if (save_log) ShowInfo("Char load request (%d)\n", char_id);
+
+	stmt = SqlStmt_Malloc(sql_handle);
+	if( stmt == NULL )
+	{
+		SqlStmt_ShowDebug(stmt);
+		return 0;
+	}
+
+	// read char data
+	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT "
+		"`char_id`,`account_id`,`char_num`,`name`,`class`,`base_level`,`job_level`,`base_exp`,`job_exp`,`zeny`,"
+		"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
+		"`status_point`,`skill_point`,`option`,`karma`,`manner`,`party_id`,`guild_id`,`pet_id`,`homun_id`,`elemental_id`,`hair`,"
+		"`hair_color`,`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`last_x`,`last_y`,"
+		"`save_map`,`save_x`,`save_y`,`partner_id`,`father`,`mother`,`child`,`fame`,`rename`,`delete_date`,`robe`"
+		" FROM `%s` WHERE `char_id`=? LIMIT 1", char_db)
+	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0,  SQLDT_INT,    &p->char_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1,  SQLDT_INT,    &p->account_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2,  SQLDT_UCHAR,  &p->slot, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 3,  SQLDT_STRING, &p->name, sizeof(p->name), NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 4,  SQLDT_SHORT,  &p->class_, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 5,  SQLDT_UINT,   &p->base_level, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 6,  SQLDT_UINT,   &p->job_level, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 7,  SQLDT_UINT,   &p->base_exp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 8,  SQLDT_UINT,   &p->job_exp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 9,  SQLDT_INT,    &p->zeny, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 10, SQLDT_SHORT,  &p->str, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 11, SQLDT_SHORT,  &p->agi, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 12, SQLDT_SHORT,  &p->vit, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 13, SQLDT_SHORT,  &p->int_, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 14, SQLDT_SHORT,  &p->dex, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 15, SQLDT_SHORT,  &p->luk, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 16, SQLDT_INT,    &p->max_hp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 17, SQLDT_INT,    &p->hp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 18, SQLDT_INT,    &p->max_sp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 19, SQLDT_INT,    &p->sp, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 20, SQLDT_UINT,   &p->status_point, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 21, SQLDT_UINT,   &p->skill_point, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 22, SQLDT_UINT,   &p->option, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 23, SQLDT_UCHAR,  &p->karma, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 24, SQLDT_SHORT,  &p->manner, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 25, SQLDT_INT,    &p->party_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 26, SQLDT_INT,    &p->guild_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 27, SQLDT_INT,    &p->pet_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 28, SQLDT_INT,    &p->hom_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 29, SQLDT_INT,	&p->ele_id, 0, NULL, NULL)	   
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 30, SQLDT_SHORT,  &p->hair, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 31, SQLDT_SHORT,  &p->hair_color, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_SHORT,  &p->clothes_color, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_SHORT,  &p->weapon, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 34, SQLDT_SHORT,  &p->shield, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 35, SQLDT_SHORT,  &p->head_top, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 36, SQLDT_SHORT,  &p->head_mid, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 37, SQLDT_SHORT,  &p->head_bottom, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 38, SQLDT_STRING, &last_map, sizeof(last_map), NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 39, SQLDT_SHORT,  &p->last_point.x, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 40, SQLDT_SHORT,  &p->last_point.y, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 41, SQLDT_STRING, &save_map, sizeof(save_map), NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 42, SQLDT_SHORT,  &p->save_point.x, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 43, SQLDT_SHORT,  &p->save_point.y, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 44, SQLDT_INT,    &p->partner_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 45, SQLDT_INT,    &p->father, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 46, SQLDT_INT,    &p->mother, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 47, SQLDT_INT,    &p->child, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 48, SQLDT_INT,    &p->fame, 0, NULL, NULL)
+	||  SQL_ERROR == SqlStmt_BindColumn(stmt, 49, SQLDT_SHORT,	&p->rename, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 50, SQLDT_UINT32, &p->delete_date, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 51, SQLDT_SHORT,  &p->robe, 0, NULL, NULL)
+	)
+	{
+		SqlStmt_ShowDebug(stmt);
+		SqlStmt_Free(stmt);
+		return 0;
+	}
+	if( SQL_ERROR == SqlStmt_NextRow(stmt) )
+	{
+		ShowError("Requested non-existant character id: %d!\n", char_id);
+		SqlStmt_Free(stmt);
+		return 0;
+	}
+	p->last_point.map = mapindex_name2id(last_map);
+	p->save_point.map = mapindex_name2id(save_map);
+
+	strcat(t_msg, " status");
+
+	if (!load_everything) // For quick selection of data when displaying the char menu
+	{
+		SqlStmt_Free(stmt);
+		return 1;
+	}
+
+	//read memo data
+	//`memo` (`memo_id`,`char_id`,`map`,`x`,`y`)
+	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `map`,`x`,`y` FROM `%s` WHERE `char_id`=? ORDER by `memo_id` LIMIT %d", memo_db, MAX_MEMOPOINTS)
+	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_STRING, &point_map, sizeof(point_map), NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,  &tmp_point.x, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,  &tmp_point.y, 0, NULL, NULL) )
+		SqlStmt_ShowDebug(stmt);
+
+	for( i = 0; i < MAX_MEMOPOINTS && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i )
+	{
+		tmp_point.map = mapindex_name2id(point_map);
+		memcpy(&p->memo_point[i], &tmp_point, sizeof(tmp_point));
+	}
+	strcat(t_msg, " memo");
+
+	//read inventory
+	//`inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`");
+	for( i = 0; i < MAX_SLOTS; ++i )
+		StringBuf_Printf(&buf, ", `card%d`", i);
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `char_id`=? LIMIT %d", inventory_db, MAX_INVENTORY);
+
+	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,       &tmp_item.id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,     &tmp_item.nameid, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,     &tmp_item.amount, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT,    &tmp_item.equip, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 4, SQLDT_CHAR,      &tmp_item.identify, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 5, SQLDT_CHAR,      &tmp_item.refine, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 6, SQLDT_CHAR,      &tmp_item.attribute, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 7, SQLDT_UINT,      &tmp_item.expire_time, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 8, SQLDT_CHAR,      &tmp_item.favorite, 0, NULL, NULL) )
+		SqlStmt_ShowDebug(stmt);
+	for( i = 0; i < MAX_SLOTS; ++i )
+		if( SQL_ERROR == SqlStmt_BindColumn(stmt, 9+i, SQLDT_SHORT, &tmp_item.card[i], 0, NULL, NULL) )
+			SqlStmt_ShowDebug(stmt);
+
+	for( i = 0; i < MAX_INVENTORY && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i )
+		memcpy(&p->inventory[i], &tmp_item, sizeof(tmp_item));
+
+	strcat(t_msg, " inventory");
+
+	//read cart
+	//`cart_inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)
+	StringBuf_Clear(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`");
+	for( j = 0; j < MAX_SLOTS; ++j )
+		StringBuf_Printf(&buf, ", `card%d`", j);
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `char_id`=? LIMIT %d", cart_db, MAX_CART);
+
+	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,         &tmp_item.id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_SHORT,       &tmp_item.nameid, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_SHORT,       &tmp_item.amount, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT,      &tmp_item.equip, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 4, SQLDT_CHAR,        &tmp_item.identify, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 5, SQLDT_CHAR,        &tmp_item.refine, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 6, SQLDT_CHAR,        &tmp_item.attribute, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 7, SQLDT_UINT,        &tmp_item.expire_time, 0, NULL, NULL) )
+		SqlStmt_ShowDebug(stmt);
+	for( i = 0; i < MAX_SLOTS; ++i )
+		if( SQL_ERROR == SqlStmt_BindColumn(stmt, 8+i, SQLDT_SHORT, &tmp_item.card[i], 0, NULL, NULL) )
+			SqlStmt_ShowDebug(stmt);
+
+	for( i = 0; i < MAX_CART && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i )
+		memcpy(&p->cart[i], &tmp_item, sizeof(tmp_item));
+	strcat(t_msg, " cart");
+
+	//read storage
+	storage_fromsql(p->account_id, &p->storage);
+	strcat(t_msg, " storage");
+
+	//read skill
+	//`skill` (`char_id`, `id`, `lv`)
+	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `id`, `lv` FROM `%s` WHERE `char_id`=? LIMIT %d", skill_db, MAX_SKILL)
+	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_USHORT, &tmp_skill.id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_USHORT, &tmp_skill.lv, 0, NULL, NULL) )
+		SqlStmt_ShowDebug(stmt);
+	tmp_skill.flag = SKILL_FLAG_PERMANENT;
+
+	for( i = 0; i < MAX_SKILL && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i )
+	{
+		if( tmp_skill.id < ARRAYLENGTH(p->skill) )
+			memcpy(&p->skill[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);
+	}
+	strcat(t_msg, " skills");
+
+	//read friends
+	//`friends` (`char_id`, `friend_account`, `friend_id`)
+	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT c.`account_id`, c.`char_id`, c.`name` FROM `%s` c LEFT JOIN `%s` f ON f.`friend_account` = c.`account_id` AND f.`friend_id` = c.`char_id` WHERE f.`char_id`=? LIMIT %d", char_db, friend_db, MAX_FRIENDS)
+	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,    &tmp_friend.account_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_INT,    &tmp_friend.char_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_STRING, &tmp_friend.name, sizeof(tmp_friend.name), NULL, NULL) )
+		SqlStmt_ShowDebug(stmt);
+
+	for( i = 0; i < MAX_FRIENDS && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i )
+		memcpy(&p->friends[i], &tmp_friend, sizeof(tmp_friend));
+	strcat(t_msg, " friends");
 
 #ifdef HOTKEY_SAVING
-    //read hotkeys
-    //`hotkey` (`char_id`, `hotkey`, `type`, `itemskill_id`, `skill_lvl`
-    if (SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `hotkey`, `type`, `itemskill_id`, `skill_lvl` FROM `%s` WHERE `char_id`=?", hotkey_db)
-        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,    &hotkey_num, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_UCHAR,  &tmp_hotkey.type, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_UINT,   &tmp_hotkey.id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT, &tmp_hotkey.lv, 0, NULL, NULL))
-        SqlStmt_ShowDebug(stmt);
-
-    while (SQL_SUCCESS == SqlStmt_NextRow(stmt)) {
-        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);
-    }
-    strcat(t_msg, " hotkeys");
+	//read hotkeys
+	//`hotkey` (`char_id`, `hotkey`, `type`, `itemskill_id`, `skill_lvl`
+	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `hotkey`, `type`, `itemskill_id`, `skill_lvl` FROM `%s` WHERE `char_id`=?", hotkey_db)
+	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,    &hotkey_num, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_UCHAR,  &tmp_hotkey.type, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_UINT,   &tmp_hotkey.id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_USHORT, &tmp_hotkey.lv, 0, NULL, NULL) )
+		SqlStmt_ShowDebug(stmt);
+
+	while( SQL_SUCCESS == SqlStmt_NextRow(stmt) )
+	{
+		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);
+	}
+	strcat(t_msg, " hotkeys");
 #endif
 
-    /* Mercenary Owner DataBase */
-    mercenary_owner_fromsql(char_id, p);
-    strcat(t_msg, " mercenary");
+	/* Mercenary Owner DataBase */
+	mercenary_owner_fromsql(char_id, p);
+	strcat(t_msg, " mercenary");
 
 
-    if (save_log) ShowInfo("Loaded char (%d - %s): %s\n", char_id, p->name, t_msg); //ok. all data load successfuly!
-    SqlStmt_Free(stmt);
-    StringBuf_Destroy(&buf);
+	if (save_log) ShowInfo("Loaded char (%d - %s): %s\n", char_id, p->name, t_msg);	//ok. all data load successfuly!
+	SqlStmt_Free(stmt);
+	StringBuf_Destroy(&buf);
 
-    cp = idb_ensure(char_db_, char_id, create_charstatus);
-    memcpy(cp, p, sizeof(struct mmo_charstatus));
-    return 1;
+	cp = idb_ensure(char_db_, char_id, create_charstatus);
+	memcpy(cp, p, sizeof(struct mmo_charstatus));
+	return 1;
 }
 
 //==========================================================================================================
 int mmo_char_sql_init(void)
 {
-    char_db_= idb_alloc(DB_OPT_RELEASE_DATA);
+	char_db_= idb_alloc(DB_OPT_RELEASE_DATA);
 
-    ShowStatus("Characters per Account: '%d'.\n", char_per_account);
+	ShowStatus("Characters per Account: '%d'.\n", char_per_account);
 
-    //the 'set offline' part is now in check_login_conn ...
-    //if the server connects to loginserver
-    //it will dc all off players
-    //and send the loginserver the new state....
+	//the 'set offline' part is now in check_login_conn ...
+	//if the server connects to loginserver
+	//it will dc all off players
+	//and send the loginserver the new state....
 
-    // Force all users offline in sql when starting char-server
-    // (useful when servers crashs and don't clean the database)
-    set_all_offline_sql();
+	// Force all users offline in sql when starting char-server
+	// (useful when servers crashs and don't clean the database)
+	set_all_offline_sql();
 
-    return 0;
+	return 0;
 }
 
 //-----------------------------------
@@ -1320,193 +1357,199 @@ int mmo_char_sql_init(void)
 //-----------------------------------
 int rename_char_sql(struct char_session_data *sd, int char_id)
 {
-    struct mmo_charstatus char_dat;
-    char esc_name[NAME_LENGTH*2+1];
-
-    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.
-        return 2;
-
-    if (char_dat.rename == 0)
-        return 1;
-
-    Sql_EscapeStringLen(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)) {
-        Sql_ShowDebug(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)) {
-        Sql_ShowDebug(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);
-
-    safestrncpy(char_dat.name, sd->new_name, NAME_LENGTH);
-    memset(sd->new_name,0,sizeof(sd->new_name));
-
-    // log change
-    if (log_char) {
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
-                                   "VALUES (NOW(), '%s', '%d', '%d', '%s', '0', '0', '0', '0', '0', '0', '0', '0')",
-                                   charlog_db, "change char name", sd->account_id, char_dat.slot, esc_name))
-            Sql_ShowDebug(sql_handle);
-    }
-
-    return 0;
+	struct mmo_charstatus char_dat;
+	char esc_name[NAME_LENGTH*2+1];
+
+	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.
+		return 2;
+
+	if( char_dat.rename == 0 )
+		return 1;
+
+	Sql_EscapeStringLen(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) )
+	{
+		Sql_ShowDebug(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) )
+	{
+		Sql_ShowDebug(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);
+
+	safestrncpy(char_dat.name, sd->new_name, NAME_LENGTH);
+	memset(sd->new_name,0,sizeof(sd->new_name));
+
+	// log change
+	if( log_char )
+	{
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
+			"VALUES (NOW(), '%s', '%d', '%d', '%s', '0', '0', '0', '0', '0', '0', '0', '0')",
+			charlog_db, "change char name", sd->account_id, char_dat.slot, esc_name) )
+			Sql_ShowDebug(sql_handle);
+	}
+
+	return 0;
 }
 
-int check_char_name(char *name, char *esc_name)
+int check_char_name(char * name, char * esc_name)
 {
-    int i;
-
-    // check length of character name
-    if (name[0] == '\0')
-        return -2; // empty character name
-    /**
-     * The client does not allow you to create names with less than 4 characters, however,
-     * the use of WPE can bypass this, and this fixes the exploit.
-     **/
-    if (strlen(name) < 4)
-        return -2;
-    // check content of character name
-    if (remove_control_chars(name))
-        return -2; // control chars in name
-
-    // check for reserved names
-    if (strcmpi(name, main_chat_nick) == 0 || strcmpi(name, wisp_server_name) == 0)
-        return -1; // nick reserved for internal server messages
-
-    // Check Authorised letters/symbols in the name of the character
-    if (char_name_option == 1) {
-        // only letters/symbols in char_name_letters are authorised
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) == NULL)
-                return -2;
-    } else if (char_name_option == 2) {
-        // letters/symbols in char_name_letters are forbidden
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) != NULL)
-                return -2;
-    }
-    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);
-            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);
-            return -2;
-        }
-    }
-    if (Sql_NumRows(sql_handle) > 0)
-        return -1; // name already exists
-
-    return 0;
+	int i;
+
+	// check length of character name
+	if( name[0] == '\0' )
+		return -2; // empty character name
+	/**
+	 * The client does not allow you to create names with less than 4 characters, however,
+	 * the use of WPE can bypass this, and this fixes the exploit.
+	 **/
+	if( strlen( name ) < 4 )
+		return -2;
+	// check content of character name
+	if( remove_control_chars(name) )
+		return -2; // control chars in name
+
+	// check for reserved names
+	if( strcmpi(name, main_chat_nick) == 0 || strcmpi(name, wisp_server_name) == 0 )
+		return -1; // nick reserved for internal server messages
+
+	// Check Authorised letters/symbols in the name of the character
+	if( char_name_option == 1 )
+	{ // only letters/symbols in char_name_letters are authorised
+		for( i = 0; i < NAME_LENGTH && name[i]; i++ )
+			if( strchr(char_name_letters, name[i]) == NULL )
+				return -2;
+	}
+	else if( char_name_option == 2 )
+	{ // letters/symbols in char_name_letters are forbidden
+		for( i = 0; i < NAME_LENGTH && name[i]; i++ )
+			if( strchr(char_name_letters, name[i]) != NULL )
+				return -2;
+	}
+	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);
+			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);
+			return -2;
+		}
+	}
+	if( Sql_NumRows(sql_handle) > 0 )
+		return -1; // name already exists
+
+	return 0;
 }
 
 //-----------------------------------
 // Function to create a new character
 //-----------------------------------
 #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;
+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)
-{
+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
 
-    char name[NAME_LENGTH];
-    char esc_name[NAME_LENGTH*2+1];
-    int char_id, flag;
+	char name[NAME_LENGTH];
+	char esc_name[NAME_LENGTH*2+1];
+	int char_id, flag;
 
-    safestrncpy(name, name_, NAME_LENGTH);
-    normalize_name(name,TRIM_CHARS);
-    Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+	safestrncpy(name, name_, NAME_LENGTH);
+	normalize_name(name,TRIM_CHARS);
+	Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
 
-    flag = check_char_name(name,esc_name);
-    if (flag < 0)
-        return flag;
+	flag = check_char_name(name,esc_name);
+	if( flag < 0 )
+		return flag;
 
-    //check other inputs
+	//check other inputs
 #if PACKETVER >= 20120307
-    if (slot >= MAX_CHARS)
+	if(slot >= MAX_CHARS) 
 #else
-    if ((slot >= MAX_CHARS) // slots
-        || (str + agi + vit + int_ + dex + luk != 6*5)  // stats
-        || (str < 1 || str > 9 || agi < 1 || agi > 9 || vit < 1 || vit > 9 || int_ < 1 || int_ > 9 || dex < 1 || dex > 9 || luk < 1 || luk > 9) // individual stat values
-        || (str + int_ != 10 || agi + luk != 10 || vit + dex != 10))  // pairs
+	if((slot >= MAX_CHARS) // slots
+	|| (str + agi + vit + int_ + dex + luk != 6*5 ) // stats
+	|| (str < 1 || str > 9 || agi < 1 || agi > 9 || vit < 1 || vit > 9 || int_ < 1 || int_ > 9 || dex < 1 || dex > 9 || luk < 1 || luk > 9) // individual stat values
+	|| (str + int_ != 10 || agi + luk != 10 || vit + dex != 10) ) // pairs
 #endif
-        return -2; // invalid input
-
-
-    // check the number of already existing chars in this account
-    if (char_per_account != 0) {
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT 1 FROM `%s` WHERE `account_id` = '%d'", char_db, sd->account_id))
-            Sql_ShowDebug(sql_handle);
-        if (Sql_NumRows(sql_handle) >= char_per_account)
-            return -2; // character account limit exceeded
-    }
-
-    // check char slot
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT 1 FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' LIMIT 1", char_db, sd->account_id, slot))
-        Sql_ShowDebug(sql_handle);
-    if (Sql_NumRows(sql_handle) > 0)
-        return -2; // slot already in use
-
-    // validation success, log result
-    if (log_char) {
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
-                                   "VALUES (NOW(), '%s', '%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-                                   charlog_db, "make new char", sd->account_id, slot, esc_name, str, agi, vit, int_, dex, luk, hair_style, hair_color))
-            Sql_ShowDebug(sql_handle);
-    }
+		return -2; // invalid input
+		
+	if (hair_style > 17 || hair_color > 8)
+		return -2;
+
+	// check the number of already existing chars in this account
+	if( char_per_account != 0 ) {
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT 1 FROM `%s` WHERE `account_id` = '%d'", char_db, sd->account_id) )
+			Sql_ShowDebug(sql_handle);
+		if( Sql_NumRows(sql_handle) >= char_per_account )
+			return -2; // character account limit exceeded
+	}
+
+	// check char slot
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT 1 FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' LIMIT 1", char_db, sd->account_id, slot) )
+		Sql_ShowDebug(sql_handle);
+	if( Sql_NumRows(sql_handle) > 0 )
+		return -2; // slot already in use
+
+	// validation success, log result
+	if (log_char) {
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
+			"VALUES (NOW(), '%s', '%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
+			charlog_db, "make new char", sd->account_id, slot, esc_name, str, agi, vit, int_, dex, luk, hair_style, hair_color) )
+			Sql_ShowDebug(sql_handle);
+	}
 #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`,"
-                               "`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);
-        return -2; //No, stop the procedure!
-    }
+	//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`,"
+		"`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);
+		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`,"
-                               "`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);
-        return -2; //No, stop the procedure!
-    }
+	//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`,"
+							   "`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);
+		return -2; //No, stop the procedure!
+	}	
 #endif
-    //Retrieve the newly auto-generated char id
-    char_id = (int)Sql_LastInsertId(sql_handle);
-    //Give the char the default items
-    if (start_weapon > 0) { //add Start Weapon (Knife?)
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')", inventory_db, char_id, start_weapon, 1, 1))
-            Sql_ShowDebug(sql_handle);
-    }
-    if (start_armor > 0) { //Add default armor (cotton shirt?)
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')", inventory_db, char_id, start_armor, 1, 1))
-            Sql_ShowDebug(sql_handle);
-    }
-
-    ShowInfo("Created char: account: %d, char: %d, slot: %d, name: %s\n", sd->account_id, char_id, slot, name);
-    return char_id;
+	//Retrieve the newly auto-generated char id
+	char_id = (int)Sql_LastInsertId(sql_handle);
+	//Give the char the default items
+	if (start_weapon > 0) { //add Start Weapon (Knife?)
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')", inventory_db, char_id, start_weapon, 1, 1) )
+			Sql_ShowDebug(sql_handle);
+	}
+	if (start_armor > 0) { //Add default armor (cotton shirt?)
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `identify`) VALUES ('%d', '%d', '%d', '%d')", inventory_db, char_id, start_armor, 1, 1) )
+			Sql_ShowDebug(sql_handle);
+	}
+
+	ShowInfo("Created char: account: %d, char: %d, slot: %d, name: %s\n", sd->account_id, char_id, slot, name);
+	return char_id;
 }
 
 /*----------------------------------------------------------------------------------------------------------*/
@@ -1514,19 +1557,19 @@ int make_new_char_sql(struct char_session_data *sd, char *name_, int str, int ag
 /*----------------------------------------------------------------------------------------------------------*/
 int divorce_char_sql(int partner_id1, int partner_id2)
 {
-    unsigned char buf[64];
+	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(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);
 
-    WBUFW(buf,0) = 0x2b12;
-    WBUFL(buf,2) = partner_id1;
-    WBUFL(buf,6) = partner_id2;
-    mapif_sendall(buf,10);
+	WBUFW(buf,0) = 0x2b12;
+	WBUFL(buf,2) = partner_id1;
+	WBUFL(buf,6) = partner_id2;
+	mapif_sendall(buf,10);
 
-    return 0;
+	return 0;
 }
 
 /*----------------------------------------------------------------------------------------------------------*/
@@ -1537,169 +1580,151 @@ int divorce_char_sql(int partner_id1, int partner_id2)
  */
 int delete_char_sql(int char_id)
 {
-    char name[NAME_LENGTH];
-    char esc_name[NAME_LENGTH*2+1]; //Name needs be escaped.
-    int account_id, party_id, guild_id, hom_id, base_level, partner_id, father_id, mother_id, elemental_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_SUCCESS != Sql_NextRow(sql_handle)) {
-        ShowError("delete_char_sql: Unable to fetch character data, deletion aborted.\n");
-        Sql_FreeResult(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);
-    elemental_id = atoi(data);
-
-    Sql_EscapeStringLen(sql_handle, esc_name, name, min(len, NAME_LENGTH));
-    Sql_FreeResult(sql_handle);
-
-    //check for config char del condition [Lupus]
-    // TODO: Move this out to packet processing (0x68/0x1fb).
-    if ((char_del_level > 0 && base_level >= char_del_level)
-        || (char_del_level < 0 && base_level <= -char_del_level)
-       ) {
-        ShowInfo("Char deletion aborted: %s, BaseLevel: %i\n", name, base_level);
-        return -1;
-    }
-
-    /* Divorce [Wizputer] */
-    if (partner_id)
-        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);
-
-        WBUFW(buf,0) = 0x2b25;
-        WBUFL(buf,2) = father_id;
-        WBUFL(buf,6) = mother_id;
-        WBUFL(buf,10) = char_id; // Baby
-        mapif_sendall(buf,14);
-    }
-
-    //Make the character leave the party [Skotlex]
-    if (party_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 `incuvate` = '0'", pet_db, char_id))
-        Sql_ShowDebug(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);
-
-    /* remove homunculus */
-    if (hom_id)
-        mapif_homunculus_delete(hom_id);
-        
-    /* remove elemental */
-    if (elemental_id)
-        mapif_elemental_delete(elemental_id);
-
-    /* remove mercenary data */
-    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);
-
-    /* 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);
+	char name[NAME_LENGTH];
+	char esc_name[NAME_LENGTH*2+1]; //Name needs be escaped.
+	int account_id, party_id, guild_id, hom_id, base_level, partner_id, father_id, mother_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` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) )
+		Sql_ShowDebug(sql_handle);
+
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	{
+		ShowError("delete_char_sql: Unable to fetch character data, deletion aborted.\n");
+		Sql_FreeResult(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_EscapeStringLen(sql_handle, esc_name, name, min(len, NAME_LENGTH));
+	Sql_FreeResult(sql_handle);
+
+	//check for config char del condition [Lupus]
+	// TODO: Move this out to packet processing (0x68/0x1fb).
+	if( ( char_del_level > 0 && base_level >= char_del_level )
+	 || ( char_del_level < 0 && base_level <= -char_del_level )
+	) {
+			ShowInfo("Char deletion aborted: %s, BaseLevel: %i\n", name, base_level);
+			return -1;
+	}
+
+	/* Divorce [Wizputer] */
+	if( partner_id )
+		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);
+
+		WBUFW(buf,0) = 0x2b25;
+		WBUFL(buf,2) = father_id;
+		WBUFL(buf,6) = mother_id;
+		WBUFL(buf,10) = char_id; // Baby
+		mapif_sendall(buf,14);
+	}
+
+	//Make the character leave the party [Skotlex]
+	if (party_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 `incuvate` = '0'", pet_db, char_id) )
+		Sql_ShowDebug(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);
+
+	/* remove homunculus */ 
+	if( hom_id )
+		mapif_homunculus_delete(hom_id);
+
+	/* remove mercenary data */ 
+	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);
+
+	/* 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);
 
 #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);
+	/* delete hotkeys */
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", hotkey_db, char_id) )
+		Sql_ShowDebug(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);
-
-    /* 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);
-
-    /* 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);
-
-    /* delete character registry */
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`=3 AND `char_id`='%d'", reg_db, char_id))
-        Sql_ShowDebug(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);
-        
-    /* 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);
-
+	/* delete inventory */
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", inventory_db, char_id) )
+		Sql_ShowDebug(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);
+
+	/* 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);
+
+	/* delete character registry */
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`=3 AND `char_id`='%d'", reg_db, char_id) )
+		Sql_ShowDebug(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);
+	
 #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);
+	/* 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);
 #endif
 
-    if (log_char) {
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`char_msg`,`name`) VALUES (NOW(), '%d', '%d', 'Deleted char (CID %d)', '%s')",
-                                   charlog_db, account_id, 0, char_id, esc_name))
-            Sql_ShowDebug(sql_handle);
-    }
-
-    /* delete character */
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", char_db, char_id))
-        Sql_ShowDebug(sql_handle);
-
-    /* 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(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);
-    else if (guild_id)
-        inter_guild_leave(guild_id, account_id, char_id);// Leave your guild.
-    return 0;
+	if (log_char) {
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`char_msg`,`name`) VALUES (NOW(), '%d', '%d', 'Deleted char (CID %d)', '%s')",
+			charlog_db, account_id, 0, char_id, esc_name) )
+			Sql_ShowDebug(sql_handle);
+	}
+
+	/* delete character */
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", char_db, char_id) )
+		Sql_ShowDebug(sql_handle);
+
+	/* 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(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);
+	else if( guild_id )
+		inter_guild_leave(guild_id, account_id, char_id);// Leave your guild.
+	return 0;
 }
 
 //---------------------------------------------------------------------
@@ -1707,187 +1732,190 @@ int delete_char_sql(int char_id)
 //---------------------------------------------------------------------
 int count_users(void)
 {
-    int i, users;
-
-    users = 0;
-    for (i = 0; i < ARRAYLENGTH(server); i++) {
-        if (server[i].fd > 0) {
-            users += server[i].users;
-        }
-    }
-    return users;
+	int i, users;
+
+	users = 0;
+	for(i = 0; i < ARRAYLENGTH(server); i++) {
+		if (server[i].fd > 0) {
+			users += server[i].users;
+		}
+	}
+	return users;
 }
 
 // Writes char data to the buffer in the format used by the client.
 // Used in packets 0x6b (chars info) and 0x6d (new char info)
 // Returns the size
 #define MAX_CHAR_BUF 144 //Max size (for WFIFOHEAD calls)
-int mmo_char_tobuf(uint8 *buffer, struct mmo_charstatus *p)
+int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 {
-    unsigned short offset = 0;
-    uint8 *buf;
-
-    if (buffer == NULL || p == NULL)
-        return 0;
-
-    buf = WBUFP(buffer,0);
-    WBUFL(buf,0) = p->char_id;
-    WBUFL(buf,4) = min(p->base_exp, INT32_MAX);
-    WBUFL(buf,8) = p->zeny;
-    WBUFL(buf,12) = min(p->job_exp, INT32_MAX);
-    WBUFL(buf,16) = p->job_level;
-    WBUFL(buf,20) = 0; // probably opt1
-    WBUFL(buf,24) = 0; // probably opt2
-    WBUFL(buf,28) = p->option;
-    WBUFL(buf,32) = p->karma;
-    WBUFL(buf,36) = p->manner;
-    WBUFW(buf,40) = min(p->status_point, INT16_MAX);
-    WBUFL(buf,42) = p->hp;
-    WBUFL(buf,46) = p->max_hp;
-    offset+=4;
-    buf = WBUFP(buffer,offset);
-    WBUFW(buf,46) = min(p->sp, INT16_MAX);
-    WBUFW(buf,48) = min(p->max_sp, INT16_MAX);
-    WBUFW(buf,50) = DEFAULT_WALK_SPEED; // p->speed;
-    WBUFW(buf,52) = p->class_;
-    WBUFW(buf,54) = p->hair;
-
-    //When the weapon is sent and your option is riding, the client crashes on login!?
-    WBUFW(buf,56) = p->option&(0x20|0x80000|0x100000|0x200000|0x400000|0x800000|0x1000000|0x2000000|0x4000000|0x8000000) ? 0 : p->weapon;
-
-    WBUFW(buf,58) = p->base_level;
-    WBUFW(buf,60) = min(p->skill_point, INT16_MAX);
-    WBUFW(buf,62) = p->head_bottom;
-    WBUFW(buf,64) = p->shield;
-    WBUFW(buf,66) = p->head_top;
-    WBUFW(buf,68) = p->head_mid;
-    WBUFW(buf,70) = p->hair_color;
-    WBUFW(buf,72) = p->clothes_color;
-    memcpy(WBUFP(buf,74), p->name, NAME_LENGTH);
-    WBUFB(buf,98) = min(p->str, UINT8_MAX);
-    WBUFB(buf,99) = min(p->agi, UINT8_MAX);
-    WBUFB(buf,100) = min(p->vit, UINT8_MAX);
-    WBUFB(buf,101) = min(p->int_, UINT8_MAX);
-    WBUFB(buf,102) = min(p->dex, UINT8_MAX);
-    WBUFB(buf,103) = min(p->luk, UINT8_MAX);
-    WBUFW(buf,104) = p->slot;
-    WBUFW(buf,106) = (p->rename > 0) ? 0 : 1;
-    offset += 2;
+	unsigned short offset = 0;
+	uint8* buf;
+
+	if( buffer == NULL || p == NULL )
+		return 0;
+
+	buf = WBUFP(buffer,0);
+	WBUFL(buf,0) = p->char_id;
+	WBUFL(buf,4) = min(p->base_exp, INT32_MAX);
+	WBUFL(buf,8) = p->zeny;
+	WBUFL(buf,12) = min(p->job_exp, INT32_MAX);
+	WBUFL(buf,16) = p->job_level;
+	WBUFL(buf,20) = 0; // probably opt1
+	WBUFL(buf,24) = 0; // probably opt2
+	WBUFL(buf,28) = p->option;
+	WBUFL(buf,32) = p->karma;
+	WBUFL(buf,36) = p->manner;
+	WBUFW(buf,40) = min(p->status_point, INT16_MAX);
+	WBUFL(buf,42) = p->hp;
+	WBUFL(buf,46) = p->max_hp;
+	offset+=4;
+	buf = WBUFP(buffer,offset);
+	WBUFW(buf,46) = min(p->sp, INT16_MAX);
+	WBUFW(buf,48) = min(p->max_sp, INT16_MAX);
+	WBUFW(buf,50) = DEFAULT_WALK_SPEED; // p->speed;
+	WBUFW(buf,52) = p->class_;
+	WBUFW(buf,54) = p->hair;
+	
+	//When the weapon is sent and your option is riding, the client crashes on login!?
+	WBUFW(buf,56) = p->option&(0x20|0x80000|0x100000|0x200000|0x400000|0x800000|0x1000000|0x2000000|0x4000000|0x8000000) ? 0 : p->weapon;
+	
+	WBUFW(buf,58) = p->base_level;
+	WBUFW(buf,60) = min(p->skill_point, INT16_MAX);
+	WBUFW(buf,62) = p->head_bottom;
+	WBUFW(buf,64) = p->shield;
+	WBUFW(buf,66) = p->head_top;
+	WBUFW(buf,68) = p->head_mid;
+	WBUFW(buf,70) = p->hair_color;
+	WBUFW(buf,72) = p->clothes_color;
+	memcpy(WBUFP(buf,74), p->name, NAME_LENGTH);
+	WBUFB(buf,98) = min(p->str, UINT8_MAX);
+	WBUFB(buf,99) = min(p->agi, UINT8_MAX);
+	WBUFB(buf,100) = min(p->vit, UINT8_MAX);
+	WBUFB(buf,101) = min(p->int_, UINT8_MAX);
+	WBUFB(buf,102) = min(p->dex, UINT8_MAX);
+	WBUFB(buf,103) = min(p->luk, UINT8_MAX);
+	WBUFW(buf,104) = p->slot;
+	WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1;
+	offset += 2;
 #if (PACKETVER >= 20100720 && PACKETVER <= 20100727) || PACKETVER >= 20100803
-    mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char *)WBUFP(buf,108));
-    offset += MAP_NAME_LENGTH_EXT;
+	mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108));
+	offset += MAP_NAME_LENGTH_EXT;
 #endif
 #if PACKETVER >= 20100803
-    WBUFL(buf,124) = TOL(p->delete_date);
-    offset += 4;
+	WBUFL(buf,124) = TOL(p->delete_date);
+	offset += 4;
 #endif
 #if PACKETVER >= 20110111
-    WBUFL(buf,128) = p->robe;
-    offset += 4;
+	WBUFL(buf,128) = p->robe;
+	offset += 4;
 #endif
 #if PACKETVER != 20111116 //2011-11-16 wants 136, ask gravity.
-#if PACKETVER >= 20110928
-    WBUFL(buf,132) = 0;  // change slot feature (0 = disabled, otherwise enabled)
-    offset += 4;
-#endif
-#if PACKETVER >= 20111025
-    WBUFL(buf,136) = (p->rename > 0) ? 1 : 0;    // (0 = disabled, otherwise displays "Add-Ons" sidebar)
-    offset += 4;
-#endif
+	#if PACKETVER >= 20110928
+		WBUFL(buf,132) = 0;  // change slot feature (0 = disabled, otherwise enabled)
+		offset += 4;
+	#endif
+	#if PACKETVER >= 20111025
+		WBUFL(buf,136) = ( p->rename > 0 ) ? 1 : 0;  // (0 = disabled, otherwise displays "Add-Ons" sidebar)
+		offset += 4;
+	#endif
 #endif
 
-    return 106+offset;
+	return 106+offset;
 }
 
 //----------------------------------------
 // Function to send characters to a player
 //----------------------------------------
-int mmo_char_send006b(int fd, struct char_session_data *sd)
+int mmo_char_send006b(int fd, struct char_session_data* sd)
 {
-    int j, offset = 0;
+	int j, offset = 0;
 #if PACKETVER >= 20100413
-    offset += 3;
+	offset += 3;
 #endif
 
-    if (save_log)
-        ShowInfo("Loading Char Data ("CL_BOLD"%d"CL_RESET")\n",sd->account_id);
+	if (save_log)
+		ShowInfo("Loading Char Data ("CL_BOLD"%d"CL_RESET")\n",sd->account_id);
 
-    j = 24 + offset; // offset
-    WFIFOHEAD(fd,j + MAX_CHARS*MAX_CHAR_BUF);
-    WFIFOW(fd,0) = 0x6b;
+	j = 24 + offset; // offset
+	WFIFOHEAD(fd,j + MAX_CHARS*MAX_CHAR_BUF);
+	WFIFOW(fd,0) = 0x6b;
 #if PACKETVER >= 20100413
-    WFIFOB(fd,4) = MAX_CHARS; // Max slots.
-    WFIFOB(fd,5) = MAX_CHARS; // Available slots.
-    WFIFOB(fd,6) = MAX_CHARS; // Premium slots.
+	WFIFOB(fd,4) = MAX_CHARS; // Max slots.
+	WFIFOB(fd,5) = MAX_CHARS; // Available slots.
+	WFIFOB(fd,6) = MAX_CHARS; // Premium slots.
 #endif
-    memset(WFIFOP(fd,4 + offset), 0, 20); // unknown bytes
-    j+=mmo_chars_fromsql(sd, WFIFOP(fd,j));
-    WFIFOW(fd,2) = j; // packet len
-    WFIFOSET(fd,j);
+	memset(WFIFOP(fd,4 + offset), 0, 20); // unknown bytes
+	j+=mmo_chars_fromsql(sd, WFIFOP(fd,j));
+	WFIFOW(fd,2) = j; // packet len
+	WFIFOSET(fd,j);
 
-    return 0;
+	return 0;
 }
 
 int 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)) {
-        char *data;
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        if (pl2 == atoi(data)) {
-            Sql_FreeResult(sql_handle);
-            return 1;
-        }
-    }
-    Sql_FreeResult(sql_handle);
-    return 0;
+	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) )
+	{
+		char* data;
+
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		if( pl2 == atoi(data) )
+		{
+			Sql_FreeResult(sql_handle);
+			return 1;
+		}
+	}
+	Sql_FreeResult(sql_handle);
+	return 0;
 }
 
 int 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)) {
-        char *data;
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        if (child_id == atoi(data)) {
-            Sql_FreeResult(sql_handle);
-            return 1;
-        }
-    }
-    Sql_FreeResult(sql_handle);
-    return 0;
+	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) )
+	{
+		char* data;
+
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		if( child_id == atoi(data) )
+		{
+			Sql_FreeResult(sql_handle);
+			return 1;
+		}
+	}
+	Sql_FreeResult(sql_handle);
+	return 0;
 }
 
 int 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)) {
-            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);
-
-            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);
-                return childid;
-            }
-        }
-    Sql_FreeResult(sql_handle);
-    return 0;
+	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) )
+	{
+		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);
+
+		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);
+			return childid;
+		}
+	}
+	Sql_FreeResult(sql_handle);
+	return 0;
 }
 
 //----------------------------------------------------------------------
@@ -1895,58 +1923,58 @@ int char_family(int cid1, int cid2, int cid3)
 //----------------------------------------------------------------------
 void disconnect_player(int account_id)
 {
-    int i;
-    struct char_session_data *sd;
+	int i;
+	struct char_session_data* sd;
 
-    // disconnect player if online on char-server
-    ARR_FIND(0, fd_max, i, session[i] && (sd = (struct char_session_data *)session[i]->session_data) && sd->account_id == account_id);
-    if (i < fd_max)
-        set_eof(i);
+	// disconnect player if online on char-server
+	ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->account_id == account_id );
+	if( i < fd_max )
+		set_eof(i);
 }
 
 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) {
-        // 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);
-            if (character->waiting_disconnect == INVALID_TIMER)
-                character->waiting_disconnect = add_timer(gettick()+20000, chardb_waiting_disconnect, character->account_id, 0);
-            WFIFOHEAD(fd,3);
-            WFIFOW(fd,0) = 0x81;
-            WFIFOB(fd,2) = 8;
-            WFIFOSET(fd,3);
-            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);
-            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);
-    }
-
-    // mark session as 'authed'
-    sd->auth = true;
-
-    // set char online on charserver
-    set_char_charselect(sd->account_id);
-
-    // continues when account data is received...
+	struct online_char_data* character;
+
+	if( (character = (struct online_char_data*)idb_get(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);
+			if (character->waiting_disconnect == INVALID_TIMER)
+				character->waiting_disconnect = add_timer(gettick()+20000, chardb_waiting_disconnect, character->account_id, 0);
+			WFIFOHEAD(fd,3);
+			WFIFOW(fd,0) = 0x81;
+			WFIFOB(fd,2) = 8;
+			WFIFOSET(fd,3);
+			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);
+			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);
+	}
+
+	// mark session as 'authed'
+	sd->auth = true;
+
+	// set char online on charserver
+	set_char_charselect(sd->account_id);
+
+	// continues when account data is received...
 }
 
 int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data);
@@ -1956,12 +1984,12 @@ 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 reaquire locks [FlavioJS]
-    for (id = 0; id < ARRAYLENGTH(server); ++id)
-        mapif_server_reset(id);
-    flush_fifos();
-    exit(EXIT_FAILURE);
+	int id;
+	// TODO kick everyone out and reset everything or wait for connect and try to reaquire locks [FlavioJS]
+	for( id = 0; id < ARRAYLENGTH(server); ++id )
+		mapif_server_reset(id);
+	flush_fifos();
+	exit(EXIT_FAILURE);
 }
 
 
@@ -1970,361 +1998,366 @@ void loginif_reset(void)
 /// If all the conditions are met, it stops the core loop.
 void loginif_check_shutdown(void)
 {
-    if (runflag != CHARSERVER_ST_SHUTDOWN)
-        return;
-    runflag = CORE_ST_STOP;
+	if( runflag != CHARSERVER_ST_SHUTDOWN )
+		return;
+	runflag = CORE_ST_STOP;
 }
 
 
 /// Called when the connection to Login Server is disconnected.
 void loginif_on_disconnect(void)
 {
-    ShowWarning("Connection to Login Server lost.\n\n");
+	ShowWarning("Connection to Login Server lost.\n\n");
 }
 
 
 /// Called when all the connection steps are completed.
 void loginif_on_ready(void)
 {
-    int i;
+	int i;
 
-    loginif_check_shutdown();
+	loginif_check_shutdown();
+	
+	//Send online accounts to login server.
+	send_accounts_tologin(INVALID_TIMER, gettick(), 0, 0);
 
-    //Send online accounts to login server.
-    send_accounts_tologin(INVALID_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[0]);
-    if (i == ARRAYLENGTH(server))
-        ShowStatus("Awaiting maps from map-server.\n");
+	// if no map-server already connected, display a message...
+	ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd > 0 && server[i].map[0] );
+	if( i == ARRAYLENGTH(server) )
+		ShowStatus("Awaiting maps from map-server.\n");
 }
 
 
-int parse_fromlogin(int fd)
-{
-    struct char_session_data *sd = NULL;
-    int i;
-
-    // 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);
-        do_close(fd);
-        return 0;
-    }
-
-    if (session[fd]->flag.eof) {
-        do_close(fd);
-        login_fd = -1;
-        loginif_on_disconnect();
-        return 0;
-    } else if (session[fd]->flag.ping) {  /* we've reached stall time */
-        if (DIFF_TICK(last_tick, session[fd]->rdata_tick) > (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);
-
-            session[fd]->flag.ping = 2;
-        }
-    }
-
-    sd = (struct char_session_data *)session[fd]->session_data;
-
-    while (RFIFOREST(fd) >= 2) {
-        uint16 command = RFIFOW(fd,0);
-
-        switch (command) {
-
-                // acknowledgement of connect-to-loginserver request
-            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 map_athena.conf and char_athena.conf\n");
-                    set_eof(fd);
-                    return 0;
-                } else {
-                    ShowStatus("Connected to login-server (connection #%d).\n", fd);
-                    loginif_on_ready();
-                }
-                RFIFOSKIP(fd,3);
-                break;
-
-                // acknowledgement of account authentication request
-            case 0x2713:
-                if (RFIFOREST(fd) < 25)
-                    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);
-                    RFIFOSKIP(fd,25);
-
-                    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
-                                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;
-                        }
-                    }
-                }
-                break;
-
-            case 0x2717: // account data
-                if (RFIFOREST(fd) < 62)
-                    return 0;
-
-                // find the authenticated session with this account id
-                ARR_FIND(0, fd_max, i, session[i] && (sd = (struct char_session_data *)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2));
-                if (i < fd_max) {
-                    int server_id;
-                    memcpy(sd->email, RFIFOP(fd,6), 40);
-                    sd->expiration_time = (time_t)RFIFOL(fd,46);
-                    sd->group_id = RFIFOB(fd,50);
-                    safestrncpy(sd->birthdate, (const char *)RFIFOP(fd,51), sizeof(sd->birthdate));
-                    ARR_FIND(0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0]);
-                    // continued from char_auth_ok...
-                    if (server_id == ARRAYLENGTH(server) || //server not online, bugreport:2359
-                        (max_connect_user && 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
-                        mmo_char_send006b(i, sd);
+int parse_fromlogin(int fd) {
+	struct char_session_data* sd = NULL;
+	int i;
+	
+	// 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);
+		do_close(fd);
+		return 0;
+	}
+
+	if( session[fd]->flag.eof ) {
+		do_close(fd);
+		login_fd = -1;
+		loginif_on_disconnect();
+		return 0;
+	} else if ( session[fd]->flag.ping ) {/* we've reached stall time */
+		if( DIFF_TICK(last_tick, session[fd]->rdata_tick) > (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);
+
+			session[fd]->flag.ping = 2;
+		}
+	}
+
+	sd = (struct char_session_data*)session[fd]->session_data;
+
+	while(RFIFOREST(fd) >= 2) {
+		uint16 command = RFIFOW(fd,0);
+
+		switch( command )
+		{
+
+		// acknowledgement of connect-to-loginserver request
+		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 map_athena.conf and char_athena.conf\n");
+				set_eof(fd);
+				return 0;
+			} else {
+				ShowStatus("Connected to login-server (connection #%d).\n", fd);
+				loginif_on_ready();
+			}
+			RFIFOSKIP(fd,3);
+		break;
+
+		// acknowledgement of account authentication request
+		case 0x2713:
+			if (RFIFOREST(fd) < 25)
+				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);
+			RFIFOSKIP(fd,25);
+
+			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
+					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;
+				}
+			}
+		}
+		break;
+
+		case 0x2717: // account data
+			if (RFIFOREST(fd) < 62)
+				return 0;
+
+			// find the authenticated session with this account id
+			ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) );
+			if( i < fd_max )
+			{
+				int server_id;
+				memcpy(sd->email, RFIFOP(fd,6), 40);
+				sd->expiration_time = (time_t)RFIFOL(fd,46);
+				sd->group_id = RFIFOB(fd,50);
+				safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,51), sizeof(sd->birthdate));
+				ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0] );
+				// continued from char_auth_ok...
+				if( server_id == ARRAYLENGTH(server) || //server not online, bugreport:2359
+					( max_connect_user && 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
+					mmo_char_send006b(i, sd);
 #if PACKETVER >=  20110309
-                        // PIN code system, disabled
-                        WFIFOHEAD(i, 12);
-                        WFIFOW(i, 0) = 0x08B9;
-                        WFIFOW(i, 2) = 0;
-                        WFIFOW(i, 4) = 0;
-                        WFIFOL(i, 6) = sd->account_id;
-                        WFIFOW(i, 10) = 0;
-                        WFIFOSET(i, 12);
+					// PIN code system, disabled
+					WFIFOHEAD(i, 12);
+					WFIFOW(i, 0) = 0x08B9;
+					WFIFOW(i, 2) = 0;
+					WFIFOW(i, 4) = 0;
+					WFIFOL(i, 6) = sd->account_id;
+					WFIFOW(i, 10) = 0;
+					WFIFOSET(i, 12);
 #endif
-                    }
-                }
-                RFIFOSKIP(fd,62);
-                break;
-
-                // login-server alive packet
-            case 0x2718:
-                if (RFIFOREST(fd) < 2)
-                    return 0;
-                RFIFOSKIP(fd,2);
-                session[fd]->flag.ping = 0;
-                break;
-
-                // changesex reply
-            case 0x2723:
-                if (RFIFOREST(fd) < 7)
-                    return 0;
-                {
-                    unsigned char buf[7];
-
-                    int acc = RFIFOL(fd,2);
-                    int sex = RFIFOB(fd,6);
-                    RFIFOSKIP(fd,7);
-
-                    if (acc > 0) {
-                        // TODO: Is this even possible?
-                        int char_id[MAX_CHARS];
-                        int class_[MAX_CHARS];
-                        int guild_id[MAX_CHARS];
-                        int num;
-                        char *data;
-
-                        struct auth_node *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 `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;
-
-                // reply to an account_reg2 registry request
-            case 0x2729:
-                if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-                    return 0;
-
-                {
-                    //Receive account_reg2 registry, forward to map servers.
-                    unsigned char buf[13+ACCOUNT_REG2_NUM*sizeof(struct global_reg)];
-                    memcpy(buf,RFIFOP(fd,0), RFIFOW(fd,2));
-                    WBUFW(buf,0) = 0x3804; //Map server can now receive all kinds of reg values with the same packet. [Skotlex]
-                    mapif_sendall(buf, WBUFW(buf,2));
-                    RFIFOSKIP(fd, RFIFOW(fd,2));
-                }
-                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 statut, 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);
-                break;
-
-                // Login server request to kick a character out. [Skotlex]
-            case 0x2734:
-                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 = 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, fd_max, i, session[i] && (tsd = (struct char_session_data *)session[i]->session_data) && tsd->account_id == aid);
-                            if (i < 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
-                }
-                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);
-                }
-                break;
-
-            default:
-                ShowError("Unknown packet 0x%04x received from login-server, disconnecting.\n", command);
-                set_eof(fd);
-                return 0;
-        }
-    }
-
-    RFIFOFLUSH(fd);
-    return 0;
+				}
+			}
+			RFIFOSKIP(fd,62);
+		break;
+
+		// login-server alive packet
+		case 0x2718:
+			if (RFIFOREST(fd) < 2)
+				return 0;
+			RFIFOSKIP(fd,2);
+			session[fd]->flag.ping = 0;
+		break;
+
+		// changesex reply
+		case 0x2723:
+			if (RFIFOREST(fd) < 7)
+				return 0;
+		{
+			unsigned char buf[7];
+
+			int acc = RFIFOL(fd,2);
+			int sex = RFIFOB(fd,6);
+			RFIFOSKIP(fd,7);
+
+			if( acc > 0 )
+			{// TODO: Is this even possible?
+				int char_id[MAX_CHARS];
+				int class_[MAX_CHARS];
+				int guild_id[MAX_CHARS];
+				int num;
+				char* data;
+
+				struct auth_node* 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 `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;
+
+		// reply to an account_reg2 registry request
+		case 0x2729:
+			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+				return 0;
+
+		{	//Receive account_reg2 registry, forward to map servers.
+			unsigned char buf[13+ACCOUNT_REG2_NUM*sizeof(struct global_reg)];
+			memcpy(buf,RFIFOP(fd,0), RFIFOW(fd,2));
+			WBUFW(buf,0) = 0x3804; //Map server can now receive all kinds of reg values with the same packet. [Skotlex]
+			mapif_sendall(buf, WBUFW(buf,2));
+			RFIFOSKIP(fd, RFIFOW(fd,2));
+		}
+		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 statut, 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);
+		break;
+
+		// Login server request to kick a character out. [Skotlex]
+		case 0x2734:
+			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 = 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, fd_max, i, session[i] && (tsd = (struct char_session_data*)session[i]->session_data) && tsd->account_id == aid );
+					if( i < 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
+		}
+		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);
+		}
+		break;
+
+		default:
+			ShowError("Unknown packet 0x%04x received from login-server, disconnecting.\n", command);
+			set_eof(fd);
+			return 0;
+		}
+	}
+
+	RFIFOFLUSH(fd);
+	return 0;
 }
 
 int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data);
@@ -2332,169 +2365,176 @@ int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data);
 
 void do_init_loginif(void)
 {
-    // establish char-login connection if not present
-    add_timer_func_list(check_connect_login_server, "check_connect_login_server");
-    add_timer_interval(gettick() + 1000, check_connect_login_server, 0, 0, 10 * 1000);
-
-    // send a list of all online account IDs to login server
-    add_timer_func_list(send_accounts_tologin, "send_accounts_tologin");
-    add_timer_interval(gettick() + 1000, send_accounts_tologin, 0, 0, 3600 * 1000); //Sync online accounts every hour
+	// establish char-login connection if not present
+	add_timer_func_list(check_connect_login_server, "check_connect_login_server");
+	add_timer_interval(gettick() + 1000, check_connect_login_server, 0, 0, 10 * 1000);
+		
+	// send a list of all online account IDs to login server
+	add_timer_func_list(send_accounts_tologin, "send_accounts_tologin");
+	add_timer_interval(gettick() + 1000, send_accounts_tologin, 0, 0, 3600 * 1000); //Sync online accounts every hour
 }
 
 void do_final_loginif(void)
 {
-    if (login_fd != -1) {
-        do_close(login_fd);
-        login_fd = -1;
-    }
+	if( login_fd != -1 )
+	{
+		do_close(login_fd);
+		login_fd = -1;
+	}
 }
 
 int 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);
-        return 1;
-    }
-    return 0;
+	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);
+		return 1;
+	}
+	return 0;
 }
 
 //Send packet forward to login-server for account saving
-int save_accreg2(unsigned char *buf, int len)
+int save_accreg2(unsigned char* buf, int len)
 {
-    if (login_fd > 0) {
-        WFIFOHEAD(login_fd,len+4);
-        memcpy(WFIFOP(login_fd,4), buf, len);
-        WFIFOW(login_fd,0) = 0x2728;
-        WFIFOW(login_fd,2) = len+4;
-        WFIFOSET(login_fd,len+4);
-        return 1;
-    }
-    return 0;
+	if (login_fd > 0) {
+		WFIFOHEAD(login_fd,len+4);
+		memcpy(WFIFOP(login_fd,4), buf, len);
+		WFIFOW(login_fd,0) = 0x2728;
+		WFIFOW(login_fd,2) = len+4;
+		WFIFOSET(login_fd,len+4);
+		return 1;
+	}
+	return 0;
 }
 
 void char_read_fame_list(void)
 {
-    int i;
-    char *data;
-    size_t len;
-
-    // Empty ranking lists
-    memset(smith_fame_list, 0, sizeof(smith_fame_list));
-    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) {
-        // char_id
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        smith_fame_list[i].id = atoi(data);
-        // fame
-        Sql_GetData(sql_handle, 1, &data, &len);
-        smith_fame_list[i].fame = atoi(data);
-        // name
-        Sql_GetData(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) {
-        // char_id
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        chemist_fame_list[i].id = atoi(data);
-        // fame
-        Sql_GetData(sql_handle, 1, &data, &len);
-        chemist_fame_list[i].fame = atoi(data);
-        // name
-        Sql_GetData(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) {
-        // char_id
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        taekwon_fame_list[i].id = atoi(data);
-        // fame
-        Sql_GetData(sql_handle, 1, &data, &len);
-        taekwon_fame_list[i].fame = atoi(data);
-        // name
-        Sql_GetData(sql_handle, 2, &data, &len);
-        memcpy(taekwon_fame_list[i].name, data, min(len, NAME_LENGTH));
-    }
-    Sql_FreeResult(sql_handle);
+	int i;
+	char* data;
+	size_t len;
+
+	// Empty ranking lists
+	memset(smith_fame_list, 0, sizeof(smith_fame_list));
+	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 )
+	{
+		// char_id
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		smith_fame_list[i].id = atoi(data);
+		// fame
+		Sql_GetData(sql_handle, 1, &data, &len);
+		smith_fame_list[i].fame = atoi(data);
+		// name
+		Sql_GetData(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 )
+	{
+		// char_id
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		chemist_fame_list[i].id = atoi(data);
+		// fame
+		Sql_GetData(sql_handle, 1, &data, &len);
+		chemist_fame_list[i].fame = atoi(data);
+		// name
+		Sql_GetData(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 )
+	{
+		// char_id
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		taekwon_fame_list[i].id = atoi(data);
+		// fame
+		Sql_GetData(sql_handle, 1, &data, &len);
+		taekwon_fame_list[i].fame = atoi(data);
+		// name
+		Sql_GetData(sql_handle, 2, &data, &len);
+		memcpy(taekwon_fame_list[i].name, data, min(len, NAME_LENGTH));
+	}
+	Sql_FreeResult(sql_handle);
 }
 
 // Send map-servers the fame ranking lists
 int char_send_fame_list(int fd)
 {
-    int i, len = 8;
-    unsigned char buf[32000];
-
-    WBUFW(buf,0) = 0x2b1b;
-
-    for (i = 0; i < fame_list_size_smith && smith_fame_list[i].id; i++) {
-        memcpy(WBUFP(buf, len), &smith_fame_list[i], sizeof(struct fame_list));
-        len += sizeof(struct fame_list);
-    }
-    // add blacksmith's block length
-    WBUFW(buf, 6) = len;
-
-    for (i = 0; i < fame_list_size_chemist && chemist_fame_list[i].id; i++) {
-        memcpy(WBUFP(buf, len), &chemist_fame_list[i], sizeof(struct fame_list));
-        len += sizeof(struct fame_list);
-    }
-    // add alchemist's block length
-    WBUFW(buf, 4) = len;
-
-    for (i = 0; i < fame_list_size_taekwon && taekwon_fame_list[i].id; i++) {
-        memcpy(WBUFP(buf, len), &taekwon_fame_list[i], sizeof(struct fame_list));
-        len += sizeof(struct fame_list);
-    }
-    // add total packet length
-    WBUFW(buf, 2) = len;
-
-    if (fd != -1)
-        mapif_send(fd, buf, len);
-    else
-        mapif_sendall(buf, len);
-
-    return 0;
+	int i, len = 8;
+	unsigned char buf[32000];
+	
+	WBUFW(buf,0) = 0x2b1b;
+
+	for(i = 0; i < fame_list_size_smith && smith_fame_list[i].id; i++) {
+		memcpy(WBUFP(buf, len), &smith_fame_list[i], sizeof(struct fame_list));
+		len += sizeof(struct fame_list);
+	}
+	// add blacksmith's block length
+	WBUFW(buf, 6) = len;
+
+	for(i = 0; i < fame_list_size_chemist && chemist_fame_list[i].id; i++) {
+		memcpy(WBUFP(buf, len), &chemist_fame_list[i], sizeof(struct fame_list));
+		len += sizeof(struct fame_list);
+	}
+	// add alchemist's block length
+	WBUFW(buf, 4) = len;
+
+	for(i = 0; i < fame_list_size_taekwon && taekwon_fame_list[i].id; i++) {
+		memcpy(WBUFP(buf, len), &taekwon_fame_list[i], sizeof(struct fame_list));
+		len += sizeof(struct fame_list);
+	}
+	// add total packet length
+	WBUFW(buf, 2) = len;
+
+	if (fd != -1)
+		mapif_send(fd, buf, len);
+	else
+		mapif_sendall(buf, len);
+
+	return 0;
 }
 
 void char_update_fame_list(int type, int index, int fame)
 {
-    unsigned char buf[8];
-    WBUFW(buf,0) = 0x2b22;
-    WBUFB(buf,2) = type;
-    WBUFB(buf,3) = index;
-    WBUFL(buf,4) = fame;
-    mapif_sendall(buf, 8);
+	unsigned char buf[8];
+	WBUFW(buf,0) = 0x2b22;
+	WBUFB(buf,2) = type;
+	WBUFB(buf,3) = index;
+	WBUFL(buf,4) = fame;
+	mapif_sendall(buf, 8);
 }
 
 //Loads a character's name and stores it in the buffer given (must be NAME_LENGTH in size)
 //Returns 1 on found, 0 on not found (buffer is filled with Unknown char name)
-int char_loadName(int char_id, char *name)
+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)) {
-        Sql_GetData(sql_handle, 0, &data, &len);
-        safestrncpy(name, data, NAME_LENGTH);
-        return 1;
-    } else {
-        safestrncpy(name, unknown_char_name, NAME_LENGTH);
-    }
-    return 0;
+	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) )
+	{
+		Sql_GetData(sql_handle, 0, &data, &len);
+		safestrncpy(name, data, NAME_LENGTH);
+		return 1;
+	}
+	else
+	{
+		safestrncpy(name, unknown_char_name, NAME_LENGTH);
+	}
+	return 0;
 }
 
 int search_mapserver(unsigned short map, uint32 ip, uint16 port);
@@ -2503,825 +2543,833 @@ int search_mapserver(unsigned short map, uint32 ip, uint16 port);
 /// Initializes a server structure.
 void mapif_server_init(int id)
 {
-    memset(&server[id], 0, sizeof(server[id]));
-    server[id].fd = -1;
+	memset(&server[id], 0, sizeof(server[id]));
+	server[id].fd = -1;
 }
 
 
 /// Destroys a server structure.
 void mapif_server_destroy(int id)
 {
-    if (server[id].fd == -1) {
-        do_close(server[id].fd);
-        server[id].fd = -1;
-    }
+	if( server[id].fd == -1 )
+	{
+		do_close(server[id].fd);
+		server[id].fd = -1;
+	}
 }
 
 
 /// Resets all the data related to a server.
 void mapif_server_reset(int id)
 {
-    int i,j;
-    unsigned char buf[16384];
-    int fd = server[id].fd;
-    //Notify other map servers that this one is gone. [Skotlex]
-    WBUFW(buf,0) = 0x2b20;
-    WBUFL(buf,4) = htonl(server[id].ip);
-    WBUFW(buf,8) = htons(server[id].port);
-    j = 0;
-    for (i = 0; i < MAX_MAP_PER_SERVER; i++)
-        if (server[id].map[i])
-            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));
-    }
-    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);
+	int i,j;
+	unsigned char buf[16384];
+	int fd = server[id].fd;
+	//Notify other map servers that this one is gone. [Skotlex]
+	WBUFW(buf,0) = 0x2b20;
+	WBUFL(buf,4) = htonl(server[id].ip);
+	WBUFW(buf,8) = htons(server[id].port);
+	j = 0;
+	for(i = 0; i < MAX_MAP_PER_SERVER; i++)
+		if (server[id].map[i])
+			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));
+	}
+	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);
 }
 
 
 /// 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);
+	ShowStatus("Map-server #%d has disconnected.\n", id);
+	mapif_server_reset(id);
 }
 
 
 int parse_frommap(int fd)
 {
-    int i, j;
-    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);
-        do_close(fd);
-        return 0;
-    }
-    if (session[fd]->flag.eof) {
-        do_close(fd);
-        server[id].fd = -1;
-        mapif_on_disconnect(id);
-        return 0;
-    }
-
-    while (RFIFOREST(fd) >= 2) {
-        switch (RFIFOW(fd,0)) {
-
-            case 0x2afa: // Receiving map names list from the map-server
-                if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-                    return 0;
-
-                memset(server[id].map, 0, sizeof(server[id].map));
-                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));
-                break;
-
-            case 0x2afc: //Packet command is now used for sc_data request. [Skotlex]
-                if (RFIFOREST(fd) < 10)
-                    return 0;
-                {
+	int i, j;
+	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);
+		do_close(fd);
+		return 0;
+	}
+	if( session[fd]->flag.eof )
+	{
+		do_close(fd);
+		server[id].fd = -1;
+		mapif_on_disconnect(id);
+		return 0;
+	}
+
+	while(RFIFOREST(fd) >= 2)
+	{
+		switch(RFIFOW(fd,0))
+		{
+
+		case 0x2afa: // Receiving map names list from the map-server
+			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+				return 0;
+
+			memset(server[id].map, 0, sizeof(server[id].map));
+			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));
+		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;
-
-                        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);
-                        }
-                    }
-                    Sql_FreeResult(sql_handle);
+			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;
+
+				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);
+				}
+			}
+			Sql_FreeResult(sql_handle);
 #endif
-                    RFIFOSKIP(fd, 10);
-                }
-                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);
-                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));
-                }
-                break;
-
-            case 0x2b01: // Receive character data from map-server for saving
-                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;
-
-                    if (size - 13 != sizeof(struct mmo_charstatus)) {
-                        ShowError("parse_from_map (save-char): Size mismatch! %d != %d\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-existant/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;
-
-            case 0x2b02: // req char selection
-                if (RFIFOREST(fd) < 18)
-                    return 0;
-                {
-                    struct auth_node *node;
-
-                    int account_id = RFIFOL(fd,2);
-                    uint32 login_id1 = RFIFOL(fd,6);
-                    uint32 login_id2 = RFIFOL(fd,10);
-                    uint32 ip = RFIFOL(fd,14);
-                    RFIFOSKIP(fd,18);
-
-                    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 {
-                        // 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->sex = 0;
-                        node->ip = ntohl(ip);
-                        //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);
-                    }
-                }
-                break;
-
-            case 0x2b05: // request "change map server"
-                if (RFIFOREST(fd) < 39)
-                    return 0;
-                {
-                    int map_id, map_fd = -1;
-                    struct online_char_data *data;
-                    struct mmo_charstatus *char_data;
-                    struct mmo_charstatus char_dat;
-
-                    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.
-                        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 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);
-                }
-                break;
-
-            case 0x2b07: // Remove RFIFOL(fd,6) (friend_id) from RFIFOL(fd,2) (char_id) friend list [Ind]
-                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);
-                }
-                break;
-
-            case 0x2b08: // char name request
-                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);
-                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);
-                break;
-
-            case 0x2b0e: // Request from map-server to change an account's status (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
-                    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`,`name` 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);
-                    //FIXME: set proper result value?
-                    else {
-                        char name[NAME_LENGTH];
-                        int account_id;
-                        char *data;
-
-                        Sql_GetData(sql_handle, 0, &data, NULL);
-                        account_id = atoi(data);
-                        Sql_GetData(sql_handle, 1, &data, NULL);
-                        safestrncpy(name, data, sizeof(name));
-
-                        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;
-                            }
-                    }
-
-                    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);
-                    }
-                }
-                break;
-
-            case 0x2b10: // Update and send fame ranking list
-                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 1:
-                            size = fame_list_size_smith;
-                            list = smith_fame_list;
-                            break;
-                        case 2:
-                            size = fame_list_size_chemist;
-                            list = chemist_fame_list;
-                            break;
-                        case 3:
-                            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);
-                }
-                break;
-
-                // Divorce chars
-            case 0x2b11:
-                if (RFIFOREST(fd) < 10)
-                    return 0;
-
-                divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
-                RFIFOSKIP(fd,10);
-                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);
-                }
-                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);
-                break;
-
-            case 0x2b18: // Reset all chars to offline [Wizputer]
-                set_all_offline(id);
-                RFIFOSKIP(fd,2);
-                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);
-                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);
-                break;
-
-            case 0x2b1c: //Request to save status change data. [Skotlex]
-                if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-                    return 0;
-                {
+			RFIFOSKIP(fd, 10);
+		}
+		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);
+			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));
+		}
+		break;
+
+		case 0x2b01: // Receive character data from map-server for saving
+			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;
+
+			if (size - 13 != sizeof(struct mmo_charstatus))
+			{
+				ShowError("parse_from_map (save-char): Size mismatch! %d != %d\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-existant/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;
+
+		case 0x2b02: // req char selection
+			if( RFIFOREST(fd) < 18 )
+				return 0;
+		{
+			struct auth_node* node;
+
+			int account_id = RFIFOL(fd,2);
+			uint32 login_id1 = RFIFOL(fd,6);
+			uint32 login_id2 = RFIFOL(fd,10);
+			uint32 ip = RFIFOL(fd,14);
+			RFIFOSKIP(fd,18);
+			
+			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
+			{
+				// 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->sex = 0;
+				node->ip = ntohl(ip);
+				//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);
+			}
+		}
+		break;
+
+		case 0x2b05: // request "change map server"
+			if (RFIFOREST(fd) < 39)
+				return 0;
+		{
+			int map_id, map_fd = -1;
+			struct online_char_data* data;
+			struct mmo_charstatus* char_data;
+			struct mmo_charstatus char_dat;
+
+			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.
+				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 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);
+		}
+		break;
+
+		case 0x2b07: // Remove RFIFOL(fd,6) (friend_id) from RFIFOL(fd,2) (char_id) friend list [Ind]
+			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);
+			}
+		break;
+
+		case 0x2b08: // char name request
+			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);
+		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);
+		break;
+
+		case 0x2b0e: // Request from map-server to change an account's status (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
+			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`,`name` 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);
+				//FIXME: set proper result value?
+			else
+			{
+				char name[NAME_LENGTH];
+				int account_id;
+				char* data;
+
+				Sql_GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
+				Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(name, data, sizeof(name));
+
+				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;
+				}
+			}
+
+			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);
+			}
+		}
+		break;
+
+		case 0x2b10: // Update and send fame ranking list
+			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 1:  size = fame_list_size_smith;   list = smith_fame_list;   break;
+				case 2:  size = fame_list_size_chemist; list = chemist_fame_list; break;
+				case 3:  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);
+		}
+		break;
+
+		// Divorce chars
+		case 0x2b11:
+			if( RFIFOREST(fd) < 10 )
+				return 0;
+
+			divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
+			RFIFOSKIP(fd,10);
+		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);
+		}
+		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);
+		break;
+
+		case 0x2b18: // Reset all chars to offline [Wizputer]
+			set_all_offline(id);
+			RFIFOSKIP(fd,2);
+		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);
+		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);
+		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);
-
-                    if (count > 0) {
-                        struct status_change_data data;
-                        StringBuf buf;
-                        int i;
-
-                        StringBuf_Init(&buf);
-                        StringBuf_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)
-                                StringBuf_AppendStr(&buf, ", ");
-                            StringBuf_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, StringBuf_Value(&buf)))
-                            Sql_ShowDebug(sql_handle);
-                        StringBuf_Destroy(&buf);
-                    }
+			int count, aid, cid;
+
+			aid = RFIFOL(fd, 4);
+			cid = RFIFOL(fd, 8);
+			count = RFIFOW(fd, 12);
+
+			if( count > 0 )
+			{
+				struct status_change_data data;
+				StringBuf buf;
+				int i;
+
+				StringBuf_Init(&buf);
+				StringBuf_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 )
+						StringBuf_AppendStr(&buf, ", ");
+					StringBuf_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, StringBuf_Value(&buf)) )
+					Sql_ShowDebug(sql_handle);
+				StringBuf_Destroy(&buf);
+			}
 #endif
-                    RFIFOSKIP(fd, RFIFOW(fd, 2));
-                }
-                break;
-
-            case 0x2b23: // map-server alive packet
-                WFIFOHEAD(fd,2);
-                WFIFOW(fd,0) = 0x2b24;
-                WFIFOSET(fd,2);
-                RFIFOSKIP(fd,2);
-                break;
-
-            case 0x2b26: // auth request from map-server
-                if (RFIFOREST(fd) < 19)
-                    return 0;
-
-                {
-                    int account_id;
-                    int char_id;
-                    int login_id1;
-                    char sex;
-                    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));
-                    RFIFOSKIP(fd,19);
-
-                    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 != 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
-                        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);
-                    }
-                }
-                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);
-                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 */
-                    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 */
-
-                    if ((sfd = make_connection(host2ip("stats.rathena.org"),(uint16)25421,true)) == -1) {
-                        RFIFOSKIP(fd, RFIFOW(fd,2)); /* skip this packet */
-                        break;/* connection not possible, we drop the report */
-                    }
-
-                    session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
-
-                    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 */
-                }
-                break;
-
-
-            default: {
-                    // inter server - packet
-                    int r = inter_parse_frommap(fd);
-                    if (r == 1) break;      // processed
-                    if (r == 2) return 0;   // need more packet
-
-                    // no inter server packet. no char server packet -> disconnect
-                    ShowError("Unknown packet 0x%04x from map server, disconnecting.\n", RFIFOW(fd,0));
-                    set_eof(fd);
-                    return 0;
-                }
-        } // switch
-    } // while
-
-    return 0;
+			RFIFOSKIP(fd, RFIFOW(fd, 2));
+		}
+		break;
+
+		case 0x2b23: // map-server alive packet
+			WFIFOHEAD(fd,2);
+			WFIFOW(fd,0) = 0x2b24;
+			WFIFOSET(fd,2);
+			RFIFOSKIP(fd,2);
+		break;
+
+		case 0x2b26: // auth request from map-server
+			if (RFIFOREST(fd) < 19)
+				return 0;
+
+		{
+			int account_id;
+			int char_id;
+			int login_id1;
+			char sex;
+			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));
+			RFIFOSKIP(fd,19);
+
+			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 != 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
+				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);
+			}
+		}
+		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);
+		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 */
+				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 */
+			
+				if( (sfd = make_connection(host2ip("stats.rathena.org"),(uint16)25421,true) ) == -1 ) {
+					RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+					break;/* connection not possible, we drop the report */
+				}
+			
+				session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
+			
+				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 */
+		}
+		break;
+
+				
+		default:
+		{
+			// inter server - packet
+			int r = inter_parse_frommap(fd);
+			if (r == 1) break;		// processed
+			if (r == 2) return 0;	// need more packet
+
+			// no inter server packet. no char server packet -> disconnect
+			ShowError("Unknown packet 0x%04x from map server, disconnecting.\n", RFIFOW(fd,0));
+			set_eof(fd);
+			return 0;
+		}
+		} // switch
+	} // while
+	
+	return 0;
 }
 
 void do_init_mapif(void)
 {
-    int i;
-    for (i = 0; i < ARRAYLENGTH(server); ++i)
-        mapif_server_init(i);
+	int i;
+	for( i = 0; i < ARRAYLENGTH(server); ++i )
+		mapif_server_init(i);
 }
 
 void do_final_mapif(void)
 {
-    int i;
-    for (i = 0; i < ARRAYLENGTH(server); ++i)
-        mapif_server_destroy(i);
+	int i;
+	for( i = 0; i < ARRAYLENGTH(server); ++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 i, j;
-
-    for (i = 0; i < ARRAYLENGTH(server); i++) {
-        if (server[i].fd > 0
-            && (ip == (uint32)-1 || server[i].ip == ip)
-            && (port == (uint16)-1 || server[i].port == port)) {
-            for (j = 0; server[i].map[j]; j++)
-                if (server[i].map[j] == map)
-                    return i;
-        }
-    }
-
-    return -1;
+	int i, j;
+	
+	for(i = 0; i < ARRAYLENGTH(server); i++)
+	{
+		if (server[i].fd > 0
+		&& (ip == (uint32)-1 || server[i].ip == ip)
+		&& (port == (uint16)-1 || server[i].port == port))
+		{
+			for (j = 0; server[i].map[j]; j++)
+				if (server[i].map[j] == map)
+					return i;
+		}
+	}
+
+	return -1;
 }
 
 // Initialization process (currently only initialization inter_mapif)
 static int char_mapif_init(int fd)
 {
-    return inter_mapif_init(fd);
+	return inter_mapif_init(fd);
 }
 
 //--------------------------------------------
@@ -3329,15 +3377,15 @@ static int char_mapif_init(int fd)
 //--------------------------------------------
 int lan_subnetcheck(uint32 ip)
 {
-    int i;
-    ARR_FIND(0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask));
-    if (i < subnet_count) {
-        ShowInfo("Subnet check [%u.%u.%u.%u]: Matches "CL_CYAN"%u.%u.%u.%u/%u.%u.%u.%u"CL_RESET"\n", CONVIP(ip), CONVIP(subnet[i].char_ip & subnet[i].mask), CONVIP(subnet[i].mask));
-        return subnet[i].map_ip;
-    } else {
-        ShowInfo("Subnet check [%u.%u.%u.%u]: "CL_CYAN"WAN"CL_RESET"\n", CONVIP(ip));
-        return 0;
-    }
+	int i;
+	ARR_FIND( 0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask) );
+	if( i < subnet_count ) {
+		ShowInfo("Subnet check [%u.%u.%u.%u]: Matches "CL_CYAN"%u.%u.%u.%u/%u.%u.%u.%u"CL_RESET"\n", CONVIP(ip), CONVIP(subnet[i].char_ip & subnet[i].mask), CONVIP(subnet[i].mask));
+		return subnet[i].map_ip;
+	} else {
+		ShowInfo("Subnet check [%u.%u.%u.%u]: "CL_CYAN"WAN"CL_RESET"\n", CONVIP(ip));
+		return 0;
+	}
 }
 
 
@@ -3349,14 +3397,13 @@ int lan_subnetcheck(uint32 ip)
 /// 5 (0x71b): To delete a character you must withdraw from the party.
 /// Any (0x718): An unknown error has occurred.
 void char_delete2_ack(int fd, int char_id, uint32 result, time_t delete_date)
-{
-    // HC: <0828>.W <char id>.L <Msg:0-5>.L <deleteDate>.L
-    WFIFOHEAD(fd,14);
-    WFIFOW(fd,0) = 0x828;
-    WFIFOL(fd,2) = char_id;
-    WFIFOL(fd,6) = result;
-    WFIFOL(fd,10) = TOL(delete_date);
-    WFIFOSET(fd,14);
+{// HC: <0828>.W <char id>.L <Msg:0-5>.L <deleteDate>.L
+	WFIFOHEAD(fd,14);
+	WFIFOW(fd,0) = 0x828;
+	WFIFOL(fd,2) = char_id;
+	WFIFOL(fd,6) = result;
+	WFIFOL(fd,10) = TOL(delete_date);
+	WFIFOSET(fd,14);
 }
 
 
@@ -3369,13 +3416,12 @@ void char_delete2_ack(int fd, int char_id, uint32 result, time_t delete_date)
 /// 5 (0x71e): Date of birth do not match.
 /// Any (0x718): An unknown error has occurred.
 void char_delete2_accept_ack(int fd, int char_id, uint32 result)
-{
-    // HC: <082a>.W <char id>.L <Msg:0-5>.L
-    WFIFOHEAD(fd,10);
-    WFIFOW(fd,0) = 0x82a;
-    WFIFOL(fd,2) = char_id;
-    WFIFOL(fd,6) = result;
-    WFIFOSET(fd,10);
+{// HC: <082a>.W <char id>.L <Msg:0-5>.L
+	WFIFOHEAD(fd,10);
+	WFIFOW(fd,0) = 0x82a;
+	WFIFOL(fd,2) = char_id;
+	WFIFOL(fd,6) = result;
+	WFIFOSET(fd,10);
 }
 
 
@@ -3384,797 +3430,804 @@ void char_delete2_accept_ack(int fd, int char_id, uint32 result)
 /// 2 (0x719): A database error occurred.
 /// Any (0x718): An unknown error has occurred.
 void char_delete2_cancel_ack(int fd, int char_id, uint32 result)
-{
-    // HC: <082c>.W <char id>.L <Msg:1-2>.L
-    WFIFOHEAD(fd,10);
-    WFIFOW(fd,0) = 0x82c;
-    WFIFOL(fd,2) = char_id;
-    WFIFOL(fd,6) = result;
-    WFIFOSET(fd,10);
+{// HC: <082c>.W <char id>.L <Msg:1-2>.L
+	WFIFOHEAD(fd,10);
+	WFIFOW(fd,0) = 0x82c;
+	WFIFOL(fd,2) = char_id;
+	WFIFOL(fd,6) = 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, i;
-    char *data;
-    time_t delete_date;
-
-    char_id = RFIFOL(fd,2);
-
-    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);
-        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)) {
-        Sql_ShowDebug(sql_handle);
-        char_delete2_ack(fd, char_id, 3, 0);
-        return;
-    }
-
-    Sql_GetData(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);
-        return;
-    }
-
-    /*
-        // Aegis imposes these checks probably to avoid dead member
-        // entries in guilds/parties, otherwise they are not required.
-        // TODO: Figure out how these are enforced during waiting.
-        if( guild_id )
-        {// character in guild
-            char_delete2_ack(fd, char_id, 4, 0);
-            return;
-        }
-
-        if( party_id )
-        {// character in party
-            char_delete2_ack(fd, char_id, 5, 0);
-            return;
-        }
-    */
-
-    // 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)) {
-        Sql_ShowDebug(sql_handle);
-        char_delete2_ack(fd, char_id, 3, 0);
-        return;
-    }
-
-    char_delete2_ack(fd, char_id, 1, delete_date);
+static void char_delete2_req(int fd, struct char_session_data* sd)
+{// CH: <0827>.W <char id>.L
+	int char_id, i;
+	char* data;
+	time_t delete_date;
+
+	char_id = RFIFOL(fd,2);
+
+	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);
+		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) )
+	{
+		Sql_ShowDebug(sql_handle);
+		char_delete2_ack(fd, char_id, 3, 0);
+		return;
+	}
+	
+	Sql_GetData(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);
+		return;
+	}
+
+/*
+	// Aegis imposes these checks probably to avoid dead member
+	// entries in guilds/parties, otherwise they are not required.
+	// TODO: Figure out how these are enforced during waiting.
+	if( guild_id )
+	{// character in guild
+		char_delete2_ack(fd, char_id, 4, 0);
+		return;
+	}
+
+	if( party_id )
+	{// character in party
+		char_delete2_ack(fd, char_id, 5, 0);
+		return;
+	}
+*/
+
+	// 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) )
+	{
+		Sql_ShowDebug(sql_handle);
+		char_delete2_ack(fd, char_id, 3, 0);
+		return;
+	}
+
+	char_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];
-    int char_id, i, k;
-    unsigned int base_level;
-    char *data;
-    time_t delete_date;
-
-    char_id = RFIFOL(fd,2);
-
-    ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, char_id);
-
-    // construct "YY-MM-DD"
-    birthdate[0] = RFIFOB(fd,6);
-    birthdate[1] = RFIFOB(fd,7);
-    birthdate[2] = '-';
-    birthdate[3] = RFIFOB(fd,8);
-    birthdate[4] = RFIFOB(fd,9);
-    birthdate[5] = '-';
-    birthdate[6] = RFIFOB(fd,10);
-    birthdate[7] = RFIFOB(fd,11);
-    birthdate[8] = 0;
-
-    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);
-        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)) {
-        // data error
-        Sql_ShowDebug(sql_handle);
-        char_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);
-
-    if (!delete_date || delete_date>time(NULL)) {
-        // not queued or delay not yet passed
-        char_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);
-        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);
-        return;
-    }
-
-    // success
-    if (delete_char_sql(char_id) < 0) {
-        char_delete2_accept_ack(fd, char_id, 3);
-        return;
-    }
-
-    // refresh character list cache
-    for (k = i; k < MAX_CHARS-1; k++) {
-        sd->found_char[k] = sd->found_char[k+1];
-    }
-    sd->found_char[MAX_CHARS-1] = -1;
-
-    char_delete2_accept_ack(fd, char_id, 1);
+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];
+	int char_id, i, k;
+	unsigned int base_level;
+	char* data;
+	time_t delete_date;
+
+	char_id = RFIFOL(fd,2);
+
+	ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, char_id);
+
+	// construct "YY-MM-DD"
+	birthdate[0] = RFIFOB(fd,6);
+	birthdate[1] = RFIFOB(fd,7);
+	birthdate[2] = '-';
+	birthdate[3] = RFIFOB(fd,8);
+	birthdate[4] = RFIFOB(fd,9);
+	birthdate[5] = '-';
+	birthdate[6] = RFIFOB(fd,10);
+	birthdate[7] = RFIFOB(fd,11);
+	birthdate[8] = 0;
+
+	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);
+		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) )
+	{// data error
+		Sql_ShowDebug(sql_handle);
+		char_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);
+
+	if( !delete_date || delete_date>time(NULL) )
+	{// not queued or delay not yet passed
+		char_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);
+		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);
+		return;
+	}
+
+	// success
+	if( delete_char_sql(char_id) < 0 )
+	{
+		char_delete2_accept_ack(fd, char_id, 3);
+		return;
+	}
+
+	// refresh character list cache
+	for(k = i; k < MAX_CHARS-1; k++)
+	{
+		sd->found_char[k] = sd->found_char[k+1];
+	}
+	sd->found_char[MAX_CHARS-1] = -1;
+
+	char_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;
-
-    char_id = RFIFOL(fd,2);
-
-    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);
-        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)) {
-        Sql_ShowDebug(sql_handle);
-        char_delete2_cancel_ack(fd, char_id, 2);
-        return;
-    }
-
-    char_delete2_cancel_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;
+
+	char_id = RFIFOL(fd,2);
+
+	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);
+		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) )
+	{
+		Sql_ShowDebug(sql_handle);
+		char_delete2_cancel_ack(fd, char_id, 2);
+		return;
+	}
+
+	char_delete2_cancel_ack(fd, char_id, 1);
 }
 
 
 int parse_char(int fd)
 {
-    int i, ch;
-    char email[40];
-    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)
-        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);
-            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);
-        }
-        do_close(fd);
-        return 0;
-    }
-
-    while (RFIFOREST(fd) >= 2) {
-        //For use in packets that depend on an sd being present [Skotlex]
-#define FIFOSD_CHECK(rest) { if(RFIFOREST(fd) < rest) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,rest); return 0; } }
-
-        cmd = RFIFOW(fd,0);
-        switch (cmd) {
-
-                // request to connect
-                // 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
-            case 0x65:
-                if (RFIFOREST(fd) < 17)
-                    return 0;
-                {
-                    struct auth_node *node;
-
-                    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 authentified 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 authentification
-                    node = (struct auth_node *)idb_get(auth_db, account_id);
-                    if (node != NULL &&
-                        node->account_id == account_id &&
-                        node->login_id1  == login_id1 &&
-                        node->login_id2  == login_id2 /*&&
-                node->ip         == ipl*/) {
-                        // authentication found (coming from map server)
-                        idb_remove(auth_db, account_id);
-                        char_auth_ok(fd, sd);
-                    } else {
-                        // authentication not found (coming from login server)
-                        if (login_fd > 0) { // don't send request if no login-server
-                            WFIFOHEAD(login_fd,23);
-                            WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
-                            WFIFOL(login_fd,2) = sd->account_id;
-                            WFIFOL(login_fd,6) = sd->login_id1;
-                            WFIFOL(login_fd,10) = sd->login_id2;
-                            WFIFOB(login_fd,14) = sd->sex;
-                            WFIFOL(login_fd,15) = htonl(ipl);
-                            WFIFOL(login_fd,19) = fd;
-                            WFIFOSET(login_fd,23);
-                        } else { // if no login-server, we must refuse connection
-                            WFIFOHEAD(fd,3);
-                            WFIFOW(fd,0) = 0x6c;
-                            WFIFOB(fd,2) = 0;
-                            WFIFOSET(fd,3);
-                        }
-                    }
-                }
-                break;
-
-                // char select
-            case 0x66:
-                FIFOSD_CHECK(3);
-                {
-                    struct mmo_charstatus char_dat;
-                    struct mmo_charstatus *cd;
-                    char *data;
-                    int char_id;
-                    uint32 subnet_map_ip;
-                    struct auth_node *node;
-
-                    int slot = RFIFOB(fd,2);
-                    RFIFOSKIP(fd,3);
-
-                    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);
-                    mmo_char_fromsql(char_id, &char_dat, true);
-
-                    //Have to switch over to the DB instance otherwise data won't propagate [Kevin]
-                    cd = (struct mmo_charstatus *)idb_get(char_db_, char_id);
-                    cd->sex = sd->sex;
-
-                    if (log_char) {
-                        char esc_name[NAME_LENGTH*2+1];
-
-                        Sql_EscapeStringLen(sql_handle, esc_name, char_dat.name, strnlen(char_dat.name, NAME_LENGTH));
-                        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
-                                                   charlog_db, sd->account_id, slot, esc_name))
-                            Sql_ShowDebug(sql_handle);
-                    }
-                    ShowInfo("Selected char: (Account %d: %d - %s)\n", sd->account_id, slot, char_dat.name);
-
-                    // searching map server
-                    i = search_mapserver(cd->last_point.map, -1, -1);
-
-                    // if map is not found, we check major cities
-                    if (i < 0 || !cd->last_point.map) {
-                        unsigned short j;
-                        //First check that there's actually a map server online.
-                        ARR_FIND(0, ARRAYLENGTH(server), j, server[j].fd >= 0 && server[j].map[0]);
-                        if (j == ARRAYLENGTH(server)) {
-                            ShowInfo("Connection Closed. No map servers available.\n");
-                            WFIFOHEAD(fd,3);
-                            WFIFOW(fd,0) = 0x81;
-                            WFIFOB(fd,2) = 1; // 01 = Server closed
-                            WFIFOSET(fd,3);
-                            break;
-                        }
-                        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);
-
-                    set_char_online(-2,node->char_id,sd->account_id);
-
-                }
-                break;
-
-                // create new char
+	int i, ch;
+	char email[40];
+	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)
+		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);
+			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);
+		}
+		do_close(fd);
+		return 0;
+	}
+
+	while( RFIFOREST(fd) >= 2 )
+	{
+		//For use in packets that depend on an sd being present [Skotlex]
+		#define FIFOSD_CHECK(rest) { if(RFIFOREST(fd) < rest) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,rest); return 0; } }
+
+		cmd = RFIFOW(fd,0);
+		switch( cmd )
+		{
+
+		// request to connect
+		// 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
+		case 0x65:
+			if( RFIFOREST(fd) < 17 )
+				return 0;
+		{
+			struct auth_node* node;
+
+			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 authentified 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 authentification
+			node = (struct auth_node*)idb_get(auth_db, account_id);
+			if( node != NULL &&
+			    node->account_id == account_id &&
+				node->login_id1  == login_id1 &&
+				node->login_id2  == login_id2 /*&&
+				node->ip         == ipl*/ )
+			{// authentication found (coming from map server)
+				idb_remove(auth_db, account_id);
+				char_auth_ok(fd, sd);
+			}
+			else
+			{// authentication not found (coming from login server)
+				if (login_fd > 0) { // don't send request if no login-server
+					WFIFOHEAD(login_fd,23);
+					WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
+					WFIFOL(login_fd,2) = sd->account_id;
+					WFIFOL(login_fd,6) = sd->login_id1;
+					WFIFOL(login_fd,10) = sd->login_id2;
+					WFIFOB(login_fd,14) = sd->sex;
+					WFIFOL(login_fd,15) = htonl(ipl);
+					WFIFOL(login_fd,19) = fd;
+					WFIFOSET(login_fd,23);
+				} else { // if no login-server, we must refuse connection
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x6c;
+					WFIFOB(fd,2) = 0;
+					WFIFOSET(fd,3);
+				}
+			}
+		}
+		break;
+
+		// char select
+		case 0x66:
+			FIFOSD_CHECK(3);
+		{
+			struct mmo_charstatus char_dat;
+			struct mmo_charstatus *cd;
+			char* data;
+			int char_id;
+			uint32 subnet_map_ip;
+			struct auth_node* node;
+
+			int slot = RFIFOB(fd,2);
+			RFIFOSKIP(fd,3);
+
+			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);
+			mmo_char_fromsql(char_id, &char_dat, true);
+
+			//Have to switch over to the DB instance otherwise data won't propagate [Kevin]
+			cd = (struct mmo_charstatus *)idb_get(char_db_, char_id);
+			cd->sex = sd->sex;
+
+			if (log_char) {
+				char esc_name[NAME_LENGTH*2+1];
+
+				Sql_EscapeStringLen(sql_handle, esc_name, char_dat.name, strnlen(char_dat.name, NAME_LENGTH));
+				if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
+					charlog_db, sd->account_id, slot, esc_name) )
+					Sql_ShowDebug(sql_handle);
+			}
+			ShowInfo("Selected char: (Account %d: %d - %s)\n", sd->account_id, slot, char_dat.name);
+
+			// searching map server
+			i = search_mapserver(cd->last_point.map, -1, -1);
+
+			// if map is not found, we check major cities
+			if (i < 0 || !cd->last_point.map) {
+				unsigned short j;
+				//First check that there's actually a map server online.
+				ARR_FIND( 0, ARRAYLENGTH(server), j, server[j].fd >= 0 && server[j].map[0] );
+				if (j == ARRAYLENGTH(server)) {
+					ShowInfo("Connection Closed. No map servers available.\n");
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x81;
+					WFIFOB(fd,2) = 1; // 01 = Server closed
+					WFIFOSET(fd,3);
+					break;
+				}
+				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);
+
+			set_char_online(-2,node->char_id,sd->account_id);
+
+		}
+		break;
+
+		// create new char
 #if PACKETVER >= 20120307
-                // S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
-            case 0x970:
-                FIFOSD_CHECK(31);
+		// S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
+		case 0x970:
+			FIFOSD_CHECK(31);
 #else
-                // S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
-            case 0x67:
-                FIFOSD_CHECK(37);
+		// S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
+		case 0x67:
+			FIFOSD_CHECK(37);
 #endif
 
-                if (!char_new)  //turn character creation on/off [Kevin]
-                    i = -2;
-                else
+			if( !char_new ) //turn character creation on/off [Kevin]
+				i = -2;
+			else
 #if PACKETVER >= 20120307
-                    i = make_new_char_sql(sd, (char *)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
+				i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
 #else
-                    i = make_new_char_sql(sd, (char *)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
+				i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
 #endif
 
-                //'Charname already exists' (-1), 'Char creation denied' (-2) and 'You are underaged' (-3)
-                if (i < 0) {
-                    WFIFOHEAD(fd,3);
-                    WFIFOW(fd,0) = 0x6e;
-                    switch (i) {
-                        case -1:
-                            WFIFOB(fd,2) = 0x00;
-                            break;
-                        case -2:
-                            WFIFOB(fd,2) = 0xFF;
-                            break;
-                        case -3:
-                            WFIFOB(fd,2) = 0x01;
-                            break;
-                    }
-                    WFIFOSET(fd,3);
-                } else {
-                    int len;
-                    // retrieve data
-                    struct mmo_charstatus char_dat;
-                    mmo_char_fromsql(i, &char_dat, false); //Only the short data is needed.
-
-                    // send to player
-                    WFIFOHEAD(fd,2+MAX_CHAR_BUF);
-                    WFIFOW(fd,0) = 0x6d;
-                    len = 2 + mmo_char_tobuf(WFIFOP(fd,2), &char_dat);
-                    WFIFOSET(fd,len);
-
-                    // add new entry to the chars list
-                    ARR_FIND(0, MAX_CHARS, ch, sd->found_char[ch] == -1);
-                    if (ch < MAX_CHARS)
-                        sd->found_char[ch] = i; // the char_id of the new char
-                }
+			//'Charname already exists' (-1), 'Char creation denied' (-2) and 'You are underaged' (-3)
+			if (i < 0)
+			{
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd,0) = 0x6e;
+				switch (i) {
+				case -1: WFIFOB(fd,2) = 0x00; break;
+				case -2: WFIFOB(fd,2) = 0xFF; break;
+				case -3: WFIFOB(fd,2) = 0x01; break;
+				}
+				WFIFOSET(fd,3);
+			}
+			else
+			{
+				int len;
+				// retrieve data
+				struct mmo_charstatus char_dat;
+				mmo_char_fromsql(i, &char_dat, false); //Only the short data is needed.
+
+				// send to player
+				WFIFOHEAD(fd,2+MAX_CHAR_BUF);
+				WFIFOW(fd,0) = 0x6d;
+				len = 2 + mmo_char_tobuf(WFIFOP(fd,2), &char_dat);
+				WFIFOSET(fd,len);
+
+				// add new entry to the chars list
+				ARR_FIND( 0, MAX_CHARS, ch, sd->found_char[ch] == -1 );
+				if( ch < MAX_CHARS )
+					sd->found_char[ch] = i; // the char_id of the new char
+			}
 #if PACKETVER >= 20120307
-                RFIFOSKIP(fd,31);
+			RFIFOSKIP(fd,31);
 #else
-                RFIFOSKIP(fd,37);
+			RFIFOSKIP(fd,37);
 #endif
-                break;
-
-                // delete char
-            case 0x68:
-                // 2004-04-19aSakexe+ langtype 12 char deletion packet
-            case 0x1fb:
-                if (cmd == 0x68) FIFOSD_CHECK(46);
-                if (cmd == 0x1fb) FIFOSD_CHECK(56);
-                {
-                    int cid = RFIFOL(fd,2);
-
-                    ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
-                    memcpy(email, RFIFOP(fd,6), 40);
-                    RFIFOSKIP(fd,(cmd == 0x68) ? 46 : 56);
-
-                    // Check if e-mail is correct
-                    if (strcmpi(email, sd->email) && //email does not matches and
-                        (
-                            strcmp("a@a.com", sd->email) || //it is not default email, or
-                            (strcmp("a@a.com", email) && strcmp("", email)) //email sent does not matches default
-                        )) {    //Fail
-                        WFIFOHEAD(fd,3);
-                        WFIFOW(fd,0) = 0x70;
-                        WFIFOB(fd,2) = 0; // 00 = Incorrect Email address
-                        WFIFOSET(fd,3);
-                        break;
-                    }
-
-                    // check if this char exists
-                    ARR_FIND(0, MAX_CHARS, i, sd->found_char[i] == cid);
-                    if (i == MAX_CHARS) {
-                        // Such a character does not exist in the account
-                        WFIFOHEAD(fd,3);
-                        WFIFOW(fd,0) = 0x70;
-                        WFIFOB(fd,2) = 0;
-                        WFIFOSET(fd,3);
-                        break;
-                    }
-
-                    // remove char from list and compact it
-                    for (ch = i; ch < MAX_CHARS-1; ch++)
-                        sd->found_char[ch] = sd->found_char[ch+1];
-                    sd->found_char[MAX_CHARS-1] = -1;
-
-                    /* Delete character */
-                    if (delete_char_sql(cid)<0) {
-                        //can't delete the char
-                        //either SQL error or can't delete by some CONFIG conditions
-                        //del fail
-                        WFIFOHEAD(fd,3);
-                        WFIFOW(fd, 0) = 0x70;
-                        WFIFOB(fd, 2) = 0;
-                        WFIFOSET(fd, 3);
-                        break;
-                    }
-                    /* Char successfully deleted.*/
-                    WFIFOHEAD(fd,2);
-                    WFIFOW(fd,0) = 0x6f;
-                    WFIFOSET(fd,2);
-                }
-                break;
-
-                // client keep-alive packet (every 12 seconds)
-                // R 0187 <account ID>.l
-            case 0x187:
-                if (RFIFOREST(fd) < 6)
-                    return 0;
-                RFIFOSKIP(fd,6);
-                break;
-
-                // char rename request
-                // R 028d <account ID>.l <char ID>.l <new name>.24B
-            case 0x28d:
-                FIFOSD_CHECK(34);
-                {
-                    int i, aid = RFIFOL(fd,2), cid =RFIFOL(fd,6);
-                    char name[NAME_LENGTH];
-                    char esc_name[NAME_LENGTH*2+1];
-                    safestrncpy(name, (char *)RFIFOP(fd,10), NAME_LENGTH);
-                    RFIFOSKIP(fd,34);
-
-                    if (aid != sd->account_id)
-                        break;
-                    ARR_FIND(0, MAX_CHARS, i, sd->found_char[i] == cid);
-                    if (i == MAX_CHARS)
-                        break;
-
-                    normalize_name(name,TRIM_CHARS);
-                    Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-                    if (!check_char_name(name,esc_name)) {
-                        i = 1;
-                        safestrncpy(sd->new_name, name, NAME_LENGTH);
-                    } else
-                        i = 0;
-
-                    WFIFOHEAD(fd, 4);
-                    WFIFOW(fd,0) = 0x28e;
-                    WFIFOW(fd,2) = i;
-                    WFIFOSET(fd,4);
-                }
-                break;
-                //Confirm change name.
-                // 0x28f <char_id>.L
-            case 0x28f:
-                // 0: Sucessfull
-                // 1: This character's name has already been changed. You cannot change a character's name more than once.
-                // 2: User information is not correct.
-                // 3: You have failed to change this character's name.
-                // 4: Another user is using this character name, so please select another one.
-                FIFOSD_CHECK(6);
-                {
-                    int i;
-                    int cid = RFIFOL(fd,2);
-                    RFIFOSKIP(fd,6);
-
-                    ARR_FIND(0, MAX_CHARS, i, sd->found_char[i] == cid);
-                    if (i == MAX_CHARS)
-                        break;
-                    i = rename_char_sql(sd, cid);
-
-                    WFIFOHEAD(fd, 4);
-                    WFIFOW(fd,0) = 0x290;
-                    WFIFOW(fd,2) = i;
-                    WFIFOSET(fd,4);
-                }
-                break;
-
-                // captcha code request (not implemented)
-                // R 07e5 <?>.w <aid>.l
-            case 0x7e5:
-                WFIFOHEAD(fd,5);
-                WFIFOW(fd,0) = 0x7e9;
-                WFIFOW(fd,2) = 5;
-                WFIFOB(fd,4) = 1;
-                WFIFOSET(fd,5);
-                RFIFOSKIP(fd,8);
-                break;
-
-                // captcha code check (not implemented)
-                // R 07e7 <len>.w <aid>.l <code>.b10 <?>.b14
-            case 0x7e7:
-                WFIFOHEAD(fd,5);
-                WFIFOW(fd,0) = 0x7e9;
-                WFIFOW(fd,2) = 5;
-                WFIFOB(fd,4) = 1;
-                WFIFOSET(fd,5);
-                RFIFOSKIP(fd,32);
-                break;
-
-                // deletion timer request
-            case 0x827:
-                FIFOSD_CHECK(6);
-                char_delete2_req(fd, sd);
-                RFIFOSKIP(fd,6);
-                break;
-
-                // deletion accept request
-            case 0x829:
-                FIFOSD_CHECK(12);
-                char_delete2_accept(fd, sd);
-                RFIFOSKIP(fd,12);
-                break;
-
-                // deletion cancel request
-            case 0x82b:
-                FIFOSD_CHECK(6);
-                char_delete2_cancel(fd, sd);
-                RFIFOSKIP(fd,6);
-                break;
-
-                // login as map-server
-            case 0x2af8:
-                if (RFIFOREST(fd) < 60)
-                    return 0;
-                {
-                    char *l_user = (char *)RFIFOP(fd,2);
-                    char *l_pass = (char *)RFIFOP(fd,26);
-                    l_user[23] = '\0';
-                    l_pass[23] = '\0';
-                    ARR_FIND(0, ARRAYLENGTH(server), i, server[i].fd <= 0);
-                    if (runflag != CHARSERVER_ST_RUNNING ||
-                        i == ARRAYLENGTH(server) ||
-                        strcmp(l_user, userid) != 0 ||
-                        strcmp(l_pass, passwd) != 0) {
-                        WFIFOHEAD(fd,3);
-                        WFIFOW(fd,0) = 0x2af9;
-                        WFIFOB(fd,2) = 3;
-                        WFIFOSET(fd,3);
-                    } else {
-                        WFIFOHEAD(fd,3);
-                        WFIFOW(fd,0) = 0x2af9;
-                        WFIFOB(fd,2) = 0;
-                        WFIFOSET(fd,3);
-
-                        server[i].fd = fd;
-                        server[i].ip = ntohl(RFIFOL(fd,54));
-                        server[i].port = ntohs(RFIFOW(fd,58));
-                        server[i].users = 0;
-                        memset(server[i].map, 0, sizeof(server[i].map));
-                        session[fd]->func_parse = parse_frommap;
-                        session[fd]->flag.server = 1;
-                        realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-                        char_mapif_init(fd);
-                    }
-
-                    RFIFOSKIP(fd,60);
-                }
-                return 0; // avoid processing of followup packets here
-
-                // unknown packet received
-            default:
-                ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
-                set_eof(fd);
-                return 0;
-        }
-    }
-
-    RFIFOFLUSH(fd);
-    return 0;
+		break;
+
+		// delete char
+		case 0x68:
+		// 2004-04-19aSakexe+ langtype 12 char deletion packet
+		case 0x1fb:
+			if (cmd == 0x68) FIFOSD_CHECK(46);
+			if (cmd == 0x1fb) FIFOSD_CHECK(56);
+		{
+			int cid = RFIFOL(fd,2);
+
+			ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
+			memcpy(email, RFIFOP(fd,6), 40);
+			RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
+			
+			// Check if e-mail is correct 
+			if(strcmpi(email, sd->email) && //email does not matches and 
+			(
+				strcmp("a@a.com", sd->email) || //it is not default email, or
+				(strcmp("a@a.com", email) && strcmp("", email)) //email sent does not matches default
+			)) {	//Fail
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd,0) = 0x70;
+				WFIFOB(fd,2) = 0; // 00 = Incorrect Email address
+				WFIFOSET(fd,3);
+				break;
+			}
+
+			// check if this char exists
+			ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+			if( i == MAX_CHARS )
+			{ // Such a character does not exist in the account
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd,0) = 0x70;
+				WFIFOB(fd,2) = 0;
+				WFIFOSET(fd,3);
+				break;
+			}
+
+			// remove char from list and compact it
+			for(ch = i; ch < MAX_CHARS-1; ch++)
+				sd->found_char[ch] = sd->found_char[ch+1];
+			sd->found_char[MAX_CHARS-1] = -1;
+			
+			/* Delete character */
+			if(delete_char_sql(cid)<0){
+				//can't delete the char
+				//either SQL error or can't delete by some CONFIG conditions
+				//del fail
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd, 0) = 0x70;
+				WFIFOB(fd, 2) = 0;
+				WFIFOSET(fd, 3);
+				break;
+			}
+			/* Char successfully deleted.*/
+			WFIFOHEAD(fd,2);
+			WFIFOW(fd,0) = 0x6f;
+			WFIFOSET(fd,2);
+		}
+		break;
+
+		// client keep-alive packet (every 12 seconds)
+		// R 0187 <account ID>.l
+		case 0x187:
+			if (RFIFOREST(fd) < 6)
+				return 0;
+			RFIFOSKIP(fd,6);
+		break;
+
+		// char rename request
+		// R 028d <account ID>.l <char ID>.l <new name>.24B
+		case 0x28d:
+			FIFOSD_CHECK(34);
+			{
+				int i, aid = RFIFOL(fd,2), cid =RFIFOL(fd,6);
+				char name[NAME_LENGTH];
+ 				char esc_name[NAME_LENGTH*2+1];
+				safestrncpy(name, (char *)RFIFOP(fd,10), NAME_LENGTH);
+				RFIFOSKIP(fd,34);
+
+				if( aid != sd->account_id )
+					break;
+				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+				if( i == MAX_CHARS )
+					break;
+
+				normalize_name(name,TRIM_CHARS);
+				Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+				if( !check_char_name(name,esc_name) )
+				{
+					i = 1;
+					safestrncpy(sd->new_name, name, NAME_LENGTH);
+				}
+				else 
+					i = 0;
+
+				WFIFOHEAD(fd, 4);
+				WFIFOW(fd,0) = 0x28e;
+				WFIFOW(fd,2) = i;
+				WFIFOSET(fd,4);
+			}
+			break;
+		//Confirm change name.
+		// 0x28f <char_id>.L
+		case 0x28f:
+			// 0: Sucessfull
+			// 1: This character's name has already been changed. You cannot change a character's name more than once.
+			// 2: User information is not correct.
+			// 3: You have failed to change this character's name.
+			// 4: Another user is using this character name, so please select another one.
+			FIFOSD_CHECK(6);
+			{
+				int i;
+				int cid = RFIFOL(fd,2);
+				RFIFOSKIP(fd,6);
+
+				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+				if( i == MAX_CHARS )
+					break;
+				i = rename_char_sql(sd, cid);
+
+				WFIFOHEAD(fd, 4);
+				WFIFOW(fd,0) = 0x290;
+				WFIFOW(fd,2) = i;
+				WFIFOSET(fd,4);
+			}
+			break;
+
+		// captcha code request (not implemented)
+		// R 07e5 <?>.w <aid>.l
+		case 0x7e5:
+			WFIFOHEAD(fd,5);
+			WFIFOW(fd,0) = 0x7e9;
+			WFIFOW(fd,2) = 5;
+			WFIFOB(fd,4) = 1;
+			WFIFOSET(fd,5);
+			RFIFOSKIP(fd,8);
+			break;
+
+		// captcha code check (not implemented)
+		// R 07e7 <len>.w <aid>.l <code>.b10 <?>.b14
+		case 0x7e7:
+			WFIFOHEAD(fd,5);
+			WFIFOW(fd,0) = 0x7e9;
+			WFIFOW(fd,2) = 5;
+			WFIFOB(fd,4) = 1;
+			WFIFOSET(fd,5);
+			RFIFOSKIP(fd,32);
+		break;
+
+		// deletion timer request
+		case 0x827:
+			FIFOSD_CHECK(6);
+			char_delete2_req(fd, sd);
+			RFIFOSKIP(fd,6);
+		break;
+
+		// deletion accept request
+		case 0x829:
+			FIFOSD_CHECK(12);
+			char_delete2_accept(fd, sd);
+			RFIFOSKIP(fd,12);
+		break;
+
+		// deletion cancel request
+		case 0x82b:
+			FIFOSD_CHECK(6);
+			char_delete2_cancel(fd, sd);
+			RFIFOSKIP(fd,6);
+		break;
+
+		// login as map-server
+		case 0x2af8:
+			if (RFIFOREST(fd) < 60)
+				return 0;
+		{
+			char* l_user = (char*)RFIFOP(fd,2);
+			char* l_pass = (char*)RFIFOP(fd,26);
+			l_user[23] = '\0';
+			l_pass[23] = '\0';
+			ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd <= 0 );
+			if( runflag != CHARSERVER_ST_RUNNING ||
+				i == ARRAYLENGTH(server) ||
+				strcmp(l_user, userid) != 0 ||
+				strcmp(l_pass, passwd) != 0 )
+			{
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd,0) = 0x2af9;
+				WFIFOB(fd,2) = 3;
+				WFIFOSET(fd,3);
+			} else {
+				WFIFOHEAD(fd,3);
+				WFIFOW(fd,0) = 0x2af9;
+				WFIFOB(fd,2) = 0;
+				WFIFOSET(fd,3);
+
+				server[i].fd = fd;
+				server[i].ip = ntohl(RFIFOL(fd,54));
+				server[i].port = ntohs(RFIFOW(fd,58));
+				server[i].users = 0;
+				memset(server[i].map, 0, sizeof(server[i].map));
+				session[fd]->func_parse = parse_frommap;
+				session[fd]->flag.server = 1;
+				realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+				char_mapif_init(fd);
+			}
+
+			RFIFOSKIP(fd,60);
+		}
+		return 0; // avoid processing of followup packets here
+
+		// unknown packet received
+		default:
+			ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
+			set_eof(fd);
+			return 0;
+		}
+	}
+
+	RFIFOFLUSH(fd);
+	return 0;
 }
 
 // Console Command Parser [Wizputer]
-int parse_console(const char *command)
+int parse_console(const char* command)
 {
-    ShowNotice("Console command: %s\n", command);
-
-    if (strcmpi("shutdown", command) == 0 || strcmpi("exit", command) == 0 || strcmpi("quit", command) == 0 || strcmpi("end", command) == 0)
-        runflag = 0;
-    else if (strcmpi("alive", command) == 0 || strcmpi("status", command) == 0)
-        ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");
-    else if (strcmpi("help", command) == 0) {
-        ShowInfo("To shutdown the server:\n");
-        ShowInfo("  'shutdown|exit|quit|end'\n");
-        ShowInfo("To know if server is alive:\n");
-        ShowInfo("  'alive|status'\n");
-    }
-
-    return 0;
+	ShowNotice("Console command: %s\n", command);
+
+	if( strcmpi("shutdown", command) == 0 || strcmpi("exit", command) == 0 || strcmpi("quit", command) == 0 || strcmpi("end", command) == 0 )
+		runflag = 0;
+	else if( strcmpi("alive", command) == 0 || strcmpi("status", command) == 0 )
+		ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");
+	else if( strcmpi("help", command) == 0 )
+	{
+		ShowInfo("To shutdown the server:\n");
+		ShowInfo("  'shutdown|exit|quit|end'\n");
+		ShowInfo("To know if server is alive:\n");
+		ShowInfo("  'alive|status'\n");
+	}
+
+	return 0;
 }
 
 int mapif_sendall(unsigned char *buf, unsigned int len)
 {
-    int i, c;
-
-    c = 0;
-    for (i = 0; i < ARRAYLENGTH(server); i++) {
-        int fd;
-        if ((fd = server[i].fd) > 0) {
-            WFIFOHEAD(fd,len);
-            memcpy(WFIFOP(fd,0), buf, len);
-            WFIFOSET(fd,len);
-            c++;
-        }
-    }
-
-    return c;
+	int i, c;
+
+	c = 0;
+	for(i = 0; i < ARRAYLENGTH(server); i++) {
+		int fd;
+		if ((fd = server[i].fd) > 0) {
+			WFIFOHEAD(fd,len);
+			memcpy(WFIFOP(fd,0), buf, len);
+			WFIFOSET(fd,len);
+			c++;
+		}
+	}
+
+	return c;
 }
 
 int mapif_sendallwos(int sfd, unsigned char *buf, unsigned int len)
 {
-    int i, c;
-
-    c = 0;
-    for (i = 0; i < ARRAYLENGTH(server); i++) {
-        int fd;
-        if ((fd = server[i].fd) > 0 && fd != sfd) {
-            WFIFOHEAD(fd,len);
-            memcpy(WFIFOP(fd,0), buf, len);
-            WFIFOSET(fd,len);
-            c++;
-        }
-    }
-
-    return c;
+	int i, c;
+
+	c = 0;
+	for(i = 0; i < ARRAYLENGTH(server); i++) {
+		int fd;
+		if ((fd = server[i].fd) > 0 && fd != sfd) {
+			WFIFOHEAD(fd,len);
+			memcpy(WFIFOP(fd,0), buf, len);
+			WFIFOSET(fd,len);
+			c++;
+		}
+	}
+
+	return c;
 }
 
 int mapif_send(int fd, unsigned char *buf, unsigned int len)
 {
-    if (fd >= 0) {
-        int i;
-        ARR_FIND(0, ARRAYLENGTH(server), i, fd == server[i].fd);
-        if (i < ARRAYLENGTH(server)) {
-            WFIFOHEAD(fd,len);
-            memcpy(WFIFOP(fd,0), buf, len);
-            WFIFOSET(fd,len);
-            return 1;
-        }
-    }
-    return 0;
+	if (fd >= 0) {
+		int i;
+		ARR_FIND( 0, ARRAYLENGTH(server), i, fd == server[i].fd );
+		if( i < ARRAYLENGTH(server) )
+		{
+			WFIFOHEAD(fd,len);
+			memcpy(WFIFOP(fd,0), buf, len);
+			WFIFOSET(fd,len);
+			return 1;
+		}
+	}
+	return 0;
 }
 
 int broadcast_user_count(int tid, unsigned int tick, int id, intptr_t data)
 {
-    uint8 buf[6];
-    int users = count_users();
-
-    // only send an update when needed
-    static int prev_users = 0;
-    if (prev_users == users)
-        return 0;
-    prev_users = users;
-
-    if (login_fd > 0 && session[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);
-    }
-
-    // send number of players to all map-servers
-    WBUFW(buf,0) = 0x2b00;
-    WBUFL(buf,2) = users;
-    mapif_sendall(buf,6);
-
-    return 0;
+	uint8 buf[6];
+	int users = count_users();
+
+	// only send an update when needed
+	static int prev_users = 0;
+	if( prev_users == users )
+		return 0;
+	prev_users = users;
+
+	if( login_fd > 0 && session[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);
+	}
+
+	// send number of players to all map-servers
+	WBUFW(buf,0) = 0x2b00;
+	WBUFL(buf,2) = users;
+	mapif_sendall(buf,6);
+
+	return 0;
 }
 
 /**
@@ -4183,64 +4236,66 @@ int broadcast_user_count(int tid, unsigned int tick, int id, intptr_t data)
  */
 static int 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;
-        (*i)++;
-        return 1;
-    }
-    return 0;
+	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;
+		(*i)++;
+		return 1;
+	}
+	return 0;
 }
 
 int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data)
 {
-    if (login_fd > 0 && session[login_fd]) {
-        // send account list to login server
-        int users = online_char_db->size(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));
-    }
-    return 0;
+	if (login_fd > 0 && session[login_fd])
+	{
+		// send account list to login server
+		int users = online_char_db->size(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));
+	}
+	return 0;
 }
 
 int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data)
 {
-    if (login_fd > 0 && session[login_fd] != NULL)
-        return 0;
-
-    ShowInfo("Attempt to connect to login-server...\n");
-    login_fd = make_connection(login_ip, login_port, false);
-    if (login_fd == -1) {
-        //Try again later. [Skotlex]
-        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_maintenance;
-    WFIFOW(login_fd,84) = char_new_display; //only display (New) if they want to [Kevin]
-    WFIFOSET(login_fd,86);
-
-    return 1;
+	if (login_fd > 0 && session[login_fd] != NULL)
+		return 0;
+
+	ShowInfo("Attempt to connect to login-server...\n");
+	login_fd = make_connection(login_ip, login_port, false);
+	if (login_fd == -1)
+	{	//Try again later. [Skotlex]
+		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_maintenance;
+	WFIFOW(login_fd,84) = char_new_display; //only display (New) if they want to [Kevin]
+	WFIFOSET(login_fd,86);
+	
+	return 1;
 }
 
 //------------------------------------------------
@@ -4249,13 +4304,13 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data
 //------------------------------------------------
 static int chardb_waiting_disconnect(int tid, unsigned int 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) {
-        //Mark it offline due to timeout.
-        character->waiting_disconnect = INVALID_TIMER;
-        set_char_offline(character->char_id, character->account_id);
-    }
-    return 0;
+	struct online_char_data* character;
+	if ((character = (struct online_char_data*)idb_get(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);
+	}
+	return 0;
 }
 
 /**
@@ -4263,21 +4318,21 @@ static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_
  */
 static int 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);
-    if (character->server < 0)
-        //Free data from players that have not been online for a while.
-        db_remove(online_char_db, key);
-    return 0;
+	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);
+	if (character->server < 0)
+		//Free data from players that have not been online for a while.
+		db_remove(online_char_db, key);
+	return 0;
 }
 
 static int online_data_cleanup(int tid, unsigned int tick, int id, intptr_t data)
 {
-    online_char_db->foreach(online_char_db, online_data_cleanup_sub);
-    return 0;
+	online_char_db->foreach(online_char_db, online_data_cleanup_sub);
+	return 0;
 }
 
 //----------------------------------
@@ -4286,323 +4341,327 @@ static int online_data_cleanup(int tid, unsigned int tick, int id, intptr_t data
 //----------------------------------
 int char_lan_config_read(const char *lancfgName)
 {
-    FILE *fp;
-    int line_num = 0;
-    char line[1024], w1[64], w2[64], w3[64], w4[64];
-
-    if ((fp = fopen(lancfgName, "r")) == NULL) {
-        ShowWarning("LAN Support configuration file is not found: %s\n", lancfgName);
-        return 1;
-    }
-
-    while (fgets(line, sizeof(line), fp)) {
-        line_num++;
-        if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n')
-            continue;
-
-        if (sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4) {
-
-            ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num);
-            continue;
-        }
-
-        remove_control_chars(w1);
-        remove_control_chars(w2);
-        remove_control_chars(w3);
-        remove_control_chars(w4);
-
-        if (strcmpi(w1, "subnet") == 0) {
-            subnet[subnet_count].mask = str2ip(w2);
-            subnet[subnet_count].char_ip = str2ip(w3);
-            subnet[subnet_count].map_ip = str2ip(w4);
-
-            if ((subnet[subnet_count].char_ip & subnet[subnet_count].mask) != (subnet[subnet_count].map_ip & subnet[subnet_count].mask)) {
-                ShowError("%s: Configuration Error: The char server (%s) and map server (%s) belong to different subnetworks!\n", lancfgName, w3, w4);
-                continue;
-            }
-
-            subnet_count++;
-        }
-    }
-
-    if (subnet_count > 1)  /* only useful if there is more than 1 */
-        ShowStatus("Read information about %d subnetworks.\n", subnet_count);
-
-    fclose(fp);
-    return 0;
+	FILE *fp;
+	int line_num = 0;
+	char line[1024], w1[64], w2[64], w3[64], w4[64];
+	
+	if((fp = fopen(lancfgName, "r")) == NULL) {
+		ShowWarning("LAN Support configuration file is not found: %s\n", lancfgName);
+		return 1;
+	}
+
+	while(fgets(line, sizeof(line), fp)) {
+		line_num++;
+		if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n')
+			continue;
+
+		if(sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4) {
+	
+			ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num);
+			continue;
+		}
+
+		remove_control_chars(w1);
+		remove_control_chars(w2);
+		remove_control_chars(w3);
+		remove_control_chars(w4);
+
+		if( strcmpi(w1, "subnet") == 0 )
+		{
+			subnet[subnet_count].mask = str2ip(w2);
+			subnet[subnet_count].char_ip = str2ip(w3);
+			subnet[subnet_count].map_ip = str2ip(w4);
+
+			if( (subnet[subnet_count].char_ip & subnet[subnet_count].mask) != (subnet[subnet_count].map_ip & subnet[subnet_count].mask) )
+			{
+				ShowError("%s: Configuration Error: The char server (%s) and map server (%s) belong to different subnetworks!\n", lancfgName, w3, w4);
+				continue;
+			}
+				
+			subnet_count++;
+		}
+	}
+
+	if( subnet_count > 1 ) /* only useful if there is more than 1 */
+		ShowStatus("Read information about %d subnetworks.\n", subnet_count);
+
+	fclose(fp);
+	return 0;
 }
 
-void sql_config_read(const char *cfgName)
+void sql_config_read(const char* cfgName)
 {
-    char line[1024], w1[1024], w2[1024];
-    FILE *fp;
-
-    if ((fp = fopen(cfgName, "r")) == NULL) {
-        ShowError("File not found: %s\n", cfgName);
-        return;
-    }
-
-    while (fgets(line, sizeof(line), fp)) {
-        if (line[0] == '/' && line[1] == '/')
-            continue;
-
-        if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
-            continue;
-
-        if (!strcmpi(w1,"char_db"))
-            safestrncpy(char_db, w2, sizeof(char_db));
-        else if (!strcmpi(w1,"scdata_db"))
-            safestrncpy(scdata_db, w2, sizeof(scdata_db));
-        else if (!strcmpi(w1,"cart_db"))
-            safestrncpy(cart_db, w2, sizeof(cart_db));
-        else if (!strcmpi(w1,"inventory_db"))
-            safestrncpy(inventory_db, w2, sizeof(inventory_db));
-        else if (!strcmpi(w1,"charlog_db"))
-            safestrncpy(charlog_db, w2, sizeof(charlog_db));
-        else if (!strcmpi(w1,"storage_db"))
-            safestrncpy(storage_db, w2, sizeof(storage_db));
-        else if (!strcmpi(w1,"reg_db"))
-            safestrncpy(reg_db, w2, sizeof(reg_db));
-        else if (!strcmpi(w1,"skill_db"))
-            safestrncpy(skill_db, w2, sizeof(skill_db));
-        else if (!strcmpi(w1,"interlog_db"))
-            safestrncpy(interlog_db, w2, sizeof(interlog_db));
-        else if (!strcmpi(w1,"memo_db"))
-            safestrncpy(memo_db, w2, sizeof(memo_db));
-        else if (!strcmpi(w1,"guild_db"))
-            safestrncpy(guild_db, w2, sizeof(guild_db));
-        else if (!strcmpi(w1,"guild_alliance_db"))
-            safestrncpy(guild_alliance_db, w2, sizeof(guild_alliance_db));
-        else if (!strcmpi(w1,"guild_castle_db"))
-            safestrncpy(guild_castle_db, w2, sizeof(guild_castle_db));
-        else if (!strcmpi(w1,"guild_expulsion_db"))
-            safestrncpy(guild_expulsion_db, w2, sizeof(guild_expulsion_db));
-        else if (!strcmpi(w1,"guild_member_db"))
-            safestrncpy(guild_member_db, w2, sizeof(guild_member_db));
-        else if (!strcmpi(w1,"guild_skill_db"))
-            safestrncpy(guild_skill_db, w2, sizeof(guild_skill_db));
-        else if (!strcmpi(w1,"guild_position_db"))
-            safestrncpy(guild_position_db, w2, sizeof(guild_position_db));
-        else if (!strcmpi(w1,"guild_storage_db"))
-            safestrncpy(guild_storage_db, w2, sizeof(guild_storage_db));
-        else if (!strcmpi(w1,"party_db"))
-            safestrncpy(party_db, w2, sizeof(party_db));
-        else if (!strcmpi(w1,"pet_db"))
-            safestrncpy(pet_db, w2, sizeof(pet_db));
-        else if (!strcmpi(w1,"mail_db"))
-            safestrncpy(mail_db, w2, sizeof(mail_db));
-        else if (!strcmpi(w1,"auction_db"))
-            safestrncpy(auction_db, w2, sizeof(auction_db));
-        else if (!strcmpi(w1,"friend_db"))
-            safestrncpy(friend_db, w2, sizeof(friend_db));
-        else if (!strcmpi(w1,"hotkey_db"))
-            safestrncpy(hotkey_db, w2, sizeof(hotkey_db));
-        else if (!strcmpi(w1,"quest_db"))
-            safestrncpy(quest_db,w2,sizeof(quest_db));
-        else if (!strcmpi(w1,"homunculus_db"))
-            safestrncpy(homunculus_db,w2,sizeof(homunculus_db));
-        else if (!strcmpi(w1,"skill_homunculus_db"))
-            safestrncpy(skill_homunculus_db,w2,sizeof(skill_homunculus_db));
-        else if (!strcmpi(w1,"mercenary_db"))
-            safestrncpy(mercenary_db,w2,sizeof(mercenary_db));
-        else if (!strcmpi(w1,"mercenary_owner_db"))
-            safestrncpy(mercenary_owner_db,w2,sizeof(mercenary_owner_db));
-        //support the import command, just like any other config
-        else if (!strcmpi(w1,"import"))
-            sql_config_read(w2);
-    }
-    fclose(fp);
-    ShowInfo("Done reading %s.\n", cfgName);
+	char line[1024], w1[1024], w2[1024];
+	FILE* fp;
+
+	if ((fp = fopen(cfgName, "r")) == NULL) {
+		ShowError("File not found: %s\n", cfgName);
+		return;
+	}
+
+	while(fgets(line, sizeof(line), fp))
+	{
+		if(line[0] == '/' && line[1] == '/')
+			continue;
+
+		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
+			continue;
+
+		if(!strcmpi(w1,"char_db"))
+			safestrncpy(char_db, w2, sizeof(char_db));
+		else if(!strcmpi(w1,"scdata_db"))
+			safestrncpy(scdata_db, w2, sizeof(scdata_db));
+		else if(!strcmpi(w1,"cart_db"))
+			safestrncpy(cart_db, w2, sizeof(cart_db));
+		else if(!strcmpi(w1,"inventory_db"))
+			safestrncpy(inventory_db, w2, sizeof(inventory_db));
+		else if(!strcmpi(w1,"charlog_db"))
+			safestrncpy(charlog_db, w2, sizeof(charlog_db));
+		else if(!strcmpi(w1,"storage_db"))
+			safestrncpy(storage_db, w2, sizeof(storage_db));
+		else if(!strcmpi(w1,"reg_db"))
+			safestrncpy(reg_db, w2, sizeof(reg_db));
+		else if(!strcmpi(w1,"skill_db"))
+			safestrncpy(skill_db, w2, sizeof(skill_db));
+		else if(!strcmpi(w1,"interlog_db"))
+			safestrncpy(interlog_db, w2, sizeof(interlog_db));
+		else if(!strcmpi(w1,"memo_db"))
+			safestrncpy(memo_db, w2, sizeof(memo_db));
+		else if(!strcmpi(w1,"guild_db"))
+			safestrncpy(guild_db, w2, sizeof(guild_db));
+		else if(!strcmpi(w1,"guild_alliance_db"))
+			safestrncpy(guild_alliance_db, w2, sizeof(guild_alliance_db));
+		else if(!strcmpi(w1,"guild_castle_db"))
+			safestrncpy(guild_castle_db, w2, sizeof(guild_castle_db));
+		else if(!strcmpi(w1,"guild_expulsion_db"))
+			safestrncpy(guild_expulsion_db, w2, sizeof(guild_expulsion_db));
+		else if(!strcmpi(w1,"guild_member_db"))
+			safestrncpy(guild_member_db, w2, sizeof(guild_member_db));
+		else if(!strcmpi(w1,"guild_skill_db"))
+			safestrncpy(guild_skill_db, w2, sizeof(guild_skill_db));
+		else if(!strcmpi(w1,"guild_position_db"))
+			safestrncpy(guild_position_db, w2, sizeof(guild_position_db));
+		else if(!strcmpi(w1,"guild_storage_db"))
+			safestrncpy(guild_storage_db, w2, sizeof(guild_storage_db));
+		else if(!strcmpi(w1,"party_db"))
+			safestrncpy(party_db, w2, sizeof(party_db));
+		else if(!strcmpi(w1,"pet_db"))
+			safestrncpy(pet_db, w2, sizeof(pet_db));
+		else if(!strcmpi(w1,"mail_db"))
+			safestrncpy(mail_db, w2, sizeof(mail_db));
+		else if(!strcmpi(w1,"auction_db"))
+			safestrncpy(auction_db, w2, sizeof(auction_db));
+		else if(!strcmpi(w1,"friend_db"))
+			safestrncpy(friend_db, w2, sizeof(friend_db));
+		else if(!strcmpi(w1,"hotkey_db"))
+			safestrncpy(hotkey_db, w2, sizeof(hotkey_db));
+		else if(!strcmpi(w1,"quest_db"))
+			safestrncpy(quest_db,w2,sizeof(quest_db));
+		else if(!strcmpi(w1,"homunculus_db"))
+			safestrncpy(homunculus_db,w2,sizeof(homunculus_db));
+		else if(!strcmpi(w1,"skill_homunculus_db"))
+			safestrncpy(skill_homunculus_db,w2,sizeof(skill_homunculus_db));
+		else if(!strcmpi(w1,"mercenary_db"))
+			safestrncpy(mercenary_db,w2,sizeof(mercenary_db));
+		else if(!strcmpi(w1,"mercenary_owner_db"))
+			safestrncpy(mercenary_owner_db,w2,sizeof(mercenary_owner_db));
+		//support the import command, just like any other config
+		else if(!strcmpi(w1,"import"))
+			sql_config_read(w2);
+	}
+	fclose(fp);
+	ShowInfo("Done reading %s.\n", cfgName);
 }
 
-int char_config_read(const char *cfgName)
+int char_config_read(const char* cfgName)
 {
-    char line[1024], w1[1024], w2[1024];
-    FILE *fp = fopen(cfgName, "r");
-
-    if (fp == NULL) {
-        ShowError("Configuration file not found: %s.\n", cfgName);
-        return 1;
-    }
-
-    while (fgets(line, sizeof(line), fp)) {
-        if (line[0] == '/' && line[1] == '/')
-            continue;
-
-        if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
-            continue;
-
-        remove_control_chars(w1);
-        remove_control_chars(w2);
-        if (strcmpi(w1,"timestamp_format") == 0) {
-            safestrncpy(timestamp_format, w2, sizeof(timestamp_format));
-        } else if (strcmpi(w1,"console_silent")==0) {
-            msg_silent = atoi(w2);
-            if (msg_silent)  /* only bother if its actually enabled */
-                ShowInfo("Console Silent Setting: %d\n", atoi(w2));
-        } else if (strcmpi(w1,"stdout_with_ansisequence")==0) {
-            stdout_with_ansisequence = config_switch(w2);
-        } else if (strcmpi(w1, "userid") == 0) {
-            safestrncpy(userid, w2, sizeof(userid));
-        } else if (strcmpi(w1, "passwd") == 0) {
-            safestrncpy(passwd, w2, sizeof(passwd));
-        } else if (strcmpi(w1, "server_name") == 0) {
-            safestrncpy(server_name, w2, sizeof(server_name));
-        } else if (strcmpi(w1, "wisp_server_name") == 0) {
-            if (strlen(w2) >= 4) {
-                safestrncpy(wisp_server_name, w2, sizeof(wisp_server_name));
-            }
-        } else if (strcmpi(w1, "login_ip") == 0) {
-            char ip_str[16];
-            login_ip = host2ip(w2);
-            if (login_ip) {
-                safestrncpy(login_ip_str, w2, sizeof(login_ip_str));
-                ShowStatus("Login server IP address : %s -> %s\n", w2, ip2str(login_ip, ip_str));
-            }
-        } else if (strcmpi(w1, "login_port") == 0) {
-            login_port = atoi(w2);
-        } else if (strcmpi(w1, "char_ip") == 0) {
-            char ip_str[16];
-            char_ip = host2ip(w2);
-            if (char_ip) {
-                safestrncpy(char_ip_str, w2, sizeof(char_ip_str));
-                ShowStatus("Character server IP address : %s -> %s\n", w2, ip2str(char_ip, ip_str));
-            }
-        } else if (strcmpi(w1, "bind_ip") == 0) {
-            char ip_str[16];
-            bind_ip = host2ip(w2);
-            if (bind_ip) {
-                safestrncpy(bind_ip_str, w2, sizeof(bind_ip_str));
-                ShowStatus("Character server binding IP address : %s -> %s\n", w2, ip2str(bind_ip, ip_str));
-            }
-        } else if (strcmpi(w1, "char_port") == 0) {
-            char_port = atoi(w2);
-        } else if (strcmpi(w1, "char_maintenance") == 0) {
-            char_maintenance = atoi(w2);
-        } else if (strcmpi(w1, "char_new") == 0) {
-            char_new = (bool)atoi(w2);
-        } else if (strcmpi(w1, "char_new_display") == 0) {
-            char_new_display = atoi(w2);
-        } else if (strcmpi(w1, "max_connect_user") == 0) {
-            max_connect_user = atoi(w2);
-            if (max_connect_user < 0)
-                max_connect_user = 0; // unlimited online players
-        } else if (strcmpi(w1, "gm_allow_group") == 0) {
-            gm_allow_group = atoi(w2);
-        } else if (strcmpi(w1, "autosave_time") == 0) {
-            autosave_interval = atoi(w2)*1000;
-            if (autosave_interval <= 0)
-                autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
-        } else if (strcmpi(w1, "save_log") == 0) {
-            save_log = config_switch(w2);
-        } else if (strcmpi(w1, "start_point") == 0) {
-            char map[MAP_NAME_LENGTH_EXT];
-            int x, y;
-            if (sscanf(w2, "%15[^,],%d,%d", map, &x, &y) < 3)
-                continue;
-            start_point.map = mapindex_name2id(map);
-            if (!start_point.map)
-                ShowError("Specified start_point %s not found in map-index cache.\n", map);
-            start_point.x = x;
-            start_point.y = y;
-        } else if (strcmpi(w1, "start_zeny") == 0) {
-            start_zeny = atoi(w2);
-            if (start_zeny < 0)
-                start_zeny = 0;
-        } else if (strcmpi(w1, "start_weapon") == 0) {
-            start_weapon = atoi(w2);
-            if (start_weapon < 0)
-                start_weapon = 0;
-        } else if (strcmpi(w1, "start_armor") == 0) {
-            start_armor = atoi(w2);
-            if (start_armor < 0)
-                start_armor = 0;
-        } else if (strcmpi(w1,"log_char")==0) {     //log char or not [devil]
-            log_char = atoi(w2);
-        } else if (strcmpi(w1, "unknown_char_name") == 0) {
-            safestrncpy(unknown_char_name, w2, sizeof(unknown_char_name));
-            unknown_char_name[NAME_LENGTH-1] = '\0';
-        } else if (strcmpi(w1, "name_ignoring_case") == 0) {
-            name_ignoring_case = (bool)config_switch(w2);
-        } else if (strcmpi(w1, "char_name_option") == 0) {
-            char_name_option = atoi(w2);
-        } else if (strcmpi(w1, "char_name_letters") == 0) {
-            safestrncpy(char_name_letters, w2, sizeof(char_name_letters));
-        } else if (strcmpi(w1, "chars_per_account") == 0) { //maxchars per account [Sirius]
-            char_per_account = atoi(w2);
-            if (char_per_account == 0 || char_per_account > MAX_CHARS) {
-                if (char_per_account > MAX_CHARS)
-                    ShowWarning("Max chars per account '%d' exceeded limit. Defaulting to '%d'.\n", char_per_account, MAX_CHARS);
-                char_per_account = MAX_CHARS;
-            }
-        } else if (strcmpi(w1, "char_del_level") == 0) { //disable/enable char deletion by its level condition [Lupus]
-            char_del_level = atoi(w2);
-        } else if (strcmpi(w1, "char_del_delay") == 0) {
-            char_del_delay = atoi(w2);
-        } else if (strcmpi(w1,"db_path")==0) {
-            safestrncpy(db_path, w2, sizeof(db_path));
-        } else if (strcmpi(w1, "console") == 0) {
-            console = config_switch(w2);
-        } else if (strcmpi(w1, "fame_list_alchemist") == 0) {
-            fame_list_size_chemist = atoi(w2);
-            if (fame_list_size_chemist > MAX_FAME_LIST) {
-                ShowWarning("Max fame list size is %d (fame_list_alchemist)\n", MAX_FAME_LIST);
-                fame_list_size_chemist = MAX_FAME_LIST;
-            }
-        } else if (strcmpi(w1, "fame_list_blacksmith") == 0) {
-            fame_list_size_smith = atoi(w2);
-            if (fame_list_size_smith > MAX_FAME_LIST) {
-                ShowWarning("Max fame list size is %d (fame_list_blacksmith)\n", MAX_FAME_LIST);
-                fame_list_size_smith = MAX_FAME_LIST;
-            }
-        } else if (strcmpi(w1, "fame_list_taekwon") == 0) {
-            fame_list_size_taekwon = atoi(w2);
-            if (fame_list_size_taekwon > MAX_FAME_LIST) {
-                ShowWarning("Max fame list size is %d (fame_list_taekwon)\n", MAX_FAME_LIST);
-                fame_list_size_taekwon = MAX_FAME_LIST;
-            }
-        } else if (strcmpi(w1, "guild_exp_rate") == 0) {
-            guild_exp_rate = atoi(w2);
-        } else if (strcmpi(w1, "import") == 0) {
-            char_config_read(w2);
-        }
-    }
-    fclose(fp);
-
-    ShowInfo("Done reading %s.\n", cfgName);
-    return 0;
+	char line[1024], w1[1024], w2[1024];
+	FILE* fp = fopen(cfgName, "r");
+
+	if (fp == NULL) {
+		ShowError("Configuration file not found: %s.\n", cfgName);
+		return 1;
+	}
+
+	while(fgets(line, sizeof(line), fp)) {
+		if (line[0] == '/' && line[1] == '/')
+			continue;
+
+		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
+			continue;
+
+		remove_control_chars(w1);
+		remove_control_chars(w2);
+		if(strcmpi(w1,"timestamp_format") == 0) {
+			safestrncpy(timestamp_format, w2, sizeof(timestamp_format));
+		} else if(strcmpi(w1,"console_silent")==0){
+			msg_silent = atoi(w2);
+			if( msg_silent ) /* only bother if its actually enabled */
+				ShowInfo("Console Silent Setting: %d\n", atoi(w2));
+		} else if(strcmpi(w1,"stdout_with_ansisequence")==0){
+			stdout_with_ansisequence = config_switch(w2);
+		} else if (strcmpi(w1, "userid") == 0) {
+			safestrncpy(userid, w2, sizeof(userid));
+		} else if (strcmpi(w1, "passwd") == 0) {
+			safestrncpy(passwd, w2, sizeof(passwd));
+		} else if (strcmpi(w1, "server_name") == 0) {
+			safestrncpy(server_name, w2, sizeof(server_name));
+		} else if (strcmpi(w1, "wisp_server_name") == 0) {
+			if (strlen(w2) >= 4) {
+				safestrncpy(wisp_server_name, w2, sizeof(wisp_server_name));
+			}
+		} else if (strcmpi(w1, "login_ip") == 0) {
+			char ip_str[16];
+			login_ip = host2ip(w2);
+			if (login_ip) {
+				safestrncpy(login_ip_str, w2, sizeof(login_ip_str));
+				ShowStatus("Login server IP address : %s -> %s\n", w2, ip2str(login_ip, ip_str));
+			}
+		} else if (strcmpi(w1, "login_port") == 0) {
+			login_port = atoi(w2);
+		} else if (strcmpi(w1, "char_ip") == 0) {
+			char ip_str[16];
+			char_ip = host2ip(w2);
+			if (char_ip){
+				safestrncpy(char_ip_str, w2, sizeof(char_ip_str));
+				ShowStatus("Character server IP address : %s -> %s\n", w2, ip2str(char_ip, ip_str));
+			}
+		} else if (strcmpi(w1, "bind_ip") == 0) {
+			char ip_str[16];
+			bind_ip = host2ip(w2);
+			if (bind_ip) {
+				safestrncpy(bind_ip_str, w2, sizeof(bind_ip_str));
+				ShowStatus("Character server binding IP address : %s -> %s\n", w2, ip2str(bind_ip, ip_str));
+			}
+		} else if (strcmpi(w1, "char_port") == 0) {
+			char_port = atoi(w2);
+		} else if (strcmpi(w1, "char_maintenance") == 0) {
+			char_maintenance = atoi(w2);
+		} else if (strcmpi(w1, "char_new") == 0) {
+			char_new = (bool)atoi(w2);
+		} else if (strcmpi(w1, "char_new_display") == 0) {
+			char_new_display = atoi(w2);
+		} else if (strcmpi(w1, "max_connect_user") == 0) {
+			max_connect_user = atoi(w2);
+			if (max_connect_user < 0)
+				max_connect_user = 0; // unlimited online players
+		} else if(strcmpi(w1, "gm_allow_group") == 0) {
+			gm_allow_group = atoi(w2);
+		} else if (strcmpi(w1, "autosave_time") == 0) {
+			autosave_interval = atoi(w2)*1000;
+			if (autosave_interval <= 0)
+				autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
+		} else if (strcmpi(w1, "save_log") == 0) {
+			save_log = config_switch(w2);
+		} else if (strcmpi(w1, "start_point") == 0) {
+			char map[MAP_NAME_LENGTH_EXT];
+			int x, y;
+			if (sscanf(w2, "%15[^,],%d,%d", map, &x, &y) < 3)
+				continue;
+			start_point.map = mapindex_name2id(map);
+			if (!start_point.map)
+				ShowError("Specified start_point %s not found in map-index cache.\n", map);
+			start_point.x = x;
+			start_point.y = y;
+		} else if (strcmpi(w1, "start_zeny") == 0) {
+			start_zeny = atoi(w2);
+			if (start_zeny < 0)
+				start_zeny = 0;
+		} else if (strcmpi(w1, "start_weapon") == 0) {
+			start_weapon = atoi(w2);
+			if (start_weapon < 0)
+				start_weapon = 0;
+		} else if (strcmpi(w1, "start_armor") == 0) {
+			start_armor = atoi(w2);
+			if (start_armor < 0)
+				start_armor = 0;
+		} else if(strcmpi(w1,"log_char")==0) {		//log char or not [devil]
+			log_char = atoi(w2);
+		} else if (strcmpi(w1, "unknown_char_name") == 0) {
+			safestrncpy(unknown_char_name, w2, sizeof(unknown_char_name));
+			unknown_char_name[NAME_LENGTH-1] = '\0';
+		} else if (strcmpi(w1, "name_ignoring_case") == 0) {
+			name_ignoring_case = (bool)config_switch(w2);
+		} else if (strcmpi(w1, "char_name_option") == 0) {
+			char_name_option = atoi(w2);
+		} else if (strcmpi(w1, "char_name_letters") == 0) {
+			safestrncpy(char_name_letters, w2, sizeof(char_name_letters));
+		} else if (strcmpi(w1, "chars_per_account") == 0) { //maxchars per account [Sirius]
+			char_per_account = atoi(w2);
+			if( char_per_account == 0 || char_per_account > MAX_CHARS ) {
+				if( char_per_account > MAX_CHARS )
+					ShowWarning("Max chars per account '%d' exceeded limit. Defaulting to '%d'.\n", char_per_account, MAX_CHARS);
+				char_per_account = MAX_CHARS;
+			}
+		} else if (strcmpi(w1, "char_del_level") == 0) { //disable/enable char deletion by its level condition [Lupus]
+			char_del_level = atoi(w2);
+		} else if (strcmpi(w1, "char_del_delay") == 0) {
+			char_del_delay = atoi(w2);
+		} else if(strcmpi(w1,"db_path")==0) {
+			safestrncpy(db_path, w2, sizeof(db_path));
+		} else if (strcmpi(w1, "console") == 0) {
+			console = config_switch(w2);
+		} else if (strcmpi(w1, "fame_list_alchemist") == 0) {
+			fame_list_size_chemist = atoi(w2);
+			if (fame_list_size_chemist > MAX_FAME_LIST) {
+				ShowWarning("Max fame list size is %d (fame_list_alchemist)\n", MAX_FAME_LIST);
+				fame_list_size_chemist = MAX_FAME_LIST;
+			}
+		} else if (strcmpi(w1, "fame_list_blacksmith") == 0) {
+			fame_list_size_smith = atoi(w2);
+			if (fame_list_size_smith > MAX_FAME_LIST) {
+				ShowWarning("Max fame list size is %d (fame_list_blacksmith)\n", MAX_FAME_LIST);
+				fame_list_size_smith = MAX_FAME_LIST;
+			}
+		} else if (strcmpi(w1, "fame_list_taekwon") == 0) {
+			fame_list_size_taekwon = atoi(w2);
+			if (fame_list_size_taekwon > MAX_FAME_LIST) {
+				ShowWarning("Max fame list size is %d (fame_list_taekwon)\n", MAX_FAME_LIST);
+				fame_list_size_taekwon = MAX_FAME_LIST;
+			}
+		} else if (strcmpi(w1, "guild_exp_rate") == 0) {
+			guild_exp_rate = atoi(w2);
+		} else if (strcmpi(w1, "import") == 0) {
+			char_config_read(w2);
+		}
+	}
+	fclose(fp);
+
+	ShowInfo("Done reading %s.\n", cfgName);
+	return 0;
 }
 
 void do_final(void)
 {
-    ShowStatus("Terminating...\n");
-
-    set_all_offline(-1);
-    set_all_offline_sql();
+	ShowStatus("Terminating...\n");
 
-    inter_final();
+	set_all_offline(-1);
+	set_all_offline_sql();
 
-    flush_fifos();
+	inter_final();
 
-    do_final_mapif();
-    do_final_loginif();
+	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(sql_handle, "DELETE FROM `%s`", ragsrvinfo_db) )
+		Sql_ShowDebug(sql_handle);
 
-    char_db_->destroy(char_db_, NULL);
-    online_char_db->destroy(online_char_db, NULL);
-    auth_db->destroy(auth_db, NULL);
+	char_db_->destroy(char_db_, NULL);
+	online_char_db->destroy(online_char_db, NULL);
+	auth_db->destroy(auth_db, NULL);
 
-    if (char_fd != -1) {
-        do_close(char_fd);
-        char_fd = -1;
-    }
+	if( char_fd != -1 )
+	{
+		do_close(char_fd);
+		char_fd = -1;
+	}
 
-    Sql_Free(sql_handle);
-    mapindex_final();
+	Sql_Free(sql_handle);
+	mapindex_final();
 
-    ShowStatus("Finished.\n");
+	ShowStatus("Finished.\n");
 }
 
 //------------------------------
@@ -4615,107 +4674,111 @@ void do_abort(void)
 
 void set_server_type(void)
 {
-    SERVER_TYPE = ATHENA_SERVER_CHAR;
+	SERVER_TYPE = ATHENA_SERVER_CHAR;
 }
 
 
 /// Called when a terminate signal is received.
 void do_shutdown(void)
 {
-    if (runflag != CHARSERVER_ST_SHUTDOWN) {
-        int id;
-        runflag = CHARSERVER_ST_SHUTDOWN;
-        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();
-        flush_fifos();
-        runflag = CORE_ST_STOP;
-    }
+	if( runflag != CHARSERVER_ST_SHUTDOWN )
+	{
+		int id;
+		runflag = CHARSERVER_ST_SHUTDOWN;
+		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();
+		flush_fifos();
+		runflag = CORE_ST_STOP;
+	}
 }
 
 
 int do_init(int argc, char **argv)
 {
-    //Read map indexes
-    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);
-
-    if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {
-        ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
-        ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
-        ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n");
-    }
-
-    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);
-    mmo_char_sql_init();
-    char_read_fame_list(); //Read fame lists.
-
-    if ((naddr_ != 0) && (!login_ip || !char_ip)) {
-        char ip_str[16];
-        ip2str(addr_[0], ip_str);
-
-        if (naddr_ > 1)
-            ShowStatus("Multiple interfaces detected..  using %s as our IP address\n", ip_str);
-        else
-            ShowStatus("Defaulting to %s as our IP address\n", ip_str);
-        if (!login_ip) {
-            safestrncpy(login_ip_str, ip_str, sizeof(login_ip_str));
-            login_ip = str2ip(login_ip_str);
-        }
-        if (!char_ip) {
-            safestrncpy(char_ip_str, ip_str, sizeof(char_ip_str));
-            char_ip = str2ip(char_ip_str);
-        }
-    }
-
-    do_init_loginif();
-    do_init_mapif();
-
-    // periodically update the overall user count on all mapservers + login server
-    add_timer_func_list(broadcast_user_count, "broadcast_user_count");
-    add_timer_interval(gettick() + 1000, broadcast_user_count, 0, 0, 5 * 1000);
-
-    // Timer to clear (online_char_db)
-    add_timer_func_list(chardb_waiting_disconnect, "chardb_waiting_disconnect");
-
-    // Online Data timers (checking if char still connected)
-    add_timer_func_list(online_data_cleanup, "online_data_cleanup");
-    add_timer_interval(gettick() + 1000, online_data_cleanup, 0, 0, 600 * 1000);
-
-    if (console) {
-        //##TODO invoke a CONSOLE_START plugin event
-    }
-
-    //Cleaning the tables for NULL entrys @ startup [Sirius]
-    //Chardb clean
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '0'", char_db))
-        Sql_ShowDebug(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);
-
-    //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);
-
-    set_defaultparse(parse_char);
-    char_fd = make_listen_bind(bind_ip, char_port);
-    ShowStatus("The char-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %d).\n\n", char_port);
-
-    if (runflag != CORE_ST_STOP) {
-        shutdown_callback = do_shutdown;
-        runflag = CHARSERVER_ST_RUNNING;
-    }
-
-    return 0;
+	//Read map indexes
+	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);
+
+	if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {
+		ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
+		ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
+		ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n");
+	}
+
+	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);
+	mmo_char_sql_init();
+	char_read_fame_list(); //Read fame lists.
+
+	if ((naddr_ != 0) && (!login_ip || !char_ip))
+	{
+		char ip_str[16];
+		ip2str(addr_[0], ip_str);
+
+		if (naddr_ > 1)
+			ShowStatus("Multiple interfaces detected..  using %s as our IP address\n", ip_str);
+		else
+			ShowStatus("Defaulting to %s as our IP address\n", ip_str);
+		if (!login_ip) {
+			safestrncpy(login_ip_str, ip_str, sizeof(login_ip_str));
+			login_ip = str2ip(login_ip_str);
+		}
+		if (!char_ip) {
+			safestrncpy(char_ip_str, ip_str, sizeof(char_ip_str));
+			char_ip = str2ip(char_ip_str);
+		}
+	}
+
+	do_init_loginif();
+	do_init_mapif();
+
+	// periodically update the overall user count on all mapservers + login server
+	add_timer_func_list(broadcast_user_count, "broadcast_user_count");
+	add_timer_interval(gettick() + 1000, broadcast_user_count, 0, 0, 5 * 1000);
+
+	// Timer to clear (online_char_db)
+	add_timer_func_list(chardb_waiting_disconnect, "chardb_waiting_disconnect");
+
+	// Online Data timers (checking if char still connected)
+	add_timer_func_list(online_data_cleanup, "online_data_cleanup");
+	add_timer_interval(gettick() + 1000, online_data_cleanup, 0, 0, 600 * 1000);
+
+	if( console )
+	{
+		//##TODO invoke a CONSOLE_START plugin event
+	}
+	
+	//Cleaning the tables for NULL entrys @ startup [Sirius]
+	//Chardb clean
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '0'", char_db) )
+		Sql_ShowDebug(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);
+
+	//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);
+
+	set_defaultparse(parse_char);
+	char_fd = make_listen_bind(bind_ip, char_port);
+	ShowStatus("The char-server is "CL_GREEN"ready"CL_RESET" (Server is listening on the port %d).\n\n", char_port);
+	
+	if( runflag != CORE_ST_STOP )
+	{
+		shutdown_callback = do_shutdown;
+		runflag = CHARSERVER_ST_RUNNING;
+	}
+
+	return 0;
 }
diff --git a/src/char/char.h b/src/char/char.h
index cdef28718..dd1c80f9d 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -6,10 +6,11 @@
 
 #include "../common/core.h" // CORE_ST_LAST
 
-enum E_CHARSERVER_ST {
-    CHARSERVER_ST_RUNNING = CORE_ST_LAST,
-    CHARSERVER_ST_SHUTDOWN,
-    CHARSERVER_ST_LAST
+enum E_CHARSERVER_ST
+{
+	CHARSERVER_ST_RUNNING = CORE_ST_LAST,
+	CHARSERVER_ST_SHUTDOWN,
+	CHARSERVER_ST_LAST
 };
 
 struct mmo_charstatus;
@@ -19,10 +20,10 @@ struct mmo_charstatus;
 #define DEFAULT_AUTOSAVE_INTERVAL 300*1000
 
 enum {
-    TABLE_INVENTORY,
-    TABLE_CART,
-    TABLE_STORAGE,
-    TABLE_GUILD_STORAGE,
+	TABLE_INVENTORY,
+	TABLE_CART,
+	TABLE_STORAGE,
+	TABLE_GUILD_STORAGE,
 };
 
 int memitemdata_to_sql(const struct item items[], int max, int id, int tableswitch);
@@ -36,7 +37,7 @@ int char_child(int parent_id, int child_id);
 int char_family(int pl1,int pl2,int pl3);
 
 int request_accreg2(int account_id, int char_id);
-int save_accreg2(unsigned char *buf, int len);
+int save_accreg2(unsigned char* buf, int len);
 
 extern int char_name_option;
 extern char char_name_letters[];
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 4eadb4866..4fc9215a0 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -18,435 +18,442 @@
 #include <string.h>
 #include <stdlib.h>
 
-static DBMap *auction_db_ = NULL; // int auction_id -> struct auction_data*
+static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data*
 
 void auction_delete(struct auction_data *auction);
 static int auction_end_timer(int tid, unsigned int tick, int id, intptr_t data);
 
 static int auction_count(int char_id, bool buy)
 {
-    int i = 0;
-    struct auction_data *auction;
-    DBIterator *iter = db_iterator(auction_db_);
-
-    for (auction = dbi_first(iter); dbi_exists(iter); auction = dbi_next(iter)) {
-        if ((buy && auction->buyer_id == char_id) || (!buy && auction->seller_id == char_id))
-            i++;
-    }
-    dbi_destroy(iter);
-
-    return i;
+	int i = 0;
+	struct auction_data *auction;
+	DBIterator *iter = db_iterator(auction_db_);
+
+	for( auction = dbi_first(iter); dbi_exists(iter); auction = dbi_next(iter) )
+	{
+		if( (buy && auction->buyer_id == char_id) || (!buy && auction->seller_id == char_id) )
+			i++;
+	}
+	dbi_destroy(iter);
+
+	return i;
 }
 
 void auction_save(struct auction_data *auction)
 {
-    int j;
-    StringBuf buf;
-    SqlStmt *stmt;
-
-    if (!auction)
-        return;
-
-    StringBuf_Init(&buf);
-    StringBuf_Printf(&buf, "UPDATE `%s` SET `seller_id` = '%d', `seller_name` = ?, `buyer_id` = '%d', `buyer_name` = ?, `price` = '%d', `buynow` = '%d', `hours` = '%d', `timestamp` = '%lu', `nameid` = '%d', `item_name` = ?, `type` = '%d', `refine` = '%d', `attribute` = '%d'",
-                     auction_db, auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, (unsigned long)auction->timestamp, auction->item.nameid, auction->type, auction->item.refine, auction->item.attribute);
-    for (j = 0; j < MAX_SLOTS; j++)
-        StringBuf_Printf(&buf, ", `card%d` = '%d'", j, auction->item.card[j]);
-    StringBuf_Printf(&buf, " WHERE `auction_id` = '%d'", auction->auction_id);
-
-    stmt = SqlStmt_Malloc(sql_handle);
-    if (SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, auction->seller_name, strnlen(auction->seller_name, NAME_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, auction->buyer_name, strnlen(auction->buyer_name, NAME_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, auction->item_name, strnlen(auction->item_name, ITEM_NAME_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_Execute(stmt)) {
-        SqlStmt_ShowDebug(stmt);
-    }
-
-    SqlStmt_Free(stmt);
-    StringBuf_Destroy(&buf);
+	int j;
+	StringBuf buf;
+	SqlStmt* stmt;
+
+	if( !auction )
+		return;
+
+	StringBuf_Init(&buf);
+	StringBuf_Printf(&buf, "UPDATE `%s` SET `seller_id` = '%d', `seller_name` = ?, `buyer_id` = '%d', `buyer_name` = ?, `price` = '%d', `buynow` = '%d', `hours` = '%d', `timestamp` = '%lu', `nameid` = '%d', `item_name` = ?, `type` = '%d', `refine` = '%d', `attribute` = '%d'",
+		auction_db, auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, (unsigned long)auction->timestamp, auction->item.nameid, auction->type, auction->item.refine, auction->item.attribute);
+	for( j = 0; j < MAX_SLOTS; j++ )
+		StringBuf_Printf(&buf, ", `card%d` = '%d'", j, auction->item.card[j]);
+	StringBuf_Printf(&buf, " WHERE `auction_id` = '%d'", auction->auction_id);
+
+	stmt = SqlStmt_Malloc(sql_handle);
+	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, auction->seller_name, strnlen(auction->seller_name, NAME_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, auction->buyer_name, strnlen(auction->buyer_name, NAME_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, auction->item_name, strnlen(auction->item_name, ITEM_NAME_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_Execute(stmt) )
+	{
+		SqlStmt_ShowDebug(stmt);
+	}
+
+	SqlStmt_Free(stmt);
+	StringBuf_Destroy(&buf);
 }
 
 unsigned int auction_create(struct auction_data *auction)
 {
-    int j;
-    StringBuf buf;
-    SqlStmt *stmt;
-
-    if (!auction)
-        return false;
-
-    auction->timestamp = time(NULL) + (auction->hours * 3600);
-
-    StringBuf_Init(&buf);
-    StringBuf_Printf(&buf, "INSERT INTO `%s` (`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,`price`,`buynow`,`hours`,`timestamp`,`nameid`,`item_name`,`type`,`refine`,`attribute`", auction_db);
-    for (j = 0; j < MAX_SLOTS; j++)
-        StringBuf_Printf(&buf, ",`card%d`", j);
-    StringBuf_Printf(&buf, ") VALUES ('%d',?,'%d',?,'%d','%d','%d','%lu','%d',?,'%d','%d','%d'",
-                     auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, (unsigned long)auction->timestamp, auction->item.nameid, auction->type, auction->item.refine, auction->item.attribute);
-    for (j = 0; j < MAX_SLOTS; j++)
-        StringBuf_Printf(&buf, ",'%d'", auction->item.card[j]);
-    StringBuf_AppendStr(&buf, ")");
-
-    stmt = SqlStmt_Malloc(sql_handle);
-    if (SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, auction->seller_name, strnlen(auction->seller_name, NAME_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, auction->buyer_name, strnlen(auction->buyer_name, NAME_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, auction->item_name, strnlen(auction->item_name, ITEM_NAME_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_Execute(stmt)) {
-        SqlStmt_ShowDebug(stmt);
-        auction->auction_id = 0;
-    } else {
-        struct auction_data *auction_;
-        unsigned int tick = auction->hours * 3600000;
-
-        auction->item.amount = 1;
-        auction->item.identify = 1;
-        auction->item.expire_time = 0;
-
-        auction->auction_id = (unsigned int)SqlStmt_LastInsertId(stmt);
-        auction->auction_end_timer = add_timer(gettick() + tick , auction_end_timer, auction->auction_id, 0);
-        ShowInfo("New Auction %u | time left %u ms | By %s.\n", auction->auction_id, tick, auction->seller_name);
-
-        CREATE(auction_, struct auction_data, 1);
-        memcpy(auction_, auction, sizeof(struct auction_data));
-        idb_put(auction_db_, auction_->auction_id, auction_);
-    }
-
-    SqlStmt_Free(stmt);
-    StringBuf_Destroy(&buf);
-
-    return auction->auction_id;
+	int j;
+	StringBuf buf;
+	SqlStmt* stmt;
+
+	if( !auction )
+		return false;
+
+	auction->timestamp = time(NULL) + (auction->hours * 3600);
+
+	StringBuf_Init(&buf);
+	StringBuf_Printf(&buf, "INSERT INTO `%s` (`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,`price`,`buynow`,`hours`,`timestamp`,`nameid`,`item_name`,`type`,`refine`,`attribute`", auction_db);
+	for( j = 0; j < MAX_SLOTS; j++ )
+		StringBuf_Printf(&buf, ",`card%d`", j);
+	StringBuf_Printf(&buf, ") VALUES ('%d',?,'%d',?,'%d','%d','%d','%lu','%d',?,'%d','%d','%d'",
+		auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, (unsigned long)auction->timestamp, auction->item.nameid, auction->type, auction->item.refine, auction->item.attribute);
+	for( j = 0; j < MAX_SLOTS; j++ )
+		StringBuf_Printf(&buf, ",'%d'", auction->item.card[j]);
+	StringBuf_AppendStr(&buf, ")");
+	
+	stmt = SqlStmt_Malloc(sql_handle);
+	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, auction->seller_name, strnlen(auction->seller_name, NAME_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, auction->buyer_name, strnlen(auction->buyer_name, NAME_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, auction->item_name, strnlen(auction->item_name, ITEM_NAME_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_Execute(stmt) )
+	{
+		SqlStmt_ShowDebug(stmt);
+		auction->auction_id = 0;
+	}
+	else
+	{
+		struct auction_data *auction_;
+		unsigned int tick = auction->hours * 3600000;
+
+		auction->item.amount = 1;
+		auction->item.identify = 1;
+		auction->item.expire_time = 0;
+
+		auction->auction_id = (unsigned int)SqlStmt_LastInsertId(stmt);
+		auction->auction_end_timer = add_timer( gettick() + tick , auction_end_timer, auction->auction_id, 0);
+		ShowInfo("New Auction %u | time left %u ms | By %s.\n", auction->auction_id, tick, auction->seller_name);
+
+		CREATE(auction_, struct auction_data, 1);
+		memcpy(auction_, auction, sizeof(struct auction_data));
+		idb_put(auction_db_, auction_->auction_id, auction_);
+	}
+
+	SqlStmt_Free(stmt);
+	StringBuf_Destroy(&buf);
+
+	return auction->auction_id;
 }
 
 static void mapif_Auction_message(int char_id, unsigned char result)
 {
-    unsigned char buf[74];
-
-    WBUFW(buf,0) = 0x3854;
-    WBUFL(buf,2) = char_id;
-    WBUFL(buf,6) = result;
-    mapif_sendall(buf,7);
+	unsigned char buf[74];
+	
+	WBUFW(buf,0) = 0x3854;
+	WBUFL(buf,2) = char_id;
+	WBUFL(buf,6) = result;
+	mapif_sendall(buf,7);
 }
 
 static int auction_end_timer(int tid, unsigned int tick, int id, intptr_t data)
 {
-    struct auction_data *auction;
-    if ((auction = (struct auction_data *)idb_get(auction_db_, id)) != NULL) {
-        if (auction->buyer_id) {
-            mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "Thanks, you won the auction!.", 0, &auction->item);
-            mapif_Auction_message(auction->buyer_id, 6); // You have won the auction
-            mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "Payment for your auction!.", auction->price, NULL);
-        } else
-            mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "No buyers have been found for your auction.", 0, &auction->item);
-
-        ShowInfo("Auction End: id %u.\n", auction->auction_id);
-
-        auction->auction_end_timer = INVALID_TIMER;
-        auction_delete(auction);
-    }
-
-    return 0;
+	struct auction_data *auction;
+	if( (auction = (struct auction_data *)idb_get(auction_db_, id)) != NULL )
+	{
+		if( auction->buyer_id )
+		{
+			mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "Thanks, you won the auction!.", 0, &auction->item);
+			mapif_Auction_message(auction->buyer_id, 6); // You have won the auction
+			mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "Payment for your auction!.", auction->price, NULL);
+		}
+		else
+			mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "No buyers have been found for your auction.", 0, &auction->item);
+		
+		ShowInfo("Auction End: id %u.\n", auction->auction_id);
+
+		auction->auction_end_timer = INVALID_TIMER;
+		auction_delete(auction);
+	}
+
+	return 0;
 }
 
 void auction_delete(struct auction_data *auction)
 {
-    unsigned int auction_id = auction->auction_id;
+	unsigned int auction_id = auction->auction_id;
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `auction_id` = '%d'", auction_db, auction_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `auction_id` = '%d'", auction_db, auction_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (auction->auction_end_timer != INVALID_TIMER)
-        delete_timer(auction->auction_end_timer, auction_end_timer);
+	if( auction->auction_end_timer != INVALID_TIMER )
+		delete_timer(auction->auction_end_timer, auction_end_timer);
 
-    idb_remove(auction_db_, auction_id);
+	idb_remove(auction_db_, auction_id);
 }
 
 void inter_auctions_fromsql(void)
 {
-    int i;
-    struct auction_data *auction;
-    struct item *item;
-    char *data;
-    StringBuf buf;
-    unsigned int tick = gettick(), endtick;
-    time_t now = time(NULL);
-
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `auction_id`,`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,"
-                        "`price`,`buynow`,`hours`,`timestamp`,`nameid`,`item_name`,`type`,`refine`,`attribute`");
-    for (i = 0; i < MAX_SLOTS; i++)
-        StringBuf_Printf(&buf, ",`card%d`", i);
-    StringBuf_Printf(&buf, " FROM `%s` ORDER BY `auction_id` DESC", auction_db);
-
-    if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)))
-        Sql_ShowDebug(sql_handle);
-
-    StringBuf_Destroy(&buf);
-
-    while (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        CREATE(auction, struct auction_data, 1);
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        auction->auction_id = atoi(data);
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        auction->seller_id = atoi(data);
-        Sql_GetData(sql_handle, 2, &data, NULL);
-        safestrncpy(auction->seller_name, data, NAME_LENGTH);
-        Sql_GetData(sql_handle, 3, &data, NULL);
-        auction->buyer_id = atoi(data);
-        Sql_GetData(sql_handle, 4, &data, NULL);
-        safestrncpy(auction->buyer_name, data, NAME_LENGTH);
-        Sql_GetData(sql_handle, 5, &data, NULL);
-        auction->price = atoi(data);
-        Sql_GetData(sql_handle, 6, &data, NULL);
-        auction->buynow = atoi(data);
-        Sql_GetData(sql_handle, 7, &data, NULL);
-        auction->hours = atoi(data);
-        Sql_GetData(sql_handle, 8, &data, NULL);
-        auction->timestamp = atoi(data);
-
-        item = &auction->item;
-        Sql_GetData(sql_handle, 9, &data, NULL);
-        item->nameid = atoi(data);
-        Sql_GetData(sql_handle,10, &data, NULL);
-        safestrncpy(auction->item_name, data, ITEM_NAME_LENGTH);
-        Sql_GetData(sql_handle,11, &data, NULL);
-        auction->type = atoi(data);
-
-        Sql_GetData(sql_handle,12, &data, NULL);
-        item->refine = atoi(data);
-        Sql_GetData(sql_handle,13, &data, NULL);
-        item->attribute = atoi(data);
-
-        item->identify = 1;
-        item->amount = 1;
-        item->expire_time = 0;
-
-        for (i = 0; i < MAX_SLOTS; i++) {
-            Sql_GetData(sql_handle, 14 + i, &data, NULL);
-            item->card[i] = atoi(data);
-        }
-
-        if (auction->timestamp > now)
-            endtick = ((unsigned int)(auction->timestamp - now) * 1000) + tick;
-        else
-            endtick = tick + 10000; // 10 Second's to process ended auctions
-
-        auction->auction_end_timer = add_timer(endtick, auction_end_timer, auction->auction_id, 0);
-        idb_put(auction_db_, auction->auction_id, auction);
-    }
-
-    Sql_FreeResult(sql_handle);
+	int i;
+	struct auction_data *auction;
+	struct item *item;
+	char *data;
+	StringBuf buf;
+	unsigned int tick = gettick(), endtick;
+	time_t now = time(NULL);
+
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `auction_id`,`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,"
+		"`price`,`buynow`,`hours`,`timestamp`,`nameid`,`item_name`,`type`,`refine`,`attribute`");
+	for( i = 0; i < MAX_SLOTS; i++ )
+		StringBuf_Printf(&buf, ",`card%d`", i);
+	StringBuf_Printf(&buf, " FROM `%s` ORDER BY `auction_id` DESC", auction_db);
+
+	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+		Sql_ShowDebug(sql_handle);
+
+	StringBuf_Destroy(&buf);
+
+	while( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		CREATE(auction, struct auction_data, 1);
+		Sql_GetData(sql_handle, 0, &data, NULL); auction->auction_id = atoi(data);
+		Sql_GetData(sql_handle, 1, &data, NULL); auction->seller_id = atoi(data);
+		Sql_GetData(sql_handle, 2, &data, NULL); safestrncpy(auction->seller_name, data, NAME_LENGTH);
+		Sql_GetData(sql_handle, 3, &data, NULL); auction->buyer_id = atoi(data);
+		Sql_GetData(sql_handle, 4, &data, NULL); safestrncpy(auction->buyer_name, data, NAME_LENGTH);
+		Sql_GetData(sql_handle, 5, &data, NULL); auction->price	= atoi(data);
+		Sql_GetData(sql_handle, 6, &data, NULL); auction->buynow = atoi(data);
+		Sql_GetData(sql_handle, 7, &data, NULL); auction->hours = atoi(data);
+		Sql_GetData(sql_handle, 8, &data, NULL); auction->timestamp = atoi(data);
+
+		item = &auction->item;
+		Sql_GetData(sql_handle, 9, &data, NULL); item->nameid = atoi(data);
+		Sql_GetData(sql_handle,10, &data, NULL); safestrncpy(auction->item_name, data, ITEM_NAME_LENGTH);
+		Sql_GetData(sql_handle,11, &data, NULL); auction->type = atoi(data);
+
+		Sql_GetData(sql_handle,12, &data, NULL); item->refine = atoi(data);
+		Sql_GetData(sql_handle,13, &data, NULL); item->attribute = atoi(data);
+
+		item->identify = 1;
+		item->amount = 1;
+		item->expire_time = 0;
+
+		for( i = 0; i < MAX_SLOTS; i++ )
+		{
+			Sql_GetData(sql_handle, 14 + i, &data, NULL);
+			item->card[i] = atoi(data);
+		}
+
+		if( auction->timestamp > now )
+			endtick = ((unsigned int)(auction->timestamp - now) * 1000) + tick;
+		else
+			endtick = tick + 10000; // 10 Second's to process ended auctions
+
+		auction->auction_end_timer = add_timer(endtick, auction_end_timer, auction->auction_id, 0);
+		idb_put(auction_db_, auction->auction_id, auction);
+	}
+
+	Sql_FreeResult(sql_handle);
 }
 
 static void mapif_Auction_sendlist(int fd, int char_id, short count, short pages, unsigned char *buf)
 {
-    int len = (sizeof(struct auction_data) * count) + 12;
-
-    WFIFOHEAD(fd, len);
-    WFIFOW(fd,0) = 0x3850;
-    WFIFOW(fd,2) = len;
-    WFIFOL(fd,4) = char_id;
-    WFIFOW(fd,8) = count;
-    WFIFOW(fd,10) = pages;
-    memcpy(WFIFOP(fd,12), buf, len - 12);
-    WFIFOSET(fd,len);
+	int len = (sizeof(struct auction_data) * count) + 12;
+
+	WFIFOHEAD(fd, len);
+	WFIFOW(fd,0) = 0x3850;
+	WFIFOW(fd,2) = len;
+	WFIFOL(fd,4) = char_id;
+	WFIFOW(fd,8) = count;
+	WFIFOW(fd,10) = pages;
+	memcpy(WFIFOP(fd,12), buf, len - 12);
+	WFIFOSET(fd,len);
 }
 
 static void mapif_parse_Auction_requestlist(int fd)
 {
-    char searchtext[NAME_LENGTH];
-    int char_id = RFIFOL(fd,4), len = sizeof(struct auction_data);
-    int price = RFIFOL(fd,10);
-    short type = RFIFOW(fd,8), page = max(1,RFIFOW(fd,14));
-    unsigned char buf[5 * sizeof(struct auction_data)];
-    DBIterator *iter = db_iterator(auction_db_);
-    struct auction_data *auction;
-    short i = 0, j = 0, pages = 1;
-
-    memcpy(searchtext, RFIFOP(fd,16), NAME_LENGTH);
-
-    for (auction = dbi_first(iter); dbi_exists(iter); auction = dbi_next(iter)) {
-        if ((type == 0 && auction->type != IT_ARMOR && auction->type != IT_PETARMOR) ||
-            (type == 1 && auction->type != IT_WEAPON) ||
-            (type == 2 && auction->type != IT_CARD) ||
-            (type == 3 && auction->type != IT_ETC) ||
-            (type == 4 && !strstr(auction->item_name, searchtext)) ||
-            (type == 5 && auction->price > price) ||
-            (type == 6 && auction->seller_id != char_id) ||
-            (type == 7 && auction->buyer_id != char_id))
-            continue;
-
-        i++;
-        if (i > 5) {
-            // Counting Pages of Total Results (5 Results per Page)
-            pages++;
-            i = 1; // First Result of This Page
-        }
-
-        if (page != pages)
-            continue; // This is not the requested Page
-
-        memcpy(WBUFP(buf, j * len), auction, len);
-        j++; // Found Results
-    }
-    dbi_destroy(iter);
-
-    mapif_Auction_sendlist(fd, char_id, j, pages, buf);
+	char searchtext[NAME_LENGTH];
+	int char_id = RFIFOL(fd,4), len = sizeof(struct auction_data);
+	int price = RFIFOL(fd,10);
+	short type = RFIFOW(fd,8), page = max(1,RFIFOW(fd,14));
+	unsigned char buf[5 * sizeof(struct auction_data)];
+	DBIterator *iter = db_iterator(auction_db_);
+	struct auction_data *auction;
+	short i = 0, j = 0, pages = 1;
+
+	memcpy(searchtext, RFIFOP(fd,16), NAME_LENGTH);
+
+	for( auction = dbi_first(iter); dbi_exists(iter); auction = dbi_next(iter) )
+	{
+		if( (type == 0 && auction->type != IT_ARMOR && auction->type != IT_PETARMOR) || 
+			(type == 1 && auction->type != IT_WEAPON) ||
+			(type == 2 && auction->type != IT_CARD) ||
+			(type == 3 && auction->type != IT_ETC) ||
+			(type == 4 && !strstr(auction->item_name, searchtext)) ||
+			(type == 5 && auction->price > price) ||
+			(type == 6 && auction->seller_id != char_id) ||
+			(type == 7 && auction->buyer_id != char_id) )
+			continue;
+
+		i++;
+		if( i > 5 )
+		{ // Counting Pages of Total Results (5 Results per Page)
+			pages++;
+			i = 1; // First Result of This Page
+		}
+
+		if( page != pages )
+			continue; // This is not the requested Page
+
+		memcpy(WBUFP(buf, j * len), auction, len);
+		j++; // Found Results
+	}
+	dbi_destroy(iter);
+
+	mapif_Auction_sendlist(fd, char_id, j, pages, buf);
 }
 
 static void mapif_Auction_register(int fd, struct auction_data *auction)
 {
-    int len = sizeof(struct auction_data) + 4;
+	int len = sizeof(struct auction_data) + 4;
 
-    WFIFOHEAD(fd,len);
-    WFIFOW(fd,0) = 0x3851;
-    WFIFOW(fd,2) = len;
-    memcpy(WFIFOP(fd,4), auction, sizeof(struct auction_data));
-    WFIFOSET(fd,len);
+	WFIFOHEAD(fd,len);
+	WFIFOW(fd,0) = 0x3851;
+	WFIFOW(fd,2) = len;
+	memcpy(WFIFOP(fd,4), auction, sizeof(struct auction_data));
+	WFIFOSET(fd,len);
 }
 
 static void mapif_parse_Auction_register(int fd)
 {
-    struct auction_data auction;
-    if (RFIFOW(fd,2) != sizeof(struct auction_data) + 4)
-        return;
+	struct auction_data auction;
+	if( RFIFOW(fd,2) != sizeof(struct auction_data) + 4 )
+		return;
 
-    memcpy(&auction, RFIFOP(fd,4), sizeof(struct auction_data));
-    if (auction_count(auction.seller_id, false) < 5)
-        auction.auction_id = auction_create(&auction);
+	memcpy(&auction, RFIFOP(fd,4), sizeof(struct auction_data));
+	if( auction_count(auction.seller_id, false) < 5 )
+		auction.auction_id = auction_create(&auction);
 
-    mapif_Auction_register(fd, &auction);
+	mapif_Auction_register(fd, &auction);
 }
 
 static void mapif_Auction_cancel(int fd, int char_id, unsigned char result)
 {
-    WFIFOHEAD(fd,7);
-    WFIFOW(fd,0) = 0x3852;
-    WFIFOL(fd,2) = char_id;
-    WFIFOB(fd,6) = result;
-    WFIFOSET(fd,7);
+	WFIFOHEAD(fd,7);
+	WFIFOW(fd,0) = 0x3852;
+	WFIFOL(fd,2) = char_id;
+	WFIFOB(fd,6) = result;
+	WFIFOSET(fd,7);
 }
 
 static void mapif_parse_Auction_cancel(int fd)
 {
-    int char_id = RFIFOL(fd,2), auction_id = RFIFOL(fd,6);
-    struct auction_data *auction;
-
-    if ((auction = (struct auction_data *)idb_get(auction_db_, auction_id)) == NULL) {
-        mapif_Auction_cancel(fd, char_id, 1); // Bid Number is Incorrect
-        return;
-    }
-
-    if (auction->seller_id != char_id) {
-        mapif_Auction_cancel(fd, char_id, 2); // You cannot end the auction
-        return;
-    }
-
-    if (auction->buyer_id > 0) {
-        mapif_Auction_cancel(fd, char_id, 3); // An auction with at least one bidder cannot be canceled
-        return;
-    }
-
-    mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "Auction canceled.", 0, &auction->item);
-    auction_delete(auction);
-
-    mapif_Auction_cancel(fd, char_id, 0); // The auction has been canceled
+	int char_id = RFIFOL(fd,2), auction_id = RFIFOL(fd,6);
+	struct auction_data *auction;
+
+	if( (auction = (struct auction_data *)idb_get(auction_db_, auction_id)) == NULL )
+	{
+		mapif_Auction_cancel(fd, char_id, 1); // Bid Number is Incorrect
+		return;
+	}
+
+	if( auction->seller_id != char_id )
+	{
+		mapif_Auction_cancel(fd, char_id, 2); // You cannot end the auction
+		return;
+	}
+
+	if( auction->buyer_id > 0 )
+	{
+		mapif_Auction_cancel(fd, char_id, 3); // An auction with at least one bidder cannot be canceled
+		return;
+	}
+
+	mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "Auction canceled.", 0, &auction->item);
+	auction_delete(auction);
+
+	mapif_Auction_cancel(fd, char_id, 0); // The auction has been canceled
 }
 
 static void mapif_Auction_close(int fd, int char_id, unsigned char result)
 {
-    WFIFOHEAD(fd,7);
-    WFIFOW(fd,0) = 0x3853;
-    WFIFOL(fd,2) = char_id;
-    WFIFOB(fd,6) = result;
-    WFIFOSET(fd,7);
+	WFIFOHEAD(fd,7);
+	WFIFOW(fd,0) = 0x3853;
+	WFIFOL(fd,2) = char_id;
+	WFIFOB(fd,6) = result;
+	WFIFOSET(fd,7);
 }
 
 static void mapif_parse_Auction_close(int fd)
 {
-    int char_id = RFIFOL(fd,2), auction_id = RFIFOL(fd,6);
-    struct auction_data *auction;
-
-    if ((auction = (struct auction_data *)idb_get(auction_db_, auction_id)) == NULL) {
-        mapif_Auction_close(fd, char_id, 2); // Bid Number is Incorrect
-        return;
-    }
-
-    if (auction->seller_id != char_id) {
-        mapif_Auction_close(fd, char_id, 1); // You cannot end the auction
-        return;
-    }
-
-    if (auction->buyer_id == 0) {
-        mapif_Auction_close(fd, char_id, 1); // You cannot end the auction
-        return;
-    }
-
-    // Send Money to Seller
-    mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "Auction closed.", auction->price, NULL);
-    // Send Item to Buyer
-    mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "Auction winner.", 0, &auction->item);
-    mapif_Auction_message(auction->buyer_id, 6); // You have won the auction
-    auction_delete(auction);
-
-    mapif_Auction_close(fd, char_id, 0); // You have ended the auction
+	int char_id = RFIFOL(fd,2), auction_id = RFIFOL(fd,6);
+	struct auction_data *auction;
+
+	if( (auction = (struct auction_data *)idb_get(auction_db_, auction_id)) == NULL )
+	{
+		mapif_Auction_close(fd, char_id, 2); // Bid Number is Incorrect
+		return;
+	}
+
+	if( auction->seller_id != char_id )
+	{
+		mapif_Auction_close(fd, char_id, 1); // You cannot end the auction
+		return;
+	}
+
+	if( auction->buyer_id == 0 )
+	{
+		mapif_Auction_close(fd, char_id, 1); // You cannot end the auction
+		return;
+	}
+
+	// Send Money to Seller
+	mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "Auction closed.", auction->price, NULL);
+	// Send Item to Buyer
+	mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "Auction winner.", 0, &auction->item);
+	mapif_Auction_message(auction->buyer_id, 6); // You have won the auction
+	auction_delete(auction);
+
+	mapif_Auction_close(fd, char_id, 0); // You have ended the auction
 }
 
 static void mapif_Auction_bid(int fd, int char_id, int bid, unsigned char result)
 {
-    WFIFOHEAD(fd,11);
-    WFIFOW(fd,0) = 0x3855;
-    WFIFOL(fd,2) = char_id;
-    WFIFOL(fd,6) = bid; // To Return Zeny
-    WFIFOB(fd,10) = result;
-    WFIFOSET(fd,11);
+	WFIFOHEAD(fd,11);
+	WFIFOW(fd,0) = 0x3855;
+	WFIFOL(fd,2) = char_id;
+	WFIFOL(fd,6) = bid; // To Return Zeny
+	WFIFOB(fd,10) = result;
+	WFIFOSET(fd,11);
 }
 
 static void mapif_parse_Auction_bid(int fd)
 {
-    int char_id = RFIFOL(fd,4), bid = RFIFOL(fd,12);
-    unsigned int auction_id = RFIFOL(fd,8);
-    struct auction_data *auction;
-
-    if ((auction = (struct auction_data *)idb_get(auction_db_, auction_id)) == NULL || auction->price >= bid || auction->seller_id == char_id) {
-        mapif_Auction_bid(fd, char_id, bid, 0); // You have failed to bid in the auction
-        return;
-    }
-
-    if (auction_count(char_id, true) > 4 && bid < auction->buynow && auction->buyer_id != char_id) {
-        mapif_Auction_bid(fd, char_id, bid, 9); // You cannot place more than 5 bids at a time
-        return;
-    }
-
-    if (auction->buyer_id > 0) {
-        // Send Money back to the previous Buyer
-        if (auction->buyer_id != char_id) {
-            mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "Someone has placed a higher bid.", auction->price, NULL);
-            mapif_Auction_message(auction->buyer_id, 7); // You have failed to win the auction
-        } else
-            mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "You have placed a higher bid.", auction->price, NULL);
-    }
-
-    auction->buyer_id = char_id;
-    safestrncpy(auction->buyer_name, (char *)RFIFOP(fd,16), NAME_LENGTH);
-    auction->price = bid;
-
-    if (bid >= auction->buynow) {
-        // Automatic won the auction
-        mapif_Auction_bid(fd, char_id, bid - auction->buynow, 1); // You have successfully bid in the auction
-
-        mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "You have won the auction.", 0, &auction->item);
-        mapif_Auction_message(char_id, 6); // You have won the auction
-        mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "Payment for your auction!.", auction->buynow, NULL);
-
-        auction_delete(auction);
-        return;
-    }
-
-    auction_save(auction);
-
-    mapif_Auction_bid(fd, char_id, 0, 1); // You have successfully bid in the auction
+	int char_id = RFIFOL(fd,4), bid = RFIFOL(fd,12);
+	unsigned int auction_id = RFIFOL(fd,8);
+	struct auction_data *auction;
+
+	if( (auction = (struct auction_data *)idb_get(auction_db_, auction_id)) == NULL || auction->price >= bid || auction->seller_id == char_id )
+	{
+		mapif_Auction_bid(fd, char_id, bid, 0); // You have failed to bid in the auction
+		return;
+	}
+
+	if( auction_count(char_id, true) > 4 && bid < auction->buynow && auction->buyer_id != char_id )
+	{
+		mapif_Auction_bid(fd, char_id, bid, 9); // You cannot place more than 5 bids at a time
+		return;
+	}
+
+	if( auction->buyer_id > 0 )
+	{ // Send Money back to the previous Buyer
+		if( auction->buyer_id != char_id )
+		{
+			mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "Someone has placed a higher bid.", auction->price, NULL);
+			mapif_Auction_message(auction->buyer_id, 7); // You have failed to win the auction
+		}
+		else
+			mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "You have placed a higher bid.", auction->price, NULL);
+	}
+
+	auction->buyer_id = char_id;
+	safestrncpy(auction->buyer_name, (char*)RFIFOP(fd,16), NAME_LENGTH);
+	auction->price = bid;
+
+	if( bid >= auction->buynow )
+	{ // Automatic won the auction
+		mapif_Auction_bid(fd, char_id, bid - auction->buynow, 1); // You have successfully bid in the auction
+
+		mail_sendmail(0, "Auction Manager", auction->buyer_id, auction->buyer_name, "Auction", "You have won the auction.", 0, &auction->item);
+		mapif_Auction_message(char_id, 6); // You have won the auction
+		mail_sendmail(0, "Auction Manager", auction->seller_id, auction->seller_name, "Auction", "Payment for your auction!.", auction->buynow, NULL);
+
+		auction_delete(auction);
+		return;
+	}
+
+	auction_save(auction);
+
+	mapif_Auction_bid(fd, char_id, 0, 1); // You have successfully bid in the auction
 }
 
 /*==========================================
@@ -454,39 +461,30 @@ static void mapif_parse_Auction_bid(int fd)
  *------------------------------------------*/
 int inter_auction_parse_frommap(int fd)
 {
-    switch (RFIFOW(fd,0)) {
-        case 0x3050:
-            mapif_parse_Auction_requestlist(fd);
-            break;
-        case 0x3051:
-            mapif_parse_Auction_register(fd);
-            break;
-        case 0x3052:
-            mapif_parse_Auction_cancel(fd);
-            break;
-        case 0x3053:
-            mapif_parse_Auction_close(fd);
-            break;
-        case 0x3055:
-            mapif_parse_Auction_bid(fd);
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+	switch(RFIFOW(fd,0))
+	{
+		case 0x3050: mapif_parse_Auction_requestlist(fd); break;
+		case 0x3051: mapif_parse_Auction_register(fd); break;
+		case 0x3052: mapif_parse_Auction_cancel(fd); break;
+		case 0x3053: mapif_parse_Auction_close(fd); break;
+		case 0x3055: mapif_parse_Auction_bid(fd); break;
+		default:
+			return 0;
+	}
+	return 1;
 }
 
 int inter_auction_sql_init(void)
 {
-    auction_db_ = idb_alloc(DB_OPT_RELEASE_DATA);
-    inter_auctions_fromsql();
+	auction_db_ = idb_alloc(DB_OPT_RELEASE_DATA);
+	inter_auctions_fromsql();
 
-    return 0;
+	return 0;
 }
 
 void inter_auction_sql_final(void)
 {
-    auction_db_->destroy(auction_db_,NULL);
+	auction_db_->destroy(auction_db_,NULL);
 
-    return;
+	return;
 }
diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c
index aa7ef5f65..7c76c4496 100644
--- a/src/char/int_elemental.c
+++ b/src/char/int_elemental.c
@@ -15,179 +15,147 @@
 #include <stdlib.h>
 #include <string.h>
 
-bool mapif_elemental_save(struct s_elemental *ele)
-{
-    bool flag = true;
-
-    if (ele->elemental_id == 0) {  // Create new DB entry
-        if (SQL_ERROR == Sql_Query(sql_handle,
-                                   "INSERT INTO `elemental` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`life_time`)"
-                                   "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%u')",
-                                   ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->str, ele->agi, ele->vit, ele->int_, ele->dex, ele->luk, ele->life_time)) {
-            Sql_ShowDebug(sql_handle);
-            flag = false;
-        } else
-            ele->elemental_id = (int)Sql_LastInsertId(sql_handle);
-    } else if (SQL_ERROR == Sql_Query(sql_handle,
-                                      "UPDATE `elemental` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d',"
-                                      "`max_hp` = '%d', `max_sp` = '%d', `str` = '%d', `agi` = '%d', `vit` = '%d', `int` = '%d', `dex` = '%d',"
-                                      "`luk` = '%d', `life_time` = '%u' WHERE `ele_id` = '%d'",
-                                      ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->str, ele->agi,
-                                      ele->vit, ele->int_, ele->dex, ele->luk, ele->life_time, ele->elemental_id)) {
-        // Update DB entry
-        Sql_ShowDebug(sql_handle);
-        flag = false;
-    }
-    return flag;
+bool mapif_elemental_save(struct s_elemental* ele) {
+	bool flag = true;
+	
+	if( ele->elemental_id == 0 ) { // Create new DB entry
+		if( SQL_ERROR == Sql_Query(sql_handle,
+								   "INSERT INTO `elemental` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`life_time`)"
+								   "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%u')",
+								   ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->str, ele->agi, ele->vit, ele->int_, ele->dex, ele->luk, ele->life_time) )
+		{
+			Sql_ShowDebug(sql_handle);
+			flag = false;
+		}
+		else
+			ele->elemental_id = (int)Sql_LastInsertId(sql_handle);
+	} else if( SQL_ERROR == Sql_Query(sql_handle,
+									"UPDATE `elemental` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d',"
+									"`max_hp` = '%d', `max_sp` = '%d', `str` = '%d', `agi` = '%d', `vit` = '%d', `int` = '%d', `dex` = '%d',"
+									"`luk` = '%d', `life_time` = '%u' WHERE `ele_id` = '%d'",
+									ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->str, ele->agi,
+									ele->vit, ele->int_, ele->dex, ele->luk, ele->life_time, ele->elemental_id) )
+	{ // Update DB entry
+		Sql_ShowDebug(sql_handle);
+		flag = false;
+	}
+	return flag;
 }
 
-bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele)
-{
-    char *data;
-
-    memset(ele, 0, sizeof(struct s_elemental));
-    ele->elemental_id = ele_id;
-    ele->char_id = char_id;
-
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `class`, `mode`, `hp`, `sp`, `max_hp`, `max_sp`, `str`, `agi`, `vit`, `int`, `dex`,"
-                               "`luk`, `life_time` FROM `elemental` WHERE `ele_id` = '%d' AND `char_id` = '%d'",
-                               ele_id, char_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
-
-    if (SQL_SUCCESS != Sql_NextRow(sql_handle)) {
-        Sql_FreeResult(sql_handle);
-        return false;
-    }
-
-    Sql_GetData(sql_handle,  0, &data, NULL);
-    ele->class_ = atoi(data);
-    Sql_GetData(sql_handle,  1, &data, NULL);
-    ele->mode = atoi(data);
-    Sql_GetData(sql_handle,  2, &data, NULL);
-    ele->hp = atoi(data);
-    Sql_GetData(sql_handle,  3, &data, NULL);
-    ele->sp = atoi(data);
-    Sql_GetData(sql_handle,  4, &data, NULL);
-    ele->max_hp = atoi(data);
-    Sql_GetData(sql_handle,  5, &data, NULL);
-    ele->max_sp = atoi(data);
-    Sql_GetData(sql_handle,  6, &data, NULL);
-    ele->str = atoi(data);
-    Sql_GetData(sql_handle,  7, &data, NULL);
-    ele->agi = atoi(data);
-    Sql_GetData(sql_handle,  8, &data, NULL);
-    ele->vit = atoi(data);
-    Sql_GetData(sql_handle,  9, &data, NULL);
-    ele->int_ = atoi(data);
-    Sql_GetData(sql_handle, 10, &data, NULL);
-    ele->dex = atoi(data);
-    Sql_GetData(sql_handle, 11, &data, NULL);
-    ele->luk = atoi(data);
-    Sql_GetData(sql_handle, 12, &data, NULL);
-    ele->life_time = atoi(data);
-    Sql_FreeResult(sql_handle);
-    if (save_log)
-        ShowInfo("Elemental loaded (%d - %d).\n", ele->elemental_id, ele->char_id);
-
-    return true;
+bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) {
+	char* data;
+	
+	memset(ele, 0, sizeof(struct s_elemental));
+	ele->elemental_id = ele_id;
+	ele->char_id = char_id;
+	
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `class`, `mode`, `hp`, `sp`, `max_hp`, `max_sp`, `str`, `agi`, `vit`, `int`, `dex`,"
+							   "`luk`, `life_time` FROM `elemental` WHERE `ele_id` = '%d' AND `char_id` = '%d'",
+							   ele_id, char_id) ) {
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+	
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) ) {
+		Sql_FreeResult(sql_handle);
+		return false;
+	}
+	
+	Sql_GetData(sql_handle,  0, &data, NULL); ele->class_ = atoi(data);
+	Sql_GetData(sql_handle,  1, &data, NULL); ele->mode = atoi(data);
+	Sql_GetData(sql_handle,  2, &data, NULL); ele->hp = atoi(data);
+	Sql_GetData(sql_handle,  3, &data, NULL); ele->sp = atoi(data);
+	Sql_GetData(sql_handle,  4, &data, NULL); ele->max_hp = atoi(data);
+	Sql_GetData(sql_handle,  5, &data, NULL); ele->max_sp = atoi(data);
+	Sql_GetData(sql_handle,  6, &data, NULL); ele->str = atoi(data);
+	Sql_GetData(sql_handle,  7, &data, NULL); ele->agi = atoi(data);
+	Sql_GetData(sql_handle,  8, &data, NULL); ele->vit = atoi(data);
+	Sql_GetData(sql_handle,  9, &data, NULL); ele->int_ = atoi(data);
+	Sql_GetData(sql_handle, 10, &data, NULL); ele->dex = atoi(data);
+	Sql_GetData(sql_handle, 11, &data, NULL); ele->luk = atoi(data);
+	Sql_GetData(sql_handle, 12, &data, NULL); ele->life_time = atoi(data);
+	Sql_FreeResult(sql_handle);
+	if( save_log )
+		ShowInfo("Elemental loaded (%d - %d).\n", ele->elemental_id, ele->char_id);
+	
+	return true;
 }
 
-bool mapif_elemental_delete(int ele_id)
-{
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `elemental` WHERE `ele_id` = '%d'", ele_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
-
-    return true;
+bool mapif_elemental_delete(int ele_id) {
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `elemental` WHERE `ele_id` = '%d'", ele_id) ) {
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+	
+	return true;
 }
 
-static void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag)
-{
-    int size = sizeof(struct s_elemental) + 5;
-
-    WFIFOHEAD(fd,size);
-    WFIFOW(fd,0) = 0x387c;
-    WFIFOW(fd,2) = size;
-    WFIFOB(fd,4) = flag;
-    memcpy(WFIFOP(fd,5),ele,sizeof(struct s_elemental));
-    WFIFOSET(fd,size);
+static void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag) {
+	int size = sizeof(struct s_elemental) + 5;
+	
+	WFIFOHEAD(fd,size);
+	WFIFOW(fd,0) = 0x387c;
+	WFIFOW(fd,2) = size;
+	WFIFOB(fd,4) = flag;
+	memcpy(WFIFOP(fd,5),ele,sizeof(struct s_elemental));
+	WFIFOSET(fd,size);
 }
 
-static void mapif_parse_elemental_create(int fd, struct s_elemental *ele)
-{
-    bool result = mapif_elemental_save(ele);
-    mapif_elemental_send(fd, ele, result);
+static void mapif_parse_elemental_create(int fd, struct s_elemental* ele) {
+	bool result = mapif_elemental_save(ele);
+	mapif_elemental_send(fd, ele, result);
 }
 
-static void mapif_parse_elemental_load(int fd, int ele_id, int char_id)
-{
-    struct s_elemental ele;
-    bool result = mapif_elemental_load(ele_id, char_id, &ele);
-    mapif_elemental_send(fd, &ele, result);
+static void mapif_parse_elemental_load(int fd, int ele_id, int char_id) {
+	struct s_elemental ele;
+	bool result = mapif_elemental_load(ele_id, char_id, &ele);
+	mapif_elemental_send(fd, &ele, result);
 }
 
-static void mapif_elemental_deleted(int fd, unsigned char flag)
-{
-    WFIFOHEAD(fd,3);
-    WFIFOW(fd,0) = 0x387d;
-    WFIFOB(fd,2) = flag;
-    WFIFOSET(fd,3);
+static void mapif_elemental_deleted(int fd, unsigned char flag) {
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x387d;
+	WFIFOB(fd,2) = flag;
+	WFIFOSET(fd,3);
 }
 
-static void mapif_parse_elemental_delete(int fd, int ele_id)
-{
-    bool result = mapif_elemental_delete(ele_id);
-    mapif_elemental_deleted(fd, result);
+static void mapif_parse_elemental_delete(int fd, int ele_id) {
+	bool result = mapif_elemental_delete(ele_id);
+	mapif_elemental_deleted(fd, result);
 }
 
-static void mapif_elemental_saved(int fd, unsigned char flag)
-{
-    WFIFOHEAD(fd,3);
-    WFIFOW(fd,0) = 0x387e;
-    WFIFOB(fd,2) = flag;
-    WFIFOSET(fd,3);
+static void mapif_elemental_saved(int fd, unsigned char flag) {
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x387e;
+	WFIFOB(fd,2) = flag;
+	WFIFOSET(fd,3);
 }
 
-static void mapif_parse_elemental_save(int fd, struct s_elemental *ele)
-{
-    bool result = mapif_elemental_save(ele);
-    mapif_elemental_saved(fd, result);
+static void mapif_parse_elemental_save(int fd, struct s_elemental* ele) {
+	bool result = mapif_elemental_save(ele);
+	mapif_elemental_saved(fd, result);
 }
 
-void inter_elemental_sql_init(void)
-{
-    return;
+void inter_elemental_sql_init(void) {
+	return;
 }
-void inter_elemental_sql_final(void)
-{
-    return;
+void inter_elemental_sql_final(void) {
+	return;
 }
 
 /*==========================================
  * Inter Packets
  *------------------------------------------*/
-int inter_elemental_parse_frommap(int fd)
-{
-    unsigned short cmd = RFIFOW(fd,0);
-
-    switch (cmd) {
-        case 0x307c:
-            mapif_parse_elemental_create(fd, (struct s_elemental *)RFIFOP(fd,4));
-            break;
-        case 0x307d:
-            mapif_parse_elemental_load(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6));
-            break;
-        case 0x307e:
-            mapif_parse_elemental_delete(fd, (int)RFIFOL(fd,2));
-            break;
-        case 0x307f:
-            mapif_parse_elemental_save(fd, (struct s_elemental *)RFIFOP(fd,4));
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+int inter_elemental_parse_frommap(int fd) {
+	unsigned short cmd = RFIFOW(fd,0);
+	
+	switch( cmd ) {
+		case 0x307c: mapif_parse_elemental_create(fd, (struct s_elemental*)RFIFOP(fd,4)); break;
+		case 0x307d: mapif_parse_elemental_load(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6)); break;
+		case 0x307e: mapif_parse_elemental_delete(fd, (int)RFIFOL(fd,2)); break;
+		case 0x307f: mapif_parse_elemental_save(fd, (struct s_elemental*)RFIFOP(fd,4)); break;
+		default:
+			return 0;
+	}
+	return 1;
 }
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 2b4a9f3ac..b07a1933f 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -31,7 +31,7 @@
 static const char dataToHex[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
 //Guild cache
-static DBMap *guild_db_; // int guild_id -> struct guild*
+static DBMap* guild_db_; // int guild_id -> struct guild*
 static DBMap *castle_db;
 
 static unsigned int guild_exp[100];
@@ -47,703 +47,703 @@ int inter_guild_tosql(struct guild *g,int flag);
 
 static int guild_save_timer(int tid, unsigned int tick, int id, intptr_t data)
 {
-    static int last_id = 0; //To know in which guild we were.
-    int state = 0; //0: Have not reached last guild. 1: Reached last guild, ready for save. 2: Some guild saved, don't do further saving.
-    DBIterator *iter = db_iterator(guild_db_);
-    DBKey key;
-    struct guild *g;
-
-    if (last_id == 0)  //Save the first guild in the list.
-        state = 1;
-
-    for (g = db_data2ptr(iter->first(iter, &key)); dbi_exists(iter); g = db_data2ptr(iter->next(iter, &key))) {
-        if (state == 0 && g->guild_id == last_id)
-            state++; //Save next guild in the list.
-        else if (state == 1 && g->save_flag&GS_MASK) {
-            inter_guild_tosql(g, g->save_flag&GS_MASK);
-            g->save_flag &= ~GS_MASK;
-
-            //Some guild saved.
-            last_id = g->guild_id;
-            state++;
-        }
-
-        if (g->save_flag == GS_REMOVE) {
-            // Nothing to save, guild is ready for removal.
-            if (save_log)
-                ShowInfo("Guild Unloaded (%d - %s)\n", g->guild_id, g->name);
-            db_remove(guild_db_, key);
-        }
-    }
-    dbi_destroy(iter);
-
-    if (state != 2)  //Reached the end of the guild db without saving.
-        last_id = 0; //Reset guild saved, return to beginning.
-
-    state = guild_db_->size(guild_db_);
-    if (state < 1) state = 1;  //Calculate the time slot for the next save.
-    add_timer(tick  + autosave_interval/state, guild_save_timer, 0, 0);
-    return 0;
+	static int last_id = 0; //To know in which guild we were.
+	int state = 0; //0: Have not reached last guild. 1: Reached last guild, ready for save. 2: Some guild saved, don't do further saving.
+	DBIterator *iter = db_iterator(guild_db_);
+	DBKey key;
+	struct guild* g;
+
+	if( last_id == 0 ) //Save the first guild in the list.
+		state = 1;
+
+	for( g = db_data2ptr(iter->first(iter, &key)); dbi_exists(iter); g = db_data2ptr(iter->next(iter, &key)) )
+	{
+		if( state == 0 && g->guild_id == last_id )
+			state++; //Save next guild in the list.
+		else
+		if( state == 1 && g->save_flag&GS_MASK )
+		{
+			inter_guild_tosql(g, g->save_flag&GS_MASK);
+			g->save_flag &= ~GS_MASK;
+
+			//Some guild saved.
+			last_id = g->guild_id;
+			state++;
+		}
+
+		if( g->save_flag == GS_REMOVE )
+		{// Nothing to save, guild is ready for removal.
+			if (save_log)
+				ShowInfo("Guild Unloaded (%d - %s)\n", g->guild_id, g->name);
+			db_remove(guild_db_, key);
+		}
+	}
+	dbi_destroy(iter);
+
+	if( state != 2 ) //Reached the end of the guild db without saving.
+		last_id = 0; //Reset guild saved, return to beginning.
+
+	state = guild_db_->size(guild_db_);
+	if( state < 1 ) state = 1; //Calculate the time slot for the next save.
+	add_timer(tick  + autosave_interval/state, guild_save_timer, 0, 0);
+	return 0;
 }
 
 int inter_guild_removemember_tosql(int account_id, int char_id)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE from `%s` where `account_id` = '%d' and `char_id` = '%d'", guild_member_db, account_id, char_id))
-        Sql_ShowDebug(sql_handle);
-    if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id` = '0' WHERE `char_id` = '%d'", char_db, char_id))
-        Sql_ShowDebug(sql_handle);
-    return 0;
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE from `%s` where `account_id` = '%d' and `char_id` = '%d'", guild_member_db, account_id, char_id) )
+		Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id` = '0' WHERE `char_id` = '%d'", char_db, char_id) )
+		Sql_ShowDebug(sql_handle);
+	return 0;
 }
 
 // Save guild into sql
 int inter_guild_tosql(struct guild *g,int flag)
 {
-    // Table guild (GS_BASIC_MASK)
-    // GS_EMBLEM `emblem_len`,`emblem_id`,`emblem_data`
-    // GS_CONNECT `connect_member`,`average_lv`
-    // GS_MES `mes1`,`mes2`
-    // GS_LEVEL `guild_lv`,`max_member`,`exp`,`next_exp`,`skill_point`
-    // GS_BASIC `name`,`master`,`char_id`
-
-    // GS_MEMBER `guild_member` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`name`)
-    // GS_POSITION `guild_position` (`guild_id`,`position`,`name`,`mode`,`exp_mode`)
-    // GS_ALLIANCE `guild_alliance` (`guild_id`,`opposition`,`alliance_id`,`name`)
-    // GS_EXPULSION `guild_expulsion` (`guild_id`,`account_id`,`name`,`mes`)
-    // GS_SKILL `guild_skill` (`guild_id`,`id`,`lv`)
-
-    // temporary storage for str convertion. They must be twice the size of the
-    // original string to ensure no overflows will occur. [Skotlex]
-    char t_info[256];
-    char esc_name[NAME_LENGTH*2+1];
-    char esc_master[NAME_LENGTH*2+1];
-    char new_guild = 0;
-    int i=0;
-
-    if (g->guild_id<=0 && g->guild_id != -1) return 0;
-
+	// Table guild (GS_BASIC_MASK)
+	// GS_EMBLEM `emblem_len`,`emblem_id`,`emblem_data`
+	// GS_CONNECT `connect_member`,`average_lv`
+	// GS_MES `mes1`,`mes2`
+	// GS_LEVEL `guild_lv`,`max_member`,`exp`,`next_exp`,`skill_point`
+	// GS_BASIC `name`,`master`,`char_id`
+
+	// GS_MEMBER `guild_member` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`name`)
+	// GS_POSITION `guild_position` (`guild_id`,`position`,`name`,`mode`,`exp_mode`)
+	// GS_ALLIANCE `guild_alliance` (`guild_id`,`opposition`,`alliance_id`,`name`)
+	// GS_EXPULSION `guild_expulsion` (`guild_id`,`account_id`,`name`,`mes`)
+	// GS_SKILL `guild_skill` (`guild_id`,`id`,`lv`) 
+
+	// temporary storage for str convertion. They must be twice the size of the
+	// original string to ensure no overflows will occur. [Skotlex]
+	char t_info[256];
+	char esc_name[NAME_LENGTH*2+1];
+	char esc_master[NAME_LENGTH*2+1];
+	char new_guild = 0;
+	int i=0;
+
+	if (g->guild_id<=0 && g->guild_id != -1) return 0;
+	
 #ifdef NOISY
-    ShowInfo("Save guild request ("CL_BOLD"%d"CL_RESET" - flag 0x%x).",g->guild_id, flag);
+	ShowInfo("Save guild request ("CL_BOLD"%d"CL_RESET" - flag 0x%x).",g->guild_id, flag);
 #endif
 
-    Sql_EscapeStringLen(sql_handle, esc_name, g->name, strnlen(g->name, NAME_LENGTH));
-    Sql_EscapeStringLen(sql_handle, esc_master, g->master, strnlen(g->master, NAME_LENGTH));
-    *t_info = '\0';
-
-    // Insert a new guild the guild
-    if (flag&GS_BASIC && g->guild_id == -1) {
-        strcat(t_info, " guild_create");
-
-        // Create a new guild
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
-                                   "(`name`,`master`,`guild_lv`,`max_member`,`average_lv`,`char_id`) "
-                                   "VALUES ('%s', '%s', '%d', '%d', '%d', '%d')",
-                                   guild_db, esc_name, esc_master, g->guild_lv, g->max_member, g->average_lv, g->member[0].char_id)) {
-            Sql_ShowDebug(sql_handle);
-            if (g->guild_id == -1)
-                return 0; //Failed to create guild!
-        } else {
-            g->guild_id = (int)Sql_LastInsertId(sql_handle);
-            new_guild = 1;
-        }
-    }
-
-    // If we need an update on an existing guild or more update on the new guild
-    if (((flag & GS_BASIC_MASK) && !new_guild) || ((flag & (GS_BASIC_MASK & ~GS_BASIC)) && new_guild)) {
-        StringBuf buf;
-        bool add_comma = false;
-
-        StringBuf_Init(&buf);
-        StringBuf_Printf(&buf, "UPDATE `%s` SET ", guild_db);
-
-        if (flag & GS_EMBLEM) {
-            char emblem_data[sizeof(g->emblem_data)*2+1];
-            char *pData = emblem_data;
-
-            strcat(t_info, " emblem");
-            // Convert emblem_data to hex
-            //TODO: why not use binary directly? [ultramage]
-            for (i=0; i<g->emblem_len; i++) {
-                *pData++ = dataToHex[(g->emblem_data[i] >> 4) & 0x0F];
-                *pData++ = dataToHex[g->emblem_data[i] & 0x0F];
-            }
-            *pData = 0;
-            StringBuf_Printf(&buf, "`emblem_len`=%d, `emblem_id`=%d, `emblem_data`='%s'", g->emblem_len, g->emblem_id, emblem_data);
-            add_comma = true;
-        }
-        if (flag & GS_BASIC) {
-            strcat(t_info, " basic");
-            if (add_comma)
-                StringBuf_AppendStr(&buf, ", ");
-            else
-                add_comma = true;
-            StringBuf_Printf(&buf, "`name`='%s', `master`='%s', `char_id`=%d", esc_name, esc_master, g->member[0].char_id);
-        }
-        if (flag & GS_CONNECT) {
-            strcat(t_info, " connect");
-            if (add_comma)
-                StringBuf_AppendStr(&buf, ", ");
-            else
-                add_comma = true;
-            StringBuf_Printf(&buf, "`connect_member`=%d, `average_lv`=%d", g->connect_member, g->average_lv);
-        }
-        if (flag & GS_MES) {
-            char esc_mes1[sizeof(g->mes1)*2+1];
-            char esc_mes2[sizeof(g->mes2)*2+1];
-
-            strcat(t_info, " mes");
-            if (add_comma)
-                StringBuf_AppendStr(&buf, ", ");
-            else
-                add_comma = true;
-            Sql_EscapeStringLen(sql_handle, esc_mes1, g->mes1, strnlen(g->mes1, sizeof(g->mes1)));
-            Sql_EscapeStringLen(sql_handle, esc_mes2, g->mes2, strnlen(g->mes2, sizeof(g->mes2)));
-            StringBuf_Printf(&buf, "`mes1`='%s', `mes2`='%s'", esc_mes1, esc_mes2);
-        }
-        if (flag & GS_LEVEL) {
-            strcat(t_info, " level");
-            if (add_comma)
-                StringBuf_AppendStr(&buf, ", ");
-            else
-                add_comma = true;
-            StringBuf_Printf(&buf, "`guild_lv`=%d, `skill_point`=%d, `exp`=%"PRIu64", `next_exp`=%u, `max_member`=%d", g->guild_lv, g->skill_point, g->exp, g->next_exp, g->max_member);
-        }
-        StringBuf_Printf(&buf, " WHERE `guild_id`=%d", g->guild_id);
-        if (SQL_ERROR == Sql_Query(sql_handle, "%s", StringBuf_Value(&buf)))
-            Sql_ShowDebug(sql_handle);
-        StringBuf_Destroy(&buf);
-    }
-
-    if (flag&GS_MEMBER) {
-        struct guild_member *m;
-
-        strcat(t_info, " members");
-        // Update only needed players
-        for (i=0; i<g->max_member; i++) {
-            m = &g->member[i];
-            if (!m->modified)
-                continue;
-            if (m->account_id) {
-                //Since nothing references guild member table as foreign keys, it's safe to use REPLACE INTO
-                Sql_EscapeStringLen(sql_handle, esc_name, m->name, strnlen(m->name, NAME_LENGTH));
-                if (SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`name`) "
-                                           "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%"PRIu64"','%d','%d','%d','%s')",
-                                           guild_member_db, g->guild_id, m->account_id, m->char_id,
-                                           m->hair, m->hair_color, m->gender,
-                                           m->class_, m->lv, m->exp, m->exp_payper, m->online, m->position, esc_name))
-                    Sql_ShowDebug(sql_handle);
-                if (m->modified & GS_MEMBER_NEW) {
-                    if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id` = '%d' WHERE `char_id` = '%d'",
-                                               char_db, g->guild_id, m->char_id))
-                        Sql_ShowDebug(sql_handle);
-                }
-                m->modified = GS_MEMBER_UNMODIFIED;
-            }
-        }
-    }
-
-    if (flag&GS_POSITION) {
-        strcat(t_info, " positions");
-        //printf("- Insert guild %d to guild_position\n",g->guild_id);
-        for (i=0; i<MAX_GUILDPOSITION; i++) {
-            struct guild_position *p = &g->position[i];
-            if (!p->modified)
-                continue;
-            Sql_EscapeStringLen(sql_handle, esc_name, p->name, strnlen(p->name, NAME_LENGTH));
-            if (SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`position`,`name`,`mode`,`exp_mode`) VALUES ('%d','%d','%s','%d','%d')",
-                                       guild_position_db, g->guild_id, i, esc_name, p->mode, p->exp_mode))
-                Sql_ShowDebug(sql_handle);
-            p->modified = GS_POSITION_UNMODIFIED;
-        }
-    }
-
-    if (flag&GS_ALLIANCE) {
-        // Delete current alliances
-        // NOTE: no need to do it on both sides since both guilds in memory had
-        // their info changed, not to mention this would also mess up oppositions!
-        // [Skotlex]
-        //if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id`='%d' OR `alliance_id`='%d'", guild_alliance_db, g->guild_id, g->guild_id) )
-        if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id`='%d'", guild_alliance_db, g->guild_id)) {
-            Sql_ShowDebug(sql_handle);
-        } else {
-            //printf("- Insert guild %d to guild_alliance\n",g->guild_id);
-            for (i=0; i<MAX_GUILDALLIANCE; i++) {
-                struct guild_alliance *a=&g->alliance[i];
-                if (a->guild_id>0) {
-                    Sql_EscapeStringLen(sql_handle, esc_name, a->name, strnlen(a->name, NAME_LENGTH));
-                    if (SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`opposition`,`alliance_id`,`name`) "
-                                               "VALUES ('%d','%d','%d','%s')",
-                                               guild_alliance_db, g->guild_id, a->opposition, a->guild_id, esc_name))
-                        Sql_ShowDebug(sql_handle);
-                }
-            }
-        }
-    }
-
-    if (flag&GS_EXPULSION) {
-        strcat(t_info, " expulsions");
-        //printf("- Insert guild %d to guild_expulsion\n",g->guild_id);
-        for (i=0; i<MAX_GUILDEXPULSION; i++) {
-            struct guild_expulsion *e=&g->expulsion[i];
-            if (e->account_id>0) {
-                char esc_mes[sizeof(e->mes)*2+1];
-
-                Sql_EscapeStringLen(sql_handle, esc_name, e->name, strnlen(e->name, NAME_LENGTH));
-                Sql_EscapeStringLen(sql_handle, esc_mes, e->mes, strnlen(e->mes, sizeof(e->mes)));
-                if (SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`account_id`,`name`,`mes`) "
-                                           "VALUES ('%d','%d','%s','%s')", guild_expulsion_db, g->guild_id, e->account_id, esc_name, esc_mes))
-                    Sql_ShowDebug(sql_handle);
-            }
-        }
-    }
-
-    if (flag&GS_SKILL) {
-        strcat(t_info, " skills");
-        //printf("- Insert guild %d to guild_skill\n",g->guild_id);
-        for (i=0; i<MAX_GUILDSKILL; i++) {
-            if (g->skill[i].id>0 && g->skill[i].lv>0) {
-                if (SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`id`,`lv`) VALUES ('%d','%d','%d')",
-                                           guild_skill_db, g->guild_id, g->skill[i].id, g->skill[i].lv))
-                    Sql_ShowDebug(sql_handle);
-            }
-        }
-    }
-
-    if (save_log)
-        ShowInfo("Saved guild (%d - %s):%s\n",g->guild_id,g->name,t_info);
-    return 1;
+	Sql_EscapeStringLen(sql_handle, esc_name, g->name, strnlen(g->name, NAME_LENGTH));
+	Sql_EscapeStringLen(sql_handle, esc_master, g->master, strnlen(g->master, NAME_LENGTH));
+	*t_info = '\0';
+
+	// Insert a new guild the guild
+	if (flag&GS_BASIC && g->guild_id == -1)
+	{
+		strcat(t_info, " guild_create");
+
+		// Create a new guild
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
+			"(`name`,`master`,`guild_lv`,`max_member`,`average_lv`,`char_id`) "
+			"VALUES ('%s', '%s', '%d', '%d', '%d', '%d')",
+			guild_db, esc_name, esc_master, g->guild_lv, g->max_member, g->average_lv, g->member[0].char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			if (g->guild_id == -1)
+				return 0; //Failed to create guild!
+		}
+		else
+		{
+			g->guild_id = (int)Sql_LastInsertId(sql_handle);
+			new_guild = 1;
+		}
+	}
+
+	// If we need an update on an existing guild or more update on the new guild
+	if (((flag & GS_BASIC_MASK) && !new_guild) || ((flag & (GS_BASIC_MASK & ~GS_BASIC)) && new_guild))
+	{
+		StringBuf buf;
+		bool add_comma = false;
+
+		StringBuf_Init(&buf);
+		StringBuf_Printf(&buf, "UPDATE `%s` SET ", guild_db);
+
+		if (flag & GS_EMBLEM)
+		{
+			char emblem_data[sizeof(g->emblem_data)*2+1];
+			char* pData = emblem_data;
+
+			strcat(t_info, " emblem");
+			// Convert emblem_data to hex
+			//TODO: why not use binary directly? [ultramage]
+			for(i=0; i<g->emblem_len; i++){
+				*pData++ = dataToHex[(g->emblem_data[i] >> 4) & 0x0F];
+				*pData++ = dataToHex[g->emblem_data[i] & 0x0F];
+			}
+			*pData = 0;
+			StringBuf_Printf(&buf, "`emblem_len`=%d, `emblem_id`=%d, `emblem_data`='%s'", g->emblem_len, g->emblem_id, emblem_data);
+			add_comma = true;
+		}
+		if (flag & GS_BASIC) 
+		{
+			strcat(t_info, " basic");
+			if( add_comma )
+				StringBuf_AppendStr(&buf, ", ");
+			else
+				add_comma = true;
+			StringBuf_Printf(&buf, "`name`='%s', `master`='%s', `char_id`=%d", esc_name, esc_master, g->member[0].char_id);
+		}
+		if (flag & GS_CONNECT)
+		{
+			strcat(t_info, " connect");
+			if( add_comma )
+				StringBuf_AppendStr(&buf, ", ");
+			else
+				add_comma = true;
+			StringBuf_Printf(&buf, "`connect_member`=%d, `average_lv`=%d", g->connect_member, g->average_lv);
+		}
+		if (flag & GS_MES)
+		{
+			char esc_mes1[sizeof(g->mes1)*2+1];
+			char esc_mes2[sizeof(g->mes2)*2+1];
+
+			strcat(t_info, " mes");
+			if( add_comma )
+				StringBuf_AppendStr(&buf, ", ");
+			else
+				add_comma = true;
+			Sql_EscapeStringLen(sql_handle, esc_mes1, g->mes1, strnlen(g->mes1, sizeof(g->mes1)));
+			Sql_EscapeStringLen(sql_handle, esc_mes2, g->mes2, strnlen(g->mes2, sizeof(g->mes2)));
+			StringBuf_Printf(&buf, "`mes1`='%s', `mes2`='%s'", esc_mes1, esc_mes2);
+		}
+		if (flag & GS_LEVEL)
+		{
+			strcat(t_info, " level");
+			if( add_comma )
+				StringBuf_AppendStr(&buf, ", ");
+			else
+				add_comma = true;
+			StringBuf_Printf(&buf, "`guild_lv`=%d, `skill_point`=%d, `exp`=%"PRIu64", `next_exp`=%u, `max_member`=%d", g->guild_lv, g->skill_point, g->exp, g->next_exp, g->max_member);
+		}
+		StringBuf_Printf(&buf, " WHERE `guild_id`=%d", g->guild_id);
+		if( SQL_ERROR == Sql_Query(sql_handle, "%s", StringBuf_Value(&buf)) )
+			Sql_ShowDebug(sql_handle);
+		StringBuf_Destroy(&buf);
+	}
+
+	if (flag&GS_MEMBER)
+	{
+		struct guild_member *m;
+
+		strcat(t_info, " members");
+		// Update only needed players
+		for(i=0;i<g->max_member;i++){
+			m = &g->member[i];
+			if (!m->modified)
+				continue;
+			if(m->account_id) {
+				//Since nothing references guild member table as foreign keys, it's safe to use REPLACE INTO
+				Sql_EscapeStringLen(sql_handle, esc_name, m->name, strnlen(m->name, NAME_LENGTH));
+				if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`name`) "
+					"VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%"PRIu64"','%d','%d','%d','%s')",
+					guild_member_db, g->guild_id, m->account_id, m->char_id,
+					m->hair, m->hair_color, m->gender,
+					m->class_, m->lv, m->exp, m->exp_payper, m->online, m->position, esc_name) )
+					Sql_ShowDebug(sql_handle);
+				if (m->modified & GS_MEMBER_NEW)
+				{
+					if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id` = '%d' WHERE `char_id` = '%d'",
+						char_db, g->guild_id, m->char_id) )
+						Sql_ShowDebug(sql_handle);
+				}
+				m->modified = GS_MEMBER_UNMODIFIED;
+			}
+		}
+	}
+
+	if (flag&GS_POSITION){
+		strcat(t_info, " positions");
+		//printf("- Insert guild %d to guild_position\n",g->guild_id);
+		for(i=0;i<MAX_GUILDPOSITION;i++){
+			struct guild_position *p = &g->position[i];
+			if (!p->modified)
+				continue;
+			Sql_EscapeStringLen(sql_handle, esc_name, p->name, strnlen(p->name, NAME_LENGTH));
+			if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`position`,`name`,`mode`,`exp_mode`) VALUES ('%d','%d','%s','%d','%d')",
+				guild_position_db, g->guild_id, i, esc_name, p->mode, p->exp_mode) )
+				Sql_ShowDebug(sql_handle);
+			p->modified = GS_POSITION_UNMODIFIED;
+		}
+	}
+
+	if (flag&GS_ALLIANCE)
+	{
+		// Delete current alliances 
+		// NOTE: no need to do it on both sides since both guilds in memory had 
+		// their info changed, not to mention this would also mess up oppositions!
+		// [Skotlex]
+		//if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id`='%d' OR `alliance_id`='%d'", guild_alliance_db, g->guild_id, g->guild_id) )
+		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id`='%d'", guild_alliance_db, g->guild_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+		}
+		else
+		{
+			//printf("- Insert guild %d to guild_alliance\n",g->guild_id);
+			for(i=0;i<MAX_GUILDALLIANCE;i++)
+			{
+				struct guild_alliance *a=&g->alliance[i];
+				if(a->guild_id>0)
+				{
+					Sql_EscapeStringLen(sql_handle, esc_name, a->name, strnlen(a->name, NAME_LENGTH));
+					if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`opposition`,`alliance_id`,`name`) "
+						"VALUES ('%d','%d','%d','%s')",
+						guild_alliance_db, g->guild_id, a->opposition, a->guild_id, esc_name) )
+						Sql_ShowDebug(sql_handle);
+				}
+			}
+		}
+	}
+
+	if (flag&GS_EXPULSION){
+		strcat(t_info, " expulsions");
+		//printf("- Insert guild %d to guild_expulsion\n",g->guild_id);
+		for(i=0;i<MAX_GUILDEXPULSION;i++){
+			struct guild_expulsion *e=&g->expulsion[i];
+			if(e->account_id>0){
+				char esc_mes[sizeof(e->mes)*2+1];
+
+				Sql_EscapeStringLen(sql_handle, esc_name, e->name, strnlen(e->name, NAME_LENGTH));
+				Sql_EscapeStringLen(sql_handle, esc_mes, e->mes, strnlen(e->mes, sizeof(e->mes)));
+				if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`account_id`,`name`,`mes`) "
+					"VALUES ('%d','%d','%s','%s')", guild_expulsion_db, g->guild_id, e->account_id, esc_name, esc_mes) )
+					Sql_ShowDebug(sql_handle);
+			}
+		}
+	}
+
+	if (flag&GS_SKILL){
+		strcat(t_info, " skills");
+		//printf("- Insert guild %d to guild_skill\n",g->guild_id);
+		for(i=0;i<MAX_GUILDSKILL;i++){
+			if (g->skill[i].id>0 && g->skill[i].lv>0){
+				if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`guild_id`,`id`,`lv`) VALUES ('%d','%d','%d')",
+					guild_skill_db, g->guild_id, g->skill[i].id, g->skill[i].lv) )
+					Sql_ShowDebug(sql_handle);
+			}
+		}
+	}
+
+	if (save_log)
+		ShowInfo("Saved guild (%d - %s):%s\n",g->guild_id,g->name,t_info);
+	return 1;
 }
 
 // Read guild from sql
-struct guild *inter_guild_fromsql(int guild_id) {
-    struct guild *g;
-    char *data;
-    size_t len;
-    char *p;
-    int i;
+struct guild * inter_guild_fromsql(int guild_id)
+{
+	struct guild *g;
+	char* data;
+	size_t len;
+	char* p;
+	int i;
 
-    if (guild_id <= 0)
-        return NULL;
+	if( guild_id <= 0 )
+		return NULL;
 
-    g = (struct guild *)idb_get(guild_db_, guild_id);
-    if (g)
-        return g;
+	g = (struct guild*)idb_get(guild_db_, guild_id);
+	if( g )
+		return g;
 
 #ifdef NOISY
-    ShowInfo("Guild load request (%d)...\n", guild_id);
+	ShowInfo("Guild load request (%d)...\n", guild_id);
 #endif
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT g.`name`,c.`name`,g.`guild_lv`,g.`connect_member`,g.`max_member`,g.`average_lv`,g.`exp`,g.`next_exp`,g.`skill_point`,g.`mes1`,g.`mes2`,g.`emblem_len`,g.`emblem_id`,g.`emblem_data` "
-                               "FROM `%s` g LEFT JOIN `%s` c ON c.`char_id` = g.`char_id` WHERE g.`guild_id`='%d'", guild_db, char_db, guild_id)) {
-        Sql_ShowDebug(sql_handle);
-        return NULL;
-    }
-
-    if (SQL_SUCCESS != Sql_NextRow(sql_handle))
-        return NULL;// Guild does not exists.
-
-    CREATE(g, struct guild, 1);
-
-    g->guild_id = guild_id;
-    Sql_GetData(sql_handle,  0, &data, &len);
-    memcpy(g->name, data, min(len, NAME_LENGTH));
-    Sql_GetData(sql_handle,  1, &data, &len);
-    memcpy(g->master, data, min(len, NAME_LENGTH));
-    Sql_GetData(sql_handle,  2, &data, NULL);
-    g->guild_lv = atoi(data);
-    Sql_GetData(sql_handle,  3, &data, NULL);
-    g->connect_member = atoi(data);
-    Sql_GetData(sql_handle,  4, &data, NULL);
-    g->max_member = atoi(data);
-    if (g->max_member > MAX_GUILD) {
-        // Fix reduction of MAX_GUILD [PoW]
-        ShowWarning("Guild %d:%s specifies higher capacity (%d) than MAX_GUILD (%d)\n", guild_id, g->name, g->max_member, MAX_GUILD);
-        g->max_member = MAX_GUILD;
-    }
-    Sql_GetData(sql_handle,  5, &data, NULL);
-    g->average_lv = atoi(data);
-    Sql_GetData(sql_handle,  6, &data, NULL);
-    g->exp = strtoull(data, NULL, 10);
-    Sql_GetData(sql_handle,  7, &data, NULL);
-    g->next_exp = (unsigned int)strtoul(data, NULL, 10);
-    Sql_GetData(sql_handle,  8, &data, NULL);
-    g->skill_point = atoi(data);
-    Sql_GetData(sql_handle,  9, &data, &len);
-    memcpy(g->mes1, data, min(len, sizeof(g->mes1)));
-    Sql_GetData(sql_handle, 10, &data, &len);
-    memcpy(g->mes2, data, min(len, sizeof(g->mes2)));
-    Sql_GetData(sql_handle, 11, &data, &len);
-    g->emblem_len = atoi(data);
-    Sql_GetData(sql_handle, 12, &data, &len);
-    g->emblem_id = atoi(data);
-    Sql_GetData(sql_handle, 13, &data, &len);
-    // convert emblem data from hexadecimal to binary
-    //TODO: why not store it in the db as binary directly? [ultramage]
-    for (i = 0, p = g->emblem_data; i < g->emblem_len; ++i, ++p) {
-        if (*data >= '0' && *data <= '9')
-            *p = *data - '0';
-        else if (*data >= 'a' && *data <= 'f')
-            *p = *data - 'a' + 10;
-        else if (*data >= 'A' && *data <= 'F')
-            *p = *data - 'A' + 10;
-        *p <<= 4;
-        ++data;
-
-        if (*data >= '0' && *data <= '9')
-            *p |= *data - '0';
-        else if (*data >= 'a' && *data <= 'f')
-            *p |= *data - 'a' + 10;
-        else if (*data >= 'A' && *data <= 'F')
-            *p |= *data - 'A' + 10;
-        ++data;
-    }
-
-    // load guild member info
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`name` "
-                               "FROM `%s` WHERE `guild_id`='%d' ORDER BY `position`", guild_member_db, guild_id)) {
-        Sql_ShowDebug(sql_handle);
-        aFree(g);
-        return NULL;
-    }
-    for (i = 0; i < g->max_member && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i) {
-        struct guild_member *m = &g->member[i];
-
-        Sql_GetData(sql_handle,  0, &data, NULL);
-        m->account_id = atoi(data);
-        Sql_GetData(sql_handle,  1, &data, NULL);
-        m->char_id = atoi(data);
-        Sql_GetData(sql_handle,  2, &data, NULL);
-        m->hair = atoi(data);
-        Sql_GetData(sql_handle,  3, &data, NULL);
-        m->hair_color = atoi(data);
-        Sql_GetData(sql_handle,  4, &data, NULL);
-        m->gender = atoi(data);
-        Sql_GetData(sql_handle,  5, &data, NULL);
-        m->class_ = atoi(data);
-        Sql_GetData(sql_handle,  6, &data, NULL);
-        m->lv = atoi(data);
-        Sql_GetData(sql_handle,  7, &data, NULL);
-        m->exp = strtoull(data, NULL, 10);
-        Sql_GetData(sql_handle,  8, &data, NULL);
-        m->exp_payper = (unsigned int)atoi(data);
-        Sql_GetData(sql_handle,  9, &data, NULL);
-        m->online = atoi(data);
-        Sql_GetData(sql_handle, 10, &data, NULL);
-        m->position = atoi(data);
-        if (m->position >= MAX_GUILDPOSITION)  // Fix reduction of MAX_GUILDPOSITION [PoW]
-            m->position = MAX_GUILDPOSITION - 1;
-        Sql_GetData(sql_handle, 11, &data, &len);
-        memcpy(m->name, data, min(len, NAME_LENGTH));
-        m->modified = GS_MEMBER_UNMODIFIED;
-    }
-
-    //printf("- Read guild_position %d from sql \n",guild_id);
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `position`,`name`,`mode`,`exp_mode` FROM `%s` WHERE `guild_id`='%d'", guild_position_db, guild_id)) {
-        Sql_ShowDebug(sql_handle);
-        aFree(g);
-        return NULL;
-    }
-    while (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        int position;
-        struct guild_position *p;
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        position = atoi(data);
-        if (position < 0 || position >= MAX_GUILDPOSITION)
-            continue;// invalid position
-        p = &g->position[position];
-        Sql_GetData(sql_handle, 1, &data, &len);
-        memcpy(p->name, data, min(len, NAME_LENGTH));
-        Sql_GetData(sql_handle, 2, &data, NULL);
-        p->mode = atoi(data);
-        Sql_GetData(sql_handle, 3, &data, NULL);
-        p->exp_mode = atoi(data);
-        p->modified = GS_POSITION_UNMODIFIED;
-    }
-
-    //printf("- Read guild_alliance %d from sql \n",guild_id);
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `opposition`,`alliance_id`,`name` FROM `%s` WHERE `guild_id`='%d'", guild_alliance_db, guild_id)) {
-        Sql_ShowDebug(sql_handle);
-        aFree(g);
-        return NULL;
-    }
-    for (i = 0; i < MAX_GUILDALLIANCE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i) {
-        struct guild_alliance *a = &g->alliance[i];
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        a->opposition = atoi(data);
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        a->guild_id = atoi(data);
-        Sql_GetData(sql_handle, 2, &data, &len);
-        memcpy(a->name, data, min(len, NAME_LENGTH));
-    }
-
-    //printf("- Read guild_expulsion %d from sql \n",guild_id);
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`name`,`mes` FROM `%s` WHERE `guild_id`='%d'", guild_expulsion_db, guild_id)) {
-        Sql_ShowDebug(sql_handle);
-        aFree(g);
-        return NULL;
-    }
-    for (i = 0; i < MAX_GUILDEXPULSION && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i) {
-        struct guild_expulsion *e = &g->expulsion[i];
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        e->account_id = atoi(data);
-        Sql_GetData(sql_handle, 1, &data, &len);
-        memcpy(e->name, data, min(len, NAME_LENGTH));
-        Sql_GetData(sql_handle, 2, &data, &len);
-        memcpy(e->mes, data, min(len, sizeof(e->mes)));
-    }
-
-    //printf("- Read guild_skill %d from sql \n",guild_id);
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `id`,`lv` FROM `%s` WHERE `guild_id`='%d' ORDER BY `id`", guild_skill_db, guild_id)) {
-        Sql_ShowDebug(sql_handle);
-        aFree(g);
-        return NULL;
-    }
-
-    for (i = 0; i < MAX_GUILDSKILL; i++) {
-        //Skill IDs must always be initialized. [Skotlex]
-        g->skill[i].id = i + GD_SKILLBASE;
-    }
-
-    while (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        int id;
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        id = atoi(data) - GD_SKILLBASE;
-        if (id < 0 && id >= MAX_GUILDSKILL)
-            continue;// invalid guild skill
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        g->skill[id].lv = atoi(data);
-    }
-    Sql_FreeResult(sql_handle);
-
-    idb_put(guild_db_, guild_id, g); //Add to cache
-    g->save_flag |= GS_REMOVE; //But set it to be removed, in case it is not needed for long.
-
-    if (save_log)
-        ShowInfo("Guild loaded (%d - %s)\n", guild_id, g->name);
-
-    return g;
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT g.`name`,c.`name`,g.`guild_lv`,g.`connect_member`,g.`max_member`,g.`average_lv`,g.`exp`,g.`next_exp`,g.`skill_point`,g.`mes1`,g.`mes2`,g.`emblem_len`,g.`emblem_id`,g.`emblem_data` "
+		"FROM `%s` g LEFT JOIN `%s` c ON c.`char_id` = g.`char_id` WHERE g.`guild_id`='%d'", guild_db, char_db, guild_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return NULL;
+	}
+
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+		return NULL;// Guild does not exists.
+
+	CREATE(g, struct guild, 1);
+
+	g->guild_id = guild_id;
+	Sql_GetData(sql_handle,  0, &data, &len); memcpy(g->name, data, min(len, NAME_LENGTH));
+	Sql_GetData(sql_handle,  1, &data, &len); memcpy(g->master, data, min(len, NAME_LENGTH));
+	Sql_GetData(sql_handle,  2, &data, NULL); g->guild_lv = atoi(data);
+	Sql_GetData(sql_handle,  3, &data, NULL); g->connect_member = atoi(data);
+	Sql_GetData(sql_handle,  4, &data, NULL); g->max_member = atoi(data);
+	if( g->max_member > MAX_GUILD )
+	{	// Fix reduction of MAX_GUILD [PoW]
+		ShowWarning("Guild %d:%s specifies higher capacity (%d) than MAX_GUILD (%d)\n", guild_id, g->name, g->max_member, MAX_GUILD);
+		g->max_member = MAX_GUILD;
+	}
+	Sql_GetData(sql_handle,  5, &data, NULL); g->average_lv = atoi(data);
+	Sql_GetData(sql_handle,  6, &data, NULL); g->exp = strtoull(data, NULL, 10);
+	Sql_GetData(sql_handle,  7, &data, NULL); g->next_exp = (unsigned int)strtoul(data, NULL, 10);
+	Sql_GetData(sql_handle,  8, &data, NULL); g->skill_point = atoi(data);
+	Sql_GetData(sql_handle,  9, &data, &len); memcpy(g->mes1, data, min(len, sizeof(g->mes1)));
+	Sql_GetData(sql_handle, 10, &data, &len); memcpy(g->mes2, data, min(len, sizeof(g->mes2)));
+	Sql_GetData(sql_handle, 11, &data, &len); g->emblem_len = atoi(data);
+	Sql_GetData(sql_handle, 12, &data, &len); g->emblem_id = atoi(data);
+	Sql_GetData(sql_handle, 13, &data, &len);
+	// convert emblem data from hexadecimal to binary
+	//TODO: why not store it in the db as binary directly? [ultramage]
+	for( i = 0, p = g->emblem_data; i < g->emblem_len; ++i, ++p )
+	{
+		if( *data >= '0' && *data <= '9' )
+			*p = *data - '0';
+		else if( *data >= 'a' && *data <= 'f' )
+			*p = *data - 'a' + 10;
+		else if( *data >= 'A' && *data <= 'F' )
+			*p = *data - 'A' + 10;
+		*p <<= 4;
+		++data;
+
+		if( *data >= '0' && *data <= '9' )
+			*p |= *data - '0';
+		else if( *data >= 'a' && *data <= 'f' )
+			*p |= *data - 'a' + 10;
+		else if( *data >= 'A' && *data <= 'F' )
+			*p |= *data - 'A' + 10;
+		++data;
+	}
+
+	// load guild member info
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`name` "
+		"FROM `%s` WHERE `guild_id`='%d' ORDER BY `position`", guild_member_db, guild_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		aFree(g);
+		return NULL;
+	}
+	for( i = 0; i < g->max_member && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	{
+		struct guild_member* m = &g->member[i];
+
+		Sql_GetData(sql_handle,  0, &data, NULL); m->account_id = atoi(data);
+		Sql_GetData(sql_handle,  1, &data, NULL); m->char_id = atoi(data);
+		Sql_GetData(sql_handle,  2, &data, NULL); m->hair = atoi(data);
+		Sql_GetData(sql_handle,  3, &data, NULL); m->hair_color = atoi(data);
+		Sql_GetData(sql_handle,  4, &data, NULL); m->gender = atoi(data);
+		Sql_GetData(sql_handle,  5, &data, NULL); m->class_ = atoi(data);
+		Sql_GetData(sql_handle,  6, &data, NULL); m->lv = atoi(data);
+		Sql_GetData(sql_handle,  7, &data, NULL); m->exp = strtoull(data, NULL, 10);
+		Sql_GetData(sql_handle,  8, &data, NULL); m->exp_payper = (unsigned int)atoi(data);
+		Sql_GetData(sql_handle,  9, &data, NULL); m->online = atoi(data);
+		Sql_GetData(sql_handle, 10, &data, NULL); m->position = atoi(data);
+		if( m->position >= MAX_GUILDPOSITION ) // Fix reduction of MAX_GUILDPOSITION [PoW]
+			m->position = MAX_GUILDPOSITION - 1;
+		Sql_GetData(sql_handle, 11, &data, &len); memcpy(m->name, data, min(len, NAME_LENGTH));
+		m->modified = GS_MEMBER_UNMODIFIED;
+	}
+
+	//printf("- Read guild_position %d from sql \n",guild_id);
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `position`,`name`,`mode`,`exp_mode` FROM `%s` WHERE `guild_id`='%d'", guild_position_db, guild_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		aFree(g);
+		return NULL;
+	}
+	while( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		int position;
+		struct guild_position* p;
+
+		Sql_GetData(sql_handle, 0, &data, NULL); position = atoi(data);
+		if( position < 0 || position >= MAX_GUILDPOSITION )
+			continue;// invalid position
+		p = &g->position[position];
+		Sql_GetData(sql_handle, 1, &data, &len); memcpy(p->name, data, min(len, NAME_LENGTH));
+		Sql_GetData(sql_handle, 2, &data, NULL); p->mode = atoi(data);
+		Sql_GetData(sql_handle, 3, &data, NULL); p->exp_mode = atoi(data);
+		p->modified = GS_POSITION_UNMODIFIED;
+	}
+
+	//printf("- Read guild_alliance %d from sql \n",guild_id);
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `opposition`,`alliance_id`,`name` FROM `%s` WHERE `guild_id`='%d'", guild_alliance_db, guild_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		aFree(g);
+		return NULL;
+	}
+	for( i = 0; i < MAX_GUILDALLIANCE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	{
+		struct guild_alliance* a = &g->alliance[i];
+
+		Sql_GetData(sql_handle, 0, &data, NULL); a->opposition = atoi(data);
+		Sql_GetData(sql_handle, 1, &data, NULL); a->guild_id = atoi(data);
+		Sql_GetData(sql_handle, 2, &data, &len); memcpy(a->name, data, min(len, NAME_LENGTH));
+	}
+
+	//printf("- Read guild_expulsion %d from sql \n",guild_id);
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`name`,`mes` FROM `%s` WHERE `guild_id`='%d'", guild_expulsion_db, guild_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		aFree(g);
+		return NULL;
+	}
+	for( i = 0; i < MAX_GUILDEXPULSION && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	{
+		struct guild_expulsion *e = &g->expulsion[i];
+
+		Sql_GetData(sql_handle, 0, &data, NULL); e->account_id = atoi(data);
+		Sql_GetData(sql_handle, 1, &data, &len); memcpy(e->name, data, min(len, NAME_LENGTH));
+		Sql_GetData(sql_handle, 2, &data, &len); memcpy(e->mes, data, min(len, sizeof(e->mes)));
+	}
+
+	//printf("- Read guild_skill %d from sql \n",guild_id);
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `id`,`lv` FROM `%s` WHERE `guild_id`='%d' ORDER BY `id`", guild_skill_db, guild_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		aFree(g);
+		return NULL;
+	}
+
+	for(i = 0; i < MAX_GUILDSKILL; i++)
+	{	//Skill IDs must always be initialized. [Skotlex]
+		g->skill[i].id = i + GD_SKILLBASE;
+	}
+
+	while( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		int id;
+		Sql_GetData(sql_handle, 0, &data, NULL); id = atoi(data) - GD_SKILLBASE;
+		if( id < 0 && id >= MAX_GUILDSKILL )
+			continue;// invalid guild skill
+		Sql_GetData(sql_handle, 1, &data, NULL); g->skill[id].lv = atoi(data);
+	}
+	Sql_FreeResult(sql_handle);
+
+	idb_put(guild_db_, guild_id, g); //Add to cache
+	g->save_flag |= GS_REMOVE; //But set it to be removed, in case it is not needed for long.
+	
+	if (save_log)
+		ShowInfo("Guild loaded (%d - %s)\n", guild_id, g->name);
+
+	return g;
 }
 
 // `guild_castle` (`castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`, `visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`)
 int inter_guildcastle_tosql(struct guild_castle *gc)
 {
-    StringBuf buf;
-    int i;
-
-    StringBuf_Init(&buf);
-    StringBuf_Printf(&buf, "REPLACE INTO `%s` SET `castle_id`='%d', `guild_id`='%d', `economy`='%d', `defense`='%d', "
-                     "`triggerE`='%d', `triggerD`='%d', `nextTime`='%d', `payTime`='%d', `createTime`='%d', `visibleC`='%d'",
-                     guild_castle_db, gc->castle_id, gc->guild_id, gc->economy, gc->defense,
-                     gc->triggerE, gc->triggerD, gc->nextTime, gc->payTime, gc->createTime, gc->visibleC);
-    for (i = 0; i < MAX_GUARDIANS; ++i)
-        StringBuf_Printf(&buf, ", `visibleG%d`='%d'", i, gc->guardian[i].visible);
-
-    if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)))
-        Sql_ShowDebug(sql_handle);
-    else if (save_log)
-        ShowInfo("Saved guild castle (%d)\n", gc->castle_id);
-
-    StringBuf_Destroy(&buf);
-    return 0;
+	StringBuf buf;
+	int i;
+
+	StringBuf_Init(&buf);
+	StringBuf_Printf(&buf, "REPLACE INTO `%s` SET `castle_id`='%d', `guild_id`='%d', `economy`='%d', `defense`='%d', "
+	                 "`triggerE`='%d', `triggerD`='%d', `nextTime`='%d', `payTime`='%d', `createTime`='%d', `visibleC`='%d'",
+	                 guild_castle_db, gc->castle_id, gc->guild_id, gc->economy, gc->defense,
+	                 gc->triggerE, gc->triggerD, gc->nextTime, gc->payTime, gc->createTime, gc->visibleC);
+	for (i = 0; i < MAX_GUARDIANS; ++i)
+		StringBuf_Printf(&buf, ", `visibleG%d`='%d'", i, gc->guardian[i].visible);
+
+	if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)))
+		Sql_ShowDebug(sql_handle);
+	else if(save_log)
+		ShowInfo("Saved guild castle (%d)\n", gc->castle_id);
+
+	StringBuf_Destroy(&buf);
+	return 0;
 }
 
 // Read guild_castle from SQL
-static struct guild_castle *inter_guildcastle_fromsql(int castle_id) {
-    char *data;
-    int i;
-    StringBuf buf;
-    struct guild_castle *gc = idb_get(castle_db, castle_id);
-
-    if (gc != NULL)
-        return gc;
-
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, "
-                        "`triggerD`, `nextTime`, `payTime`, `createTime`, `visibleC`");
-    for (i = 0; i < MAX_GUARDIANS; ++i)
-        StringBuf_Printf(&buf, ", `visibleG%d`", i);
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `castle_id`='%d'", guild_castle_db, castle_id);
-    if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf))) {
-        Sql_ShowDebug(sql_handle);
-        StringBuf_Destroy(&buf);
-        return NULL;
-    }
-    StringBuf_Destroy(&buf);
-
-    CREATE(gc, struct guild_castle, 1);
-    gc->castle_id = castle_id;
-
-    if (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        gc->guild_id =  atoi(data);
-        Sql_GetData(sql_handle, 2, &data, NULL);
-        gc->economy = atoi(data);
-        Sql_GetData(sql_handle, 3, &data, NULL);
-        gc->defense = atoi(data);
-        Sql_GetData(sql_handle, 4, &data, NULL);
-        gc->triggerE = atoi(data);
-        Sql_GetData(sql_handle, 5, &data, NULL);
-        gc->triggerD = atoi(data);
-        Sql_GetData(sql_handle, 6, &data, NULL);
-        gc->nextTime = atoi(data);
-        Sql_GetData(sql_handle, 7, &data, NULL);
-        gc->payTime = atoi(data);
-        Sql_GetData(sql_handle, 8, &data, NULL);
-        gc->createTime = atoi(data);
-        Sql_GetData(sql_handle, 9, &data, NULL);
-        gc->visibleC = atoi(data);
-        for (i = 10; i < 10+MAX_GUARDIANS; i++) {
-            Sql_GetData(sql_handle, i, &data, NULL);
-            gc->guardian[i-10].visible = atoi(data);
-        }
-    }
-    Sql_FreeResult(sql_handle);
-
-    idb_put(castle_db, castle_id, gc);
-
-    if (save_log)
-        ShowInfo("Loaded guild castle (%d - guild %d)\n", castle_id, gc->guild_id);
-
-    return gc;
+static struct guild_castle* inter_guildcastle_fromsql(int castle_id)
+{
+	char *data;
+	int i;
+	StringBuf buf;
+	struct guild_castle *gc = idb_get(castle_db, castle_id);
+
+	if (gc != NULL)
+		return gc;
+
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, "
+	                    "`triggerD`, `nextTime`, `payTime`, `createTime`, `visibleC`");
+	for (i = 0; i < MAX_GUARDIANS; ++i)
+		StringBuf_Printf(&buf, ", `visibleG%d`", i);
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `castle_id`='%d'", guild_castle_db, castle_id);
+	if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf))) {
+		Sql_ShowDebug(sql_handle);
+		StringBuf_Destroy(&buf);
+		return NULL;
+	}
+	StringBuf_Destroy(&buf);
+
+	CREATE(gc, struct guild_castle, 1);
+	gc->castle_id = castle_id;
+
+	if (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
+		Sql_GetData(sql_handle, 1, &data, NULL); gc->guild_id =  atoi(data);
+		Sql_GetData(sql_handle, 2, &data, NULL); gc->economy = atoi(data);
+		Sql_GetData(sql_handle, 3, &data, NULL); gc->defense = atoi(data);
+		Sql_GetData(sql_handle, 4, &data, NULL); gc->triggerE = atoi(data);
+		Sql_GetData(sql_handle, 5, &data, NULL); gc->triggerD = atoi(data);
+		Sql_GetData(sql_handle, 6, &data, NULL); gc->nextTime = atoi(data);
+		Sql_GetData(sql_handle, 7, &data, NULL); gc->payTime = atoi(data);
+		Sql_GetData(sql_handle, 8, &data, NULL); gc->createTime = atoi(data);
+		Sql_GetData(sql_handle, 9, &data, NULL); gc->visibleC = atoi(data);
+		for (i = 10; i < 10+MAX_GUARDIANS; i++) {
+			Sql_GetData(sql_handle, i, &data, NULL); gc->guardian[i-10].visible = atoi(data);
+		}
+	}
+	Sql_FreeResult(sql_handle);
+
+	idb_put(castle_db, castle_id, gc);
+
+	if (save_log)
+		ShowInfo("Loaded guild castle (%d - guild %d)\n", castle_id, gc->guild_id);
+
+	return gc;
 }
 
 
 // Read exp_guild.txt
 int inter_guild_ReadEXP(void)
 {
-    int i;
-    FILE *fp;
-    char line[1024];
-    for (i=0; i<100; i++) guild_exp[i]=0;
-    //this is going to be discussed, temp fix
-    sprintf(line, "%s/pre-re/exp_guild.txt", db_path);
-    fp=fopen(line,"r");
-    if (fp==NULL) {
-        ShowError("can't read %s\n", line);
-        return 1;
-    }
-    i=0;
-    while (fgets(line, sizeof(line), fp) && i < 100) {
-        if (line[0]=='/' && line[1]=='/')
-            continue;
-        guild_exp[i]=(unsigned int)atof(line);
-        i++;
-    }
-    fclose(fp);
-
-    return 0;
+	int i;
+	FILE *fp;
+	char line[1024];
+	for (i=0;i<100;i++) guild_exp[i]=0;
+	//this is going to be discussed, temp fix
+	sprintf(line, "%s/pre-re/exp_guild.txt", db_path);
+	fp=fopen(line,"r");
+	if(fp==NULL){
+		ShowError("can't read %s\n", line);
+		return 1;
+	}
+	i=0;
+	while(fgets(line, sizeof(line), fp) && i < 100)
+	{
+		if(line[0]=='/' && line[1]=='/')
+			continue;
+		guild_exp[i]=(unsigned int)atof(line);
+		i++;
+	}
+	fclose(fp);
+
+	return 0;
 }
 
 
 int inter_guild_CharOnline(int char_id, int guild_id)
 {
-    struct guild *g;
-    int i;
-
-    if (guild_id == -1) {
-        //Get guild_id from the database
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT guild_id FROM `%s` WHERE char_id='%d'", char_db, char_id)) {
-            Sql_ShowDebug(sql_handle);
-            return 0;
-        }
-
-        if (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-            char *data;
-
-            Sql_GetData(sql_handle, 0, &data, NULL);
-            guild_id = atoi(data);
-        } else {
-            guild_id = 0;
-        }
-        Sql_FreeResult(sql_handle);
-    }
-    if (guild_id == 0)
-        return 0; //No guild...
-
-    g = inter_guild_fromsql(guild_id);
-    if (!g) {
-        ShowError("Character %d's guild %d not found!\n", char_id, guild_id);
-        return 0;
-    }
-
-    //Member has logged in before saving, tell saver not to delete
-    if (g->save_flag & GS_REMOVE)
-        g->save_flag &= ~GS_REMOVE;
-
-    //Set member online
-    ARR_FIND(0, g->max_member, i, g->member[i].char_id == char_id);
-    if (i < g->max_member) {
-        g->member[i].online = 1;
-        g->member[i].modified = GS_MEMBER_MODIFIED;
-    }
-
-    return 1;
+   struct guild *g;
+   int i;
+   
+	if (guild_id == -1) {
+		//Get guild_id from the database
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT guild_id FROM `%s` WHERE char_id='%d'", char_db, char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+
+		if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+		{
+			char* data;
+
+			Sql_GetData(sql_handle, 0, &data, NULL);
+			guild_id = atoi(data);
+		}
+		else
+		{
+			guild_id = 0;
+		}
+		Sql_FreeResult(sql_handle);
+	}
+	if (guild_id == 0)
+		return 0; //No guild...
+	
+	g = inter_guild_fromsql(guild_id);
+	if(!g) {
+		ShowError("Character %d's guild %d not found!\n", char_id, guild_id);
+		return 0;
+	}
+
+	//Member has logged in before saving, tell saver not to delete
+	if(g->save_flag & GS_REMOVE)
+		g->save_flag &= ~GS_REMOVE;
+
+	//Set member online
+	ARR_FIND( 0, g->max_member, i, g->member[i].char_id == char_id );
+	if( i < g->max_member )
+	{
+		g->member[i].online = 1;
+		g->member[i].modified = GS_MEMBER_MODIFIED;
+	}
+
+	return 1;
 }
 
 int inter_guild_CharOffline(int char_id, int guild_id)
 {
-    struct guild *g=NULL;
-    int online_count, i;
-
-    if (guild_id == -1) {
-        //Get guild_id from the database
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT guild_id FROM `%s` WHERE char_id='%d'", char_db, char_id)) {
-            Sql_ShowDebug(sql_handle);
-            return 0;
-        }
-
-        if (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-            char *data;
-
-            Sql_GetData(sql_handle, 0, &data, NULL);
-            guild_id = atoi(data);
-        } else {
-            guild_id = 0;
-        }
-        Sql_FreeResult(sql_handle);
-    }
-    if (guild_id == 0)
-        return 0; //No guild...
-
-    //Character has a guild, set character offline and check if they were the only member online
-    g = inter_guild_fromsql(guild_id);
-    if (g == NULL) //Guild not found?
-        return 0;
-
-    //Set member offline
-    ARR_FIND(0, g->max_member, i, g->member[i].char_id == char_id);
-    if (i < g->max_member) {
-        g->member[i].online = 0;
-        g->member[i].modified = GS_MEMBER_MODIFIED;
-    }
-
-    online_count = 0;
-    for (i = 0; i < g->max_member; i++)
-        if (g->member[i].online)
-            online_count++;
-
-    // Remove guild from memory if no players online
-    if (online_count == 0)
-        g->save_flag |= GS_REMOVE;
-
-    return 1;
+	struct guild *g=NULL;
+	int online_count, i;
+
+	if (guild_id == -1)
+	{
+		//Get guild_id from the database
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT guild_id FROM `%s` WHERE char_id='%d'", char_db, char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+
+		if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+		{
+			char* data;
+
+			Sql_GetData(sql_handle, 0, &data, NULL);
+			guild_id = atoi(data);
+		}
+		else
+		{
+			guild_id = 0;
+		}
+		Sql_FreeResult(sql_handle);
+	}
+	if (guild_id == 0)
+		return 0; //No guild...
+	
+	//Character has a guild, set character offline and check if they were the only member online
+	g = inter_guild_fromsql(guild_id);
+	if (g == NULL) //Guild not found?
+		return 0;
+
+	//Set member offline
+	ARR_FIND( 0, g->max_member, i, g->member[i].char_id == char_id );
+	if( i < g->max_member )
+	{
+		g->member[i].online = 0;
+		g->member[i].modified = GS_MEMBER_MODIFIED;
+	}
+
+	online_count = 0;
+	for( i = 0; i < g->max_member; i++ )
+		if( g->member[i].online )
+			online_count++;
+
+	// Remove guild from memory if no players online
+	if( online_count == 0 )
+		g->save_flag |= GS_REMOVE;
+
+	return 1;
 }
 
 // Initialize guild sql
 int inter_guild_sql_init(void)
 {
-    //Initialize the guild cache
-    guild_db_= idb_alloc(DB_OPT_RELEASE_DATA);
-    castle_db = idb_alloc(DB_OPT_RELEASE_DATA);
-
-    //Read exp file
-    inter_guild_ReadEXP();
-
-    add_timer_func_list(guild_save_timer, "guild_save_timer");
-    add_timer(gettick() + 10000, guild_save_timer, 0, 0);
-    return 0;
+	//Initialize the guild cache
+	guild_db_= idb_alloc(DB_OPT_RELEASE_DATA);
+	castle_db = idb_alloc(DB_OPT_RELEASE_DATA);
+
+   //Read exp file
+	inter_guild_ReadEXP();
+   
+	add_timer_func_list(guild_save_timer, "guild_save_timer");
+	add_timer(gettick() + 10000, guild_save_timer, 0, 0);
+	return 0;
 }
 
 /**
@@ -751,134 +751,145 @@ int inter_guild_sql_init(void)
  */
 static int guild_db_final(DBKey key, DBData *data, va_list ap)
 {
-    struct guild *g = db_data2ptr(data);
-    if (g->save_flag&GS_MASK) {
-        inter_guild_tosql(g, g->save_flag&GS_MASK);
-        return 1;
-    }
-    return 0;
+	struct guild *g = db_data2ptr(data);
+	if (g->save_flag&GS_MASK) {
+		inter_guild_tosql(g, g->save_flag&GS_MASK);
+		return 1;
+	}
+	return 0;
 }
 
 void inter_guild_sql_final(void)
 {
-    guild_db_->destroy(guild_db_, guild_db_final);
-    db_destroy(castle_db);
-    return;
+	guild_db_->destroy(guild_db_, guild_db_final);
+	db_destroy(castle_db);
+	return;
 }
 
 // Get guild_id by its name. Returns 0 if not found, -1 on error.
 int search_guildname(char *str)
 {
-    int guild_id;
-    char esc_name[NAME_LENGTH*2+1];
-
-    Sql_EscapeStringLen(sql_handle, esc_name, str, safestrnlen(str, NAME_LENGTH));
-    //Lookup guilds with the same name
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT guild_id FROM `%s` WHERE name='%s'", guild_db, esc_name)) {
-        Sql_ShowDebug(sql_handle);
-        return -1;
-    }
-
-    if (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        char *data;
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        guild_id = atoi(data);
-    } else {
-        guild_id = 0;
-    }
-    Sql_FreeResult(sql_handle);
-    return guild_id;
+	int guild_id;
+	char esc_name[NAME_LENGTH*2+1];
+	
+	Sql_EscapeStringLen(sql_handle, esc_name, str, safestrnlen(str, NAME_LENGTH));
+	//Lookup guilds with the same name
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT guild_id FROM `%s` WHERE name='%s'", guild_db, esc_name) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return -1;
+	}
+
+	if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		char* data;
+
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		guild_id = atoi(data);
+	}
+	else
+	{
+		guild_id = 0;
+	}
+	Sql_FreeResult(sql_handle);
+	return guild_id;
 }
 
 // Check if guild is empty
 static bool guild_check_empty(struct guild *g)
 {
-    int i;
-    ARR_FIND(0, g->max_member, i, g->member[i].account_id > 0);
-    if (i < g->max_member)
-        return false; // not empty
-
-    //Let the calling function handle the guild removal in case they need
-    //to do something else with it before freeing the data. [Skotlex]
-    return true;
+	int i;
+	ARR_FIND( 0, g->max_member, i, g->member[i].account_id > 0 );
+	if( i < g->max_member)
+		return false; // not empty
+
+	//Let the calling function handle the guild removal in case they need
+	//to do something else with it before freeing the data. [Skotlex]
+	return true;
 }
 
 unsigned int guild_nextexp(int level)
 {
-    if (level == 0)
-        return 1;
-    if (level < 100 && level > 0) // Change by hack
-        return guild_exp[level-1];
+	if (level == 0)
+		return 1;
+	if (level < 100 && level > 0) // Change by hack
+		return guild_exp[level-1];
 
-    return 0;
+	return 0;
 }
 
 int guild_checkskill(struct guild *g,int id)
 {
-    int idx = id - GD_SKILLBASE;
+	int idx = id - GD_SKILLBASE;
 
-    if (idx < 0 || idx >= MAX_GUILDSKILL)
-        return 0;
+	if(idx < 0 || idx >= MAX_GUILDSKILL)
+		return 0;
 
-    return g->skill[idx].lv;
+	return g->skill[idx].lv;
 }
 
 int guild_calcinfo(struct guild *g)
 {
-    int i,c;
-    unsigned int nextexp;
-    struct guild before = *g; // Save guild current values
-
-    if (g->guild_lv<=0)
-        g->guild_lv = 1;
-    nextexp = guild_nextexp(g->guild_lv);
-
-    // Consume guild exp and increase guild level
-    while (g->exp >= nextexp && nextexp > 0) {  //fixed guild exp overflow [Kevin]
-        g->exp-=nextexp;
-        g->guild_lv++;
-        g->skill_point++;
-        nextexp = guild_nextexp(g->guild_lv);
-    }
-
-    // Save next exp step
-    g->next_exp = nextexp;
-
-    // Set the max number of members, Guild Extention skill - currently adds 6 to max per skill lv.
-    g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 6;
-    if (g->max_member > MAX_GUILD) {
-        ShowError("Guild %d:%s has capacity for too many guild members (%d), max supported is %d\n", g->guild_id, g->name, g->max_member, MAX_GUILD);
-        g->max_member = MAX_GUILD;
-    }
-
-    // Compute the guild average level level
-    g->average_lv=0;
-    g->connect_member=0;
-    for (i=c=0; i<g->max_member; i++) {
-        if (g->member[i].account_id>0) {
-            if (g->member[i].lv >= 0) {
-                g->average_lv+=g->member[i].lv;
-                c++;
-            } else {
-                ShowWarning("Guild %d:%s, member %d:%s has an invalid level %d\n", g->guild_id, g->name, g->member[i].char_id, g->member[i].name, g->member[i].lv);
-            }
-
-            if (g->member[i].online)
-                g->connect_member++;
-        }
-    }
-    if (c)
-        g->average_lv /= c;
-
-    // Check if guild stats has change
-    if (g->max_member != before.max_member || g->guild_lv != before.guild_lv || g->skill_point != before.skill_point) {
-        g->save_flag |= GS_LEVEL;
-        mapif_guild_info(-1,g);
-        return 1;
-    }
-
-    return 0;
+	int i,c;
+	unsigned int nextexp;
+	struct guild before = *g; // Save guild current values
+
+	if(g->guild_lv<=0)
+		g->guild_lv = 1;
+	nextexp = guild_nextexp(g->guild_lv);
+
+	// Consume guild exp and increase guild level
+	while(g->exp >= nextexp && nextexp > 0){	//fixed guild exp overflow [Kevin]
+		g->exp-=nextexp;
+		g->guild_lv++;
+		g->skill_point++;
+		nextexp = guild_nextexp(g->guild_lv);
+	}
+
+	// Save next exp step
+	g->next_exp = nextexp;
+
+	// Set the max number of members, Guild Extention skill - currently adds 6 to max per skill lv.
+	g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 6; 
+	if(g->max_member > MAX_GUILD)
+	{
+		ShowError("Guild %d:%s has capacity for too many guild members (%d), max supported is %d\n", g->guild_id, g->name, g->max_member, MAX_GUILD);
+		g->max_member = MAX_GUILD;
+	}
+	
+	// Compute the guild average level level
+	g->average_lv=0;
+	g->connect_member=0;
+	for(i=c=0;i<g->max_member;i++)
+	{
+		if(g->member[i].account_id>0)
+		{
+			if (g->member[i].lv >= 0)
+			{
+				g->average_lv+=g->member[i].lv;
+				c++;
+			}
+			else
+			{
+				ShowWarning("Guild %d:%s, member %d:%s has an invalid level %d\n", g->guild_id, g->name, g->member[i].char_id, g->member[i].name, g->member[i].lv);
+			}
+
+			if(g->member[i].online)
+				g->connect_member++;
+		}
+	}
+	if(c)
+		g->average_lv /= c;
+
+	// Check if guild stats has change
+	if(g->max_member != before.max_member || g->guild_lv != before.guild_lv || g->skill_point != before.skill_point	)
+	{
+		g->save_flag |= GS_LEVEL;
+		mapif_guild_info(-1,g);
+		return 1;
+	}
+
+	return 0;
 }
 
 //-------------------------------------------------------------------
@@ -886,244 +897,245 @@ int guild_calcinfo(struct guild *g)
 
 int mapif_guild_created(int fd,int account_id,struct guild *g)
 {
-    WFIFOHEAD(fd, 10);
-    WFIFOW(fd,0)=0x3830;
-    WFIFOL(fd,2)=account_id;
-    if (g != NULL) {
-        WFIFOL(fd,6)=g->guild_id;
-        ShowInfo("int_guild: Guild created (%d - %s)\n",g->guild_id,g->name);
-    } else
-        WFIFOL(fd,6)=0;
-
-    WFIFOSET(fd,10);
-    return 0;
+	WFIFOHEAD(fd, 10);
+	WFIFOW(fd,0)=0x3830;
+	WFIFOL(fd,2)=account_id;
+	if(g != NULL)
+	{
+		WFIFOL(fd,6)=g->guild_id;
+		ShowInfo("int_guild: Guild created (%d - %s)\n",g->guild_id,g->name);
+	} else
+		WFIFOL(fd,6)=0;
+
+	WFIFOSET(fd,10);
+	return 0;
 }
 
 // Guild not found
 int mapif_guild_noinfo(int fd,int guild_id)
 {
-    unsigned char buf[12];
-    WBUFW(buf,0)=0x3831;
-    WBUFW(buf,2)=8;
-    WBUFL(buf,4)=guild_id;
-    ShowWarning("int_guild: info not found %d\n",guild_id);
-    if (fd<0)
-        mapif_sendall(buf,8);
-    else
-        mapif_send(fd,buf,8);
-    return 0;
+	unsigned char buf[12];
+	WBUFW(buf,0)=0x3831;
+	WBUFW(buf,2)=8;
+	WBUFL(buf,4)=guild_id;
+	ShowWarning("int_guild: info not found %d\n",guild_id);
+	if(fd<0)
+		mapif_sendall(buf,8);
+	else
+		mapif_send(fd,buf,8);
+	return 0;
 }
 
 // Send guild info
 int mapif_guild_info(int fd,struct guild *g)
 {
-    unsigned char buf[8+sizeof(struct guild)];
-    WBUFW(buf,0)=0x3831;
-    WBUFW(buf,2)=4+sizeof(struct guild);
-    memcpy(buf+4,g,sizeof(struct guild));
-    if (fd<0)
-        mapif_sendall(buf,WBUFW(buf,2));
-    else
-        mapif_send(fd,buf,WBUFW(buf,2));
-    return 0;
+	unsigned char buf[8+sizeof(struct guild)];
+	WBUFW(buf,0)=0x3831;
+	WBUFW(buf,2)=4+sizeof(struct guild);
+	memcpy(buf+4,g,sizeof(struct guild));
+	if(fd<0)
+		mapif_sendall(buf,WBUFW(buf,2));
+	else
+		mapif_send(fd,buf,WBUFW(buf,2));
+	return 0;
 }
 
 // ACK member add
 int mapif_guild_memberadded(int fd,int guild_id,int account_id,int char_id,int flag)
 {
-    WFIFOHEAD(fd, 15);
-    WFIFOW(fd,0)=0x3832;
-    WFIFOL(fd,2)=guild_id;
-    WFIFOL(fd,6)=account_id;
-    WFIFOL(fd,10)=char_id;
-    WFIFOB(fd,14)=flag;
-    WFIFOSET(fd,15);
-    return 0;
+	WFIFOHEAD(fd, 15);
+	WFIFOW(fd,0)=0x3832;
+	WFIFOL(fd,2)=guild_id;
+	WFIFOL(fd,6)=account_id;
+	WFIFOL(fd,10)=char_id;
+	WFIFOB(fd,14)=flag;
+	WFIFOSET(fd,15);
+	return 0;
 }
 
 // ACK member leave
 int mapif_guild_withdraw(int guild_id,int account_id,int char_id,int flag, const char *name, const char *mes)
 {
-    unsigned char buf[55+NAME_LENGTH];
-    WBUFW(buf, 0)=0x3834;
-    WBUFL(buf, 2)=guild_id;
-    WBUFL(buf, 6)=account_id;
-    WBUFL(buf,10)=char_id;
-    WBUFB(buf,14)=flag;
-    memcpy(WBUFP(buf,15),mes,40);
-    memcpy(WBUFP(buf,55),name,NAME_LENGTH);
-    mapif_sendall(buf,55+NAME_LENGTH);
-    ShowInfo("int_guild: guild withdraw (%d - %d: %s - %s)\n",guild_id,account_id,name,mes);
-    return 0;
+	unsigned char buf[55+NAME_LENGTH];
+	WBUFW(buf, 0)=0x3834;
+	WBUFL(buf, 2)=guild_id;
+	WBUFL(buf, 6)=account_id;
+	WBUFL(buf,10)=char_id;
+	WBUFB(buf,14)=flag;
+	memcpy(WBUFP(buf,15),mes,40);
+	memcpy(WBUFP(buf,55),name,NAME_LENGTH);
+	mapif_sendall(buf,55+NAME_LENGTH);
+	ShowInfo("int_guild: guild withdraw (%d - %d: %s - %s)\n",guild_id,account_id,name,mes);
+	return 0;
 }
 
 // Send short member's info
 int mapif_guild_memberinfoshort(struct guild *g,int idx)
 {
-    unsigned char buf[19];
-    WBUFW(buf, 0)=0x3835;
-    WBUFL(buf, 2)=g->guild_id;
-    WBUFL(buf, 6)=g->member[idx].account_id;
-    WBUFL(buf,10)=g->member[idx].char_id;
-    WBUFB(buf,14)=(unsigned char)g->member[idx].online;
-    WBUFW(buf,15)=g->member[idx].lv;
-    WBUFW(buf,17)=g->member[idx].class_;
-    mapif_sendall(buf,19);
-    return 0;
+	unsigned char buf[19];
+	WBUFW(buf, 0)=0x3835;
+	WBUFL(buf, 2)=g->guild_id;
+	WBUFL(buf, 6)=g->member[idx].account_id;
+	WBUFL(buf,10)=g->member[idx].char_id;
+	WBUFB(buf,14)=(unsigned char)g->member[idx].online;
+	WBUFW(buf,15)=g->member[idx].lv;
+	WBUFW(buf,17)=g->member[idx].class_;
+	mapif_sendall(buf,19);
+	return 0;
 }
 
 // Send guild broken
 int mapif_guild_broken(int guild_id,int flag)
 {
-    unsigned char buf[7];
-    WBUFW(buf,0)=0x3836;
-    WBUFL(buf,2)=guild_id;
-    WBUFB(buf,6)=flag;
-    mapif_sendall(buf,7);
-    ShowInfo("int_guild: Guild broken (%d)\n",guild_id);
-    return 0;
+	unsigned char buf[7];
+	WBUFW(buf,0)=0x3836;
+	WBUFL(buf,2)=guild_id;
+	WBUFB(buf,6)=flag;
+	mapif_sendall(buf,7);
+	ShowInfo("int_guild: Guild broken (%d)\n",guild_id);
+	return 0;
 }
 
 // Send guild message
 int mapif_guild_message(int guild_id,int account_id,char *mes,int len, int sfd)
 {
-    unsigned char buf[512];
-    if (len > 500)
-        len = 500;
-    WBUFW(buf,0)=0x3837;
-    WBUFW(buf,2)=len+12;
-    WBUFL(buf,4)=guild_id;
-    WBUFL(buf,8)=account_id;
-    memcpy(WBUFP(buf,12),mes,len);
-    mapif_sendallwos(sfd, buf,len+12);
-    return 0;
+	unsigned char buf[512];
+	if (len > 500)
+		len = 500;
+	WBUFW(buf,0)=0x3837;
+	WBUFW(buf,2)=len+12;
+	WBUFL(buf,4)=guild_id;
+	WBUFL(buf,8)=account_id;
+	memcpy(WBUFP(buf,12),mes,len);
+	mapif_sendallwos(sfd, buf,len+12);
+	return 0;
 }
 
 // Send basic info
 int mapif_guild_basicinfochanged(int guild_id,int type,const void *data,int len)
 {
-    unsigned char buf[2048];
-    if (len > 2038)
-        len = 2038;
-    WBUFW(buf, 0)=0x3839;
-    WBUFW(buf, 2)=len+10;
-    WBUFL(buf, 4)=guild_id;
-    WBUFW(buf, 8)=type;
-    memcpy(WBUFP(buf,10),data,len);
-    mapif_sendall(buf,len+10);
-    return 0;
+	unsigned char buf[2048];
+	if (len > 2038)
+		len = 2038;
+	WBUFW(buf, 0)=0x3839;
+	WBUFW(buf, 2)=len+10;
+	WBUFL(buf, 4)=guild_id;
+	WBUFW(buf, 8)=type;
+	memcpy(WBUFP(buf,10),data,len);
+	mapif_sendall(buf,len+10);
+	return 0;
 }
 
 // Send member info
 int mapif_guild_memberinfochanged(int guild_id,int account_id,int char_id, int type,const void *data,int len)
 {
-    unsigned char buf[2048];
-    if (len > 2030)
-        len = 2030;
-    WBUFW(buf, 0)=0x383a;
-    WBUFW(buf, 2)=len+18;
-    WBUFL(buf, 4)=guild_id;
-    WBUFL(buf, 8)=account_id;
-    WBUFL(buf,12)=char_id;
-    WBUFW(buf,16)=type;
-    memcpy(WBUFP(buf,18),data,len);
-    mapif_sendall(buf,len+18);
-    return 0;
+	unsigned char buf[2048];
+	if (len > 2030)
+		len = 2030;
+	WBUFW(buf, 0)=0x383a;
+	WBUFW(buf, 2)=len+18;
+	WBUFL(buf, 4)=guild_id;
+	WBUFL(buf, 8)=account_id;
+	WBUFL(buf,12)=char_id;
+	WBUFW(buf,16)=type;
+	memcpy(WBUFP(buf,18),data,len);
+	mapif_sendall(buf,len+18);
+	return 0;
 }
 
 // ACK guild skill up
 int mapif_guild_skillupack(int guild_id,int skill_num,int account_id)
 {
-    unsigned char buf[14];
-    WBUFW(buf, 0)=0x383c;
-    WBUFL(buf, 2)=guild_id;
-    WBUFL(buf, 6)=skill_num;
-    WBUFL(buf,10)=account_id;
-    mapif_sendall(buf,14);
-    return 0;
+	unsigned char buf[14];
+	WBUFW(buf, 0)=0x383c;
+	WBUFL(buf, 2)=guild_id;
+	WBUFL(buf, 6)=skill_num;
+	WBUFL(buf,10)=account_id;
+	mapif_sendall(buf,14);
+	return 0;
 }
 
 // ACK guild alliance
 int mapif_guild_alliance(int guild_id1,int guild_id2,int account_id1,int account_id2,int flag,const char *name1,const char *name2)
 {
-    unsigned char buf[19+2*NAME_LENGTH];
-    WBUFW(buf, 0)=0x383d;
-    WBUFL(buf, 2)=guild_id1;
-    WBUFL(buf, 6)=guild_id2;
-    WBUFL(buf,10)=account_id1;
-    WBUFL(buf,14)=account_id2;
-    WBUFB(buf,18)=flag;
-    memcpy(WBUFP(buf,19),name1,NAME_LENGTH);
-    memcpy(WBUFP(buf,19+NAME_LENGTH),name2,NAME_LENGTH);
-    mapif_sendall(buf,19+2*NAME_LENGTH);
-    return 0;
+	unsigned char buf[19+2*NAME_LENGTH];
+	WBUFW(buf, 0)=0x383d;
+	WBUFL(buf, 2)=guild_id1;
+	WBUFL(buf, 6)=guild_id2;
+	WBUFL(buf,10)=account_id1;
+	WBUFL(buf,14)=account_id2;
+	WBUFB(buf,18)=flag;
+	memcpy(WBUFP(buf,19),name1,NAME_LENGTH);
+	memcpy(WBUFP(buf,19+NAME_LENGTH),name2,NAME_LENGTH);
+	mapif_sendall(buf,19+2*NAME_LENGTH);
+	return 0;
 }
 
 // Send a guild position desc
 int mapif_guild_position(struct guild *g,int idx)
 {
-    unsigned char buf[12 + sizeof(struct guild_position)];
-    WBUFW(buf,0)=0x383b;
-    WBUFW(buf,2)=sizeof(struct guild_position)+12;
-    WBUFL(buf,4)=g->guild_id;
-    WBUFL(buf,8)=idx;
-    memcpy(WBUFP(buf,12),&g->position[idx],sizeof(struct guild_position));
-    mapif_sendall(buf,WBUFW(buf,2));
-    return 0;
+	unsigned char buf[12 + sizeof(struct guild_position)];
+	WBUFW(buf,0)=0x383b;
+	WBUFW(buf,2)=sizeof(struct guild_position)+12;
+	WBUFL(buf,4)=g->guild_id;
+	WBUFL(buf,8)=idx;
+	memcpy(WBUFP(buf,12),&g->position[idx],sizeof(struct guild_position));
+	mapif_sendall(buf,WBUFW(buf,2));
+	return 0;
 }
 
 // Send the guild notice
 int mapif_guild_notice(struct guild *g)
 {
-    unsigned char buf[256];
-    WBUFW(buf,0)=0x383e;
-    WBUFL(buf,2)=g->guild_id;
-    memcpy(WBUFP(buf,6),g->mes1,MAX_GUILDMES1);
-    memcpy(WBUFP(buf,66),g->mes2,MAX_GUILDMES2);
-    mapif_sendall(buf,186);
-    return 0;
+	unsigned char buf[256];
+	WBUFW(buf,0)=0x383e;
+	WBUFL(buf,2)=g->guild_id;
+	memcpy(WBUFP(buf,6),g->mes1,MAX_GUILDMES1);
+	memcpy(WBUFP(buf,66),g->mes2,MAX_GUILDMES2);
+	mapif_sendall(buf,186);
+	return 0;
 }
 
 // Send emblem data
 int mapif_guild_emblem(struct guild *g)
 {
-    unsigned char buf[12 + sizeof(g->emblem_data)];
-    WBUFW(buf,0)=0x383f;
-    WBUFW(buf,2)=g->emblem_len+12;
-    WBUFL(buf,4)=g->guild_id;
-    WBUFL(buf,8)=g->emblem_id;
-    memcpy(WBUFP(buf,12),g->emblem_data,g->emblem_len);
-    mapif_sendall(buf,WBUFW(buf,2));
-    return 0;
+	unsigned char buf[12 + sizeof(g->emblem_data)];
+	WBUFW(buf,0)=0x383f;
+	WBUFW(buf,2)=g->emblem_len+12;
+	WBUFL(buf,4)=g->guild_id;
+	WBUFL(buf,8)=g->emblem_id;
+	memcpy(WBUFP(buf,12),g->emblem_data,g->emblem_len);
+	mapif_sendall(buf,WBUFW(buf,2));
+	return 0;
 }
 
 int mapif_guild_master_changed(struct guild *g, int aid, int cid)
 {
-    unsigned char buf[14];
-    WBUFW(buf,0)=0x3843;
-    WBUFL(buf,2)=g->guild_id;
-    WBUFL(buf,6)=aid;
-    WBUFL(buf,10)=cid;
-    mapif_sendall(buf,14);
-    return 0;
+	unsigned char buf[14];
+	WBUFW(buf,0)=0x3843;
+	WBUFL(buf,2)=g->guild_id;
+	WBUFL(buf,6)=aid;
+	WBUFL(buf,10)=cid;
+	mapif_sendall(buf,14);
+	return 0;
 }
 
 int mapif_guild_castle_dataload(int fd, int sz, int *castle_ids)
 {
-    struct guild_castle *gc = NULL;
-    int num = (sz - 4) / sizeof(int);
-    int len = 4 + num * sizeof(*gc);
-    int i;
-
-    WFIFOHEAD(fd, len);
-    WFIFOW(fd, 0) = 0x3840;
-    WFIFOW(fd, 2) = len;
-    for (i = 0; i < num; i++) {
-        gc = inter_guildcastle_fromsql(*(castle_ids++));
-        memcpy(WFIFOP(fd, 4 + i * sizeof(*gc)), gc, sizeof(*gc));
-    }
-    WFIFOSET(fd, len);
-    return 0;
+	struct guild_castle *gc = NULL;
+	int num = (sz - 4) / sizeof(int);
+	int len = 4 + num * sizeof(*gc);
+	int i;
+
+	WFIFOHEAD(fd, len);
+	WFIFOW(fd, 0) = 0x3840;
+	WFIFOW(fd, 2) = len;
+	for (i = 0; i < num; i++) {
+		gc = inter_guildcastle_fromsql(*(castle_ids++));
+		memcpy(WFIFOP(fd, 4 + i * sizeof(*gc)), gc, sizeof(*gc));
+	}
+	WFIFOSET(fd, len);
+	return 0;
 }
 
 //-------------------------------------------------------------------
@@ -1133,680 +1145,696 @@ int mapif_guild_castle_dataload(int fd, int sz, int *castle_ids)
 // Guild creation request
 int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member *master)
 {
-    struct guild *g;
-    int i=0;
+	struct guild *g;
+	int i=0;
 #ifdef NOISY
-    ShowInfo("Creating Guild (%s)\n", name);
+	ShowInfo("Creating Guild (%s)\n", name);
 #endif
-    if (search_guildname(name) != 0) {
-        ShowInfo("int_guild: guild with same name exists [%s]\n",name);
-        mapif_guild_created(fd,account_id,NULL);
-        return 0;
-    }
-    // Check Authorised letters/symbols in the name of the character
-    if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) == NULL) {
-                mapif_guild_created(fd,account_id,NULL);
-                return 0;
-            }
-    } else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) != NULL) {
-                mapif_guild_created(fd,account_id,NULL);
-                return 0;
-            }
-    }
-
-    g = (struct guild *)aMalloc(sizeof(struct guild));
-    memset(g,0,sizeof(struct guild));
-
-    memcpy(g->name,name,NAME_LENGTH);
-    memcpy(g->master,master->name,NAME_LENGTH);
-    memcpy(&g->member[0],master,sizeof(struct guild_member));
-    g->member[0].modified = GS_MEMBER_MODIFIED;
-
-    // Set default positions
-    g->position[0].mode=0x11;
-    strcpy(g->position[0].name,"GuildMaster");
-    strcpy(g->position[MAX_GUILDPOSITION-1].name,"Newbie");
-    g->position[0].modified = g->position[MAX_GUILDPOSITION-1].modified = GS_POSITION_MODIFIED;
-    for (i=1; i<MAX_GUILDPOSITION-1; i++) {
-        sprintf(g->position[i].name,"Position %d",i+1);
-        g->position[i].modified = GS_POSITION_MODIFIED;
-    }
-
-    // Initialize guild property
-    g->max_member=16;
-    g->average_lv=master->lv;
-    g->connect_member=1;
-
-    for (i=0; i<MAX_GUILDSKILL; i++)
-        g->skill[i].id=i + GD_SKILLBASE;
-    g->guild_id= -1; //Request to create guild.
-
-    // Create the guild
-    if (!inter_guild_tosql(g,GS_BASIC|GS_POSITION|GS_SKILL)) {
-        //Failed to Create guild....
-        ShowError("Failed to create Guild %s (Guild Master: %s)\n", g->name, g->master);
-        mapif_guild_created(fd,account_id,NULL);
-        aFree(g);
-        return 0;
-    }
-    ShowInfo("Created Guild %d - %s (Guild Master: %s)\n", g->guild_id, g->name, g->master);
-
-    //Add to cache
-    idb_put(guild_db_, g->guild_id, g);
-
-    // Report to client
-    mapif_guild_created(fd,account_id,g);
-    mapif_guild_info(fd,g);
-
-    if (log_inter)
-        inter_log("guild %s (id=%d) created by master %s (id=%d)\n",
-                  name, g->guild_id, master->name, master->account_id);
-
-    return 0;
+	if(search_guildname(name) != 0){
+		ShowInfo("int_guild: guild with same name exists [%s]\n",name);
+		mapif_guild_created(fd,account_id,NULL);
+		return 0;
+	}
+	// Check Authorised letters/symbols in the name of the character
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+		for (i = 0; i < NAME_LENGTH && name[i]; i++)
+			if (strchr(char_name_letters, name[i]) == NULL) {
+				mapif_guild_created(fd,account_id,NULL);
+				return 0;
+			}
+	} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
+		for (i = 0; i < NAME_LENGTH && name[i]; i++)
+			if (strchr(char_name_letters, name[i]) != NULL) {
+				mapif_guild_created(fd,account_id,NULL);
+				return 0;
+			}
+	}
+
+	g = (struct guild *)aMalloc(sizeof(struct guild));
+	memset(g,0,sizeof(struct guild));
+
+	memcpy(g->name,name,NAME_LENGTH);
+	memcpy(g->master,master->name,NAME_LENGTH);
+	memcpy(&g->member[0],master,sizeof(struct guild_member));
+	g->member[0].modified = GS_MEMBER_MODIFIED;
+
+	// Set default positions
+	g->position[0].mode=0x11;
+	strcpy(g->position[0].name,"GuildMaster");
+	strcpy(g->position[MAX_GUILDPOSITION-1].name,"Newbie");
+	g->position[0].modified = g->position[MAX_GUILDPOSITION-1].modified = GS_POSITION_MODIFIED;
+	for(i=1;i<MAX_GUILDPOSITION-1;i++) {
+		sprintf(g->position[i].name,"Position %d",i+1);
+		g->position[i].modified = GS_POSITION_MODIFIED;
+	}
+
+	// Initialize guild property
+	g->max_member=16;
+	g->average_lv=master->lv;
+	g->connect_member=1;
+
+	for(i=0;i<MAX_GUILDSKILL;i++)
+		g->skill[i].id=i + GD_SKILLBASE;
+	g->guild_id= -1; //Request to create guild.
+
+	// Create the guild
+	if (!inter_guild_tosql(g,GS_BASIC|GS_POSITION|GS_SKILL)) {
+		//Failed to Create guild....
+		ShowError("Failed to create Guild %s (Guild Master: %s)\n", g->name, g->master);
+		mapif_guild_created(fd,account_id,NULL);
+		aFree(g);
+		return 0;
+	}
+	ShowInfo("Created Guild %d - %s (Guild Master: %s)\n", g->guild_id, g->name, g->master);
+	
+	//Add to cache
+	idb_put(guild_db_, g->guild_id, g);
+
+	// Report to client
+	mapif_guild_created(fd,account_id,g);
+	mapif_guild_info(fd,g);
+
+	if(log_inter)
+		inter_log("guild %s (id=%d) created by master %s (id=%d)\n",
+			name, g->guild_id, master->name, master->account_id );
+
+	return 0;
 }
 
 // Return guild info to client
 int mapif_parse_GuildInfo(int fd,int guild_id)
 {
-    struct guild *g = inter_guild_fromsql(guild_id);  //We use this because on start-up the info of castle-owned guilds is requied. [Skotlex]
-    if (g) {
-        if (!guild_calcinfo(g))
-            mapif_guild_info(fd,g);
-    } else
-        mapif_guild_noinfo(fd,guild_id); // Failed to load info
-    return 0;
+	struct guild * g = inter_guild_fromsql(guild_id); //We use this because on start-up the info of castle-owned guilds is requied. [Skotlex]
+	if(g)
+	{
+		if (!guild_calcinfo(g))
+			mapif_guild_info(fd,g);
+	}
+	else
+		mapif_guild_noinfo(fd,guild_id); // Failed to load info
+	return 0;
 }
 
 // Add member to guild
 int mapif_parse_GuildAddMember(int fd,int guild_id,struct guild_member *m)
 {
-    struct guild *g;
-    int i;
-
-    g = inter_guild_fromsql(guild_id);
-    if (g==NULL) {
-        // Failed to add
-        mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,1);
-        return 0;
-    }
-
-    // Find an empty slot
-    for (i=0; i<g->max_member; i++) {
-        if (g->member[i].account_id==0) {
-            memcpy(&g->member[i],m,sizeof(struct guild_member));
-            g->member[i].modified = (GS_MEMBER_NEW | GS_MEMBER_MODIFIED);
-            mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,0);
-            if (!guild_calcinfo(g)) //Send members if it was not invoked.
-                mapif_guild_info(-1,g);
-
-            g->save_flag |= GS_MEMBER;
-            if (g->save_flag&GS_REMOVE)
-                g->save_flag&=~GS_REMOVE;
-            return 0;
-        }
-    }
-
-    // Failed to add
-    mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,1);
-    return 0;
+	struct guild * g;
+	int i;
+
+	g = inter_guild_fromsql(guild_id);
+	if(g==NULL){
+		// Failed to add
+		mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,1);
+		return 0;
+	}
+
+	// Find an empty slot
+	for(i=0;i<g->max_member;i++)
+	{
+		if(g->member[i].account_id==0)
+		{
+			memcpy(&g->member[i],m,sizeof(struct guild_member));
+			g->member[i].modified = (GS_MEMBER_NEW | GS_MEMBER_MODIFIED);
+			mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,0);
+			if (!guild_calcinfo(g)) //Send members if it was not invoked.
+				mapif_guild_info(-1,g);
+
+			g->save_flag |= GS_MEMBER;
+			if (g->save_flag&GS_REMOVE)
+				g->save_flag&=~GS_REMOVE;
+			return 0;
+		}
+	}
+
+	// Failed to add
+	mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,1);
+	return 0;
 }
 
 // Delete member from guild
 int mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, int flag, const char *mes)
 {
-    int i, j;
-
-    struct guild *g = inter_guild_fromsql(guild_id);
-    if (g == NULL) {
-        // Unknown guild, just update the player
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id`='0' WHERE `account_id`='%d' AND `char_id`='%d'", char_db, account_id, char_id))
-            Sql_ShowDebug(sql_handle);
-        // mapif_guild_withdraw(guild_id,account_id,char_id,flag,g->member[i].name,mes);
-        return 0;
-    }
-
-    // Find the member
-    ARR_FIND(0, g->max_member, i, g->member[i].account_id == account_id && g->member[i].char_id == char_id);
-    if (i == g->max_member) {
-        //TODO
-        return 0;
-    }
-
-    if (flag) {
-        // Write expulsion reason
-        // Find an empty slot
-        ARR_FIND(0, MAX_GUILDEXPULSION, j, g->expulsion[j].account_id == 0);
-        if (j == MAX_GUILDEXPULSION) {
-            // Expulsion list is full, flush the oldest one
-            for (j = 0; j < MAX_GUILDEXPULSION - 1; j++)
-                g->expulsion[j] = g->expulsion[j+1];
-            j = MAX_GUILDEXPULSION-1;
-        }
-        // Save the expulsion entry
-        g->expulsion[j].account_id = account_id;
-        safestrncpy(g->expulsion[j].name, g->member[i].name, NAME_LENGTH);
-        safestrncpy(g->expulsion[j].mes, mes, 40);
-    }
-
-    mapif_guild_withdraw(guild_id,account_id,char_id,flag,g->member[i].name,mes);
-    inter_guild_removemember_tosql(g->member[i].account_id,g->member[i].char_id);
-
-    memset(&g->member[i],0,sizeof(struct guild_member));
-
-    if (guild_check_empty(g))
-        mapif_parse_BreakGuild(-1,guild_id); //Break the guild.
-    else {
-        //Update member info.
-        if (!guild_calcinfo(g))
-            mapif_guild_info(fd,g);
-        g->save_flag |= GS_EXPULSION;
-    }
-
-    return 0;
+	int i, j;
+
+	struct guild* g = inter_guild_fromsql(guild_id);
+	if( g == NULL )
+	{
+		// Unknown guild, just update the player
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id`='0' WHERE `account_id`='%d' AND `char_id`='%d'", char_db, account_id, char_id) )
+			Sql_ShowDebug(sql_handle);
+		// mapif_guild_withdraw(guild_id,account_id,char_id,flag,g->member[i].name,mes);
+		return 0;
+	}
+
+	// Find the member
+	ARR_FIND( 0, g->max_member, i, g->member[i].account_id == account_id && g->member[i].char_id == char_id );
+	if( i == g->max_member )
+	{
+		//TODO
+		return 0;
+	}
+
+	if( flag )
+	{	// Write expulsion reason
+		// Find an empty slot
+		ARR_FIND( 0, MAX_GUILDEXPULSION, j, g->expulsion[j].account_id == 0 );
+		if( j == MAX_GUILDEXPULSION )
+		{
+			// Expulsion list is full, flush the oldest one
+			for( j = 0; j < MAX_GUILDEXPULSION - 1; j++ )
+				g->expulsion[j] = g->expulsion[j+1];
+			j = MAX_GUILDEXPULSION-1;
+		}
+		// Save the expulsion entry
+		g->expulsion[j].account_id = account_id;
+		safestrncpy(g->expulsion[j].name, g->member[i].name, NAME_LENGTH);
+		safestrncpy(g->expulsion[j].mes, mes, 40);
+	}
+
+	mapif_guild_withdraw(guild_id,account_id,char_id,flag,g->member[i].name,mes);
+	inter_guild_removemember_tosql(g->member[i].account_id,g->member[i].char_id);
+
+	memset(&g->member[i],0,sizeof(struct guild_member));
+
+	if( guild_check_empty(g) )
+		mapif_parse_BreakGuild(-1,guild_id); //Break the guild.
+	else {
+		//Update member info.
+		if (!guild_calcinfo(g))
+			mapif_guild_info(fd,g);
+		g->save_flag |= GS_EXPULSION;
+	}
+
+	return 0;
 }
 
 // Change member info
 int mapif_parse_GuildChangeMemberInfoShort(int fd,int guild_id,int account_id,int char_id,int online,int lv,int class_)
 {
-    // Could speed up by manipulating only guild_member
-    struct guild *g;
-    int i,sum,c;
-    int prev_count, prev_alv;
-
-    g = inter_guild_fromsql(guild_id);
-    if (g==NULL)
-        return 0;
-
-    ARR_FIND(0, g->max_member, i, g->member[i].account_id == account_id && g->member[i].char_id == char_id);
-    if (i < g->max_member) {
-        g->member[i].online = online;
-        g->member[i].lv = lv;
-        g->member[i].class_ = class_;
-        g->member[i].modified = GS_MEMBER_MODIFIED;
-        mapif_guild_memberinfoshort(g,i);
-    }
-
-    prev_count = g->connect_member;
-    prev_alv = g->average_lv;
-
-    g->average_lv = 0;
-    g->connect_member = 0;
-    c = 0;
-    sum = 0;
-
-    for (i = 0; i < g->max_member; i++) {
-        if (g->member[i].account_id > 0) {
-            sum += g->member[i].lv;
-            c++;
-        }
-        if (g->member[i].online)
-            g->connect_member++;
-    }
-
-    if (c) { // this check should always succeed...
-        g->average_lv = sum / c;
-        if (g->connect_member != prev_count || g->average_lv != prev_alv)
-            g->save_flag |= GS_CONNECT;
-        if (g->save_flag & GS_REMOVE)
-            g->save_flag &= ~GS_REMOVE;
-    }
-    g->save_flag |= GS_MEMBER; //Update guild member data
-    return 0;
+	// Could speed up by manipulating only guild_member
+	struct guild * g;
+	int i,sum,c;
+	int prev_count, prev_alv;
+
+	g = inter_guild_fromsql(guild_id);
+	if(g==NULL)
+		return 0;
+	
+	ARR_FIND( 0, g->max_member, i, g->member[i].account_id == account_id && g->member[i].char_id == char_id );
+	if( i < g->max_member )
+	{
+		g->member[i].online = online;
+		g->member[i].lv = lv;
+		g->member[i].class_ = class_;
+		g->member[i].modified = GS_MEMBER_MODIFIED;
+		mapif_guild_memberinfoshort(g,i);
+	}
+
+	prev_count = g->connect_member;
+	prev_alv = g->average_lv;
+
+	g->average_lv = 0;
+	g->connect_member = 0;
+	c = 0;
+	sum = 0;
+
+	for( i = 0; i < g->max_member; i++ )
+	{
+		if( g->member[i].account_id > 0 )
+		{
+			sum += g->member[i].lv;
+			c++;
+		}
+		if( g->member[i].online )
+			g->connect_member++;
+	}
+
+	if( c ) // this check should always succeed...
+	{
+		g->average_lv = sum / c;
+		if( g->connect_member != prev_count || g->average_lv != prev_alv )
+			g->save_flag |= GS_CONNECT;
+		if( g->save_flag & GS_REMOVE )
+			g->save_flag &= ~GS_REMOVE;
+	}
+	g->save_flag |= GS_MEMBER; //Update guild member data
+	return 0;
 }
 
 // BreakGuild
 int mapif_parse_BreakGuild(int fd,int guild_id)
 {
-    struct guild *g;
+	struct guild * g;
+	
+	g = inter_guild_fromsql(guild_id);
+	if(g==NULL)
+		return 0;
 
-    g = inter_guild_fromsql(guild_id);
-    if (g==NULL)
-        return 0;
+	// Delete guild from sql
+	//printf("- Delete guild %d from guild\n",guild_id);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    // Delete guild from sql
-    //printf("- Delete guild %d from guild\n",guild_id);
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_db, guild_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_member_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_member_db, guild_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_castle_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_castle_db, guild_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_storage_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_storage_db, guild_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d' OR `alliance_id` = '%d'", guild_alliance_db, guild_id, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d' OR `alliance_id` = '%d'", guild_alliance_db, guild_id, guild_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_position_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_position_db, guild_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_skill_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_skill_db, guild_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_expulsion_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_expulsion_db, guild_id))
-        Sql_ShowDebug(sql_handle);
+	//printf("- Update guild %d of char\n",guild_id);
+	if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id`='0' WHERE `guild_id`='%d'", char_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
 
-    //printf("- Update guild %d of char\n",guild_id);
-    if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id`='0' WHERE `guild_id`='%d'", char_db, guild_id))
-        Sql_ShowDebug(sql_handle);
+	mapif_guild_broken(guild_id,0);
 
-    mapif_guild_broken(guild_id,0);
+	if(log_inter)
+		inter_log("guild %s (id=%d) broken\n",g->name,guild_id);
 
-    if (log_inter)
-        inter_log("guild %s (id=%d) broken\n",g->name,guild_id);
-
-    //Remove the guild from memory. [Skotlex]
-    idb_remove(guild_db_, guild_id);
-    return 0;
+	//Remove the guild from memory. [Skotlex]
+	idb_remove(guild_db_, guild_id);
+	return 0;
 }
 
 // Forward Guild message to others map servers
 int mapif_parse_GuildMessage(int fd,int guild_id,int account_id,char *mes,int len)
 {
-    return mapif_guild_message(guild_id,account_id,mes,len, fd);
+	return mapif_guild_message(guild_id,account_id,mes,len, fd);
 }
 
-// Modification of the guild
+// Modification of the guild 
 int mapif_parse_GuildBasicInfoChange(int fd,int guild_id,int type,const char *data,int len)
 {
-    struct guild *g;
-    short dw=*((short *)data);
-    g = inter_guild_fromsql(guild_id);
-    if (g==NULL)
-        return 0;
-
-    switch (type) {
-        case GBI_GUILDLV:
-            if (dw>0 && g->guild_lv+dw<=50) {
-                g->guild_lv+=dw;
-                g->skill_point+=dw;
-            } else if (dw<0 && g->guild_lv+dw>=1)
-                g->guild_lv+=dw;
-            mapif_guild_info(-1,g);
-            g->save_flag |= GS_LEVEL;
-            return 0;
-        default:
-            ShowError("int_guild: GuildBasicInfoChange: Unknown type %d\n",type);
-            break;
-    }
-    mapif_guild_basicinfochanged(guild_id,type,data,len);
-    return 0;
+	struct guild * g;
+	short dw=*((short *)data);
+	g = inter_guild_fromsql(guild_id);
+	if(g==NULL)
+		return 0;
+
+	switch(type)
+	{
+		case GBI_GUILDLV:
+			if(dw>0 && g->guild_lv+dw<=50)
+			{
+				g->guild_lv+=dw;
+				g->skill_point+=dw;
+			}
+			else if(dw<0 && g->guild_lv+dw>=1)
+				g->guild_lv+=dw;
+			mapif_guild_info(-1,g);
+			g->save_flag |= GS_LEVEL;
+			return 0;
+		default:
+			ShowError("int_guild: GuildBasicInfoChange: Unknown type %d\n",type);
+			break;
+	}
+	mapif_guild_basicinfochanged(guild_id,type,data,len);
+	return 0;
 }
 
-// Modification of the guild
+// Modification of the guild 
 int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int char_id,int type,const char *data,int len)
 {
-    // Could make some improvement in speed, because only change guild_member
-    int i;
-    struct guild *g;
-
-    g = inter_guild_fromsql(guild_id);
-    if (g==NULL)
-        return 0;
-
-    // Search the member
-    for (i=0; i<g->max_member; i++)
-        if (g->member[i].account_id==account_id &&
-            g->member[i].char_id==char_id)
-            break;
-
-    // Not Found
-    if (i==g->max_member) {
-        ShowWarning("int_guild: GuildMemberChange: Not found %d,%d in guild (%d - %s)\n",
-                    account_id,char_id,guild_id,g->name);
-        return 0;
-    }
-
-    switch (type) {
-        case GMI_POSITION: {
-                g->member[i].position=*((short *)data);
-                g->member[i].modified = GS_MEMBER_MODIFIED;
-                mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
-                g->save_flag |= GS_MEMBER;
-                break;
-            }
-        case GMI_EXP: {
-                // EXP
-                uint64 exp, old_exp=g->member[i].exp;
-                g->member[i].exp=*((uint64 *)data);
-                g->member[i].modified = GS_MEMBER_MODIFIED;
-                if (g->member[i].exp > old_exp) {
-                    exp = g->member[i].exp - old_exp;
-
-                    // Compute gained exp
-                    if (guild_exp_rate != 100)
-                        exp = exp*guild_exp_rate/100;
-
-                    // Update guild exp
-                    if (exp > UINT64_MAX - g->exp)
-                        g->exp = UINT64_MAX;
-                    else
-                        g->exp+=exp;
-
-                    guild_calcinfo(g);
-                    mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,sizeof(g->exp));
-                    g->save_flag |= GS_LEVEL;
-                }
-                mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
-                g->save_flag |= GS_MEMBER;
-                break;
-            }
-        case GMI_HAIR: {
-                g->member[i].hair=*((short *)data);
-                g->member[i].modified = GS_MEMBER_MODIFIED;
-                mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
-                g->save_flag |= GS_MEMBER; //Save new data.
-                break;
-            }
-        case GMI_HAIR_COLOR: {
-                g->member[i].hair_color=*((short *)data);
-                g->member[i].modified = GS_MEMBER_MODIFIED;
-                mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
-                g->save_flag |= GS_MEMBER; //Save new data.
-                break;
-            }
-        case GMI_GENDER: {
-                g->member[i].gender=*((short *)data);
-                g->member[i].modified = GS_MEMBER_MODIFIED;
-                mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
-                g->save_flag |= GS_MEMBER; //Save new data.
-                break;
-            }
-        case GMI_CLASS: {
-                g->member[i].class_=*((short *)data);
-                g->member[i].modified = GS_MEMBER_MODIFIED;
-                mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
-                g->save_flag |= GS_MEMBER; //Save new data.
-                break;
-            }
-        case GMI_LEVEL: {
-                g->member[i].lv=*((short *)data);
-                g->member[i].modified = GS_MEMBER_MODIFIED;
-                mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
-                g->save_flag |= GS_MEMBER; //Save new data.
-                break;
-            }
-        default:
-            ShowError("int_guild: GuildMemberInfoChange: Unknown type %d\n",type);
-            break;
-    }
-    return 0;
+	// Could make some improvement in speed, because only change guild_member
+	int i;
+	struct guild * g;
+
+	g = inter_guild_fromsql(guild_id);
+	if(g==NULL)
+		return 0;
+
+	// Search the member
+	for(i=0;i<g->max_member;i++)
+		if(	g->member[i].account_id==account_id &&
+			g->member[i].char_id==char_id )
+				break;
+
+	// Not Found
+	if(i==g->max_member){
+		ShowWarning("int_guild: GuildMemberChange: Not found %d,%d in guild (%d - %s)\n",
+			account_id,char_id,guild_id,g->name);
+		return 0;
+	}
+
+	switch(type)
+	{
+		case GMI_POSITION:
+		  {
+			g->member[i].position=*((short *)data);
+			g->member[i].modified = GS_MEMBER_MODIFIED;
+			mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+			g->save_flag |= GS_MEMBER;
+			break;
+		  }
+		case GMI_EXP:
+		{	// EXP
+			uint64 exp, old_exp=g->member[i].exp;
+			g->member[i].exp=*((uint64 *)data);
+			g->member[i].modified = GS_MEMBER_MODIFIED;
+			if (g->member[i].exp > old_exp)
+			{
+				exp = g->member[i].exp - old_exp;
+
+				// Compute gained exp
+				if (guild_exp_rate != 100)
+					exp = exp*guild_exp_rate/100;
+
+				// Update guild exp
+				if (exp > UINT64_MAX - g->exp)
+					g->exp = UINT64_MAX;
+				else
+					g->exp+=exp;
+
+				guild_calcinfo(g);
+				mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,sizeof(g->exp));
+				g->save_flag |= GS_LEVEL;
+			}
+			mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+			g->save_flag |= GS_MEMBER;
+			break;
+		}
+		case GMI_HAIR:
+		{
+			g->member[i].hair=*((short *)data);
+			g->member[i].modified = GS_MEMBER_MODIFIED;
+			mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+			g->save_flag |= GS_MEMBER; //Save new data.
+			break;
+		}
+		case GMI_HAIR_COLOR:
+		{
+			g->member[i].hair_color=*((short *)data);
+			g->member[i].modified = GS_MEMBER_MODIFIED;
+			mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+			g->save_flag |= GS_MEMBER; //Save new data.
+			break;
+		}
+		case GMI_GENDER:
+		{
+			g->member[i].gender=*((short *)data);
+			g->member[i].modified = GS_MEMBER_MODIFIED;
+			mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+			g->save_flag |= GS_MEMBER; //Save new data.
+			break;
+		}
+		case GMI_CLASS:
+		{
+			g->member[i].class_=*((short *)data);
+			g->member[i].modified = GS_MEMBER_MODIFIED;
+			mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+			g->save_flag |= GS_MEMBER; //Save new data.
+			break;
+		}
+		case GMI_LEVEL:
+		{
+			g->member[i].lv=*((short *)data);
+			g->member[i].modified = GS_MEMBER_MODIFIED;
+			mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+			g->save_flag |= GS_MEMBER; //Save new data.
+			break;
+		}
+		default:
+		  ShowError("int_guild: GuildMemberInfoChange: Unknown type %d\n",type);
+		  break;
+	}
+	return 0;
 }
 
 int inter_guild_sex_changed(int guild_id,int account_id,int char_id, short gender)
 {
-    return mapif_parse_GuildMemberInfoChange(0, guild_id, account_id, char_id, GMI_GENDER, (const char *)&gender, sizeof(gender));
+	return mapif_parse_GuildMemberInfoChange(0, guild_id, account_id, char_id, GMI_GENDER, (const char*)&gender, sizeof(gender));
 }
 
 int inter_guild_charname_changed(int guild_id,int account_id, int char_id, char *name)
 {
-    struct guild *g;
-    int i, flag = 0;
-
-    g = inter_guild_fromsql(guild_id);
-    if (g == NULL) {
-        ShowError("inter_guild_charrenamed: Can't find guild %d.\n", guild_id);
-        return 0;
-    }
-
-    ARR_FIND(0, g->max_member, i, g->member[i].char_id == char_id);
-    if (i == g->max_member) {
-        ShowError("inter_guild_charrenamed: Can't find character %d in the guild\n", char_id);
-        return 0;
-    }
-
-    if (!strcmp(g->member[i].name, g->master)) {
-        safestrncpy(g->master, name, NAME_LENGTH);
-        flag |= GS_BASIC;
-    }
-    safestrncpy(g->member[i].name, name, NAME_LENGTH);
-    g->member[i].modified = GS_MEMBER_MODIFIED;
-    flag |= GS_MEMBER;
-
-    if (!inter_guild_tosql(g, flag))
-        return 0;
-
-    mapif_guild_info(-1,g);
-
-    return 0;
+	struct guild *g;
+	int i, flag = 0;
+
+	g = inter_guild_fromsql(guild_id);
+	if( g == NULL )
+	{
+		ShowError("inter_guild_charrenamed: Can't find guild %d.\n", guild_id);
+		return 0;
+	}
+
+	ARR_FIND(0, g->max_member, i, g->member[i].char_id == char_id);
+	if( i == g->max_member )
+	{
+		ShowError("inter_guild_charrenamed: Can't find character %d in the guild\n", char_id);
+		return 0;
+	}
+
+	if( !strcmp(g->member[i].name, g->master) )
+	{
+		safestrncpy(g->master, name, NAME_LENGTH);
+		flag |= GS_BASIC;
+	}
+	safestrncpy(g->member[i].name, name, NAME_LENGTH);
+	g->member[i].modified = GS_MEMBER_MODIFIED;
+	flag |= GS_MEMBER;
+
+	if( !inter_guild_tosql(g, flag) )
+		return 0;
+
+	mapif_guild_info(-1,g);
+	
+	return 0;
 }
 
 // Change a position desc
 int mapif_parse_GuildPosition(int fd,int guild_id,int idx,struct guild_position *p)
 {
-    // Could make some improvement in speed, because only change guild_position
-    struct guild *g;
-
-    g = inter_guild_fromsql(guild_id);
-    if (g==NULL || idx<0 || idx>=MAX_GUILDPOSITION)
-        return 0;
-
-    memcpy(&g->position[idx],p,sizeof(struct guild_position));
-    mapif_guild_position(g,idx);
-    g->position[idx].modified = GS_POSITION_MODIFIED;
-    g->save_flag |= GS_POSITION; // Change guild_position
-    return 0;
+	// Could make some improvement in speed, because only change guild_position
+	struct guild * g;
+
+	g = inter_guild_fromsql(guild_id);
+	if(g==NULL || idx<0 || idx>=MAX_GUILDPOSITION)
+		return 0;
+
+	memcpy(&g->position[idx],p,sizeof(struct guild_position));
+	mapif_guild_position(g,idx);
+	g->position[idx].modified = GS_POSITION_MODIFIED;
+	g->save_flag |= GS_POSITION; // Change guild_position
+	return 0;
 }
 
 // Guild Skill UP
 int mapif_parse_GuildSkillUp(int fd,int guild_id,int skill_num,int account_id,int max)
 {
-    struct guild *g;
-    int idx = skill_num - GD_SKILLBASE;
-
-    g = inter_guild_fromsql(guild_id);
-    if (g == NULL || idx < 0 || idx >= MAX_GUILDSKILL)
-        return 0;
-
-    if (g->skill_point>0 && g->skill[idx].id>0 && g->skill[idx].lv<max) {
-        g->skill[idx].lv++;
-        g->skill_point--;
-        if (!guild_calcinfo(g))
-            mapif_guild_info(-1,g);
-        mapif_guild_skillupack(guild_id,skill_num,account_id);
-        g->save_flag |= (GS_LEVEL|GS_SKILL); // Change guild & guild_skill
-    }
-    return 0;
+	struct guild * g;
+	int idx = skill_num - GD_SKILLBASE;
+
+	g = inter_guild_fromsql(guild_id);
+	if(g == NULL || idx < 0 || idx >= MAX_GUILDSKILL)
+		return 0;
+
+	if(g->skill_point>0 && g->skill[idx].id>0 && g->skill[idx].lv<max )
+	{
+		g->skill[idx].lv++;
+		g->skill_point--;
+		if (!guild_calcinfo(g))
+			mapif_guild_info(-1,g);
+		mapif_guild_skillupack(guild_id,skill_num,account_id);
+		g->save_flag |= (GS_LEVEL|GS_SKILL); // Change guild & guild_skill
+	}
+	return 0;
 }
 
 //Manual deletion of an alliance when partnering guild does not exists. [Skotlex]
 static int mapif_parse_GuildDeleteAlliance(struct guild *g, int guild_id, int account_id1, int account_id2, int flag)
 {
-    int i;
-    char name[NAME_LENGTH];
-
-    ARR_FIND(0, MAX_GUILDALLIANCE, i, g->alliance[i].guild_id == guild_id);
-    if (i == MAX_GUILDALLIANCE)
-        return -1;
-
-    strcpy(name, g->alliance[i].name);
-    g->alliance[i].guild_id=0;
-
-    mapif_guild_alliance(g->guild_id,guild_id,account_id1,account_id2,flag,g->name,name);
-    g->save_flag |= GS_ALLIANCE;
-    return 0;
+	int i;
+	char name[NAME_LENGTH];
+
+	ARR_FIND( 0, MAX_GUILDALLIANCE, i, g->alliance[i].guild_id == guild_id );
+	if( i == MAX_GUILDALLIANCE )
+		return -1;
+
+	strcpy(name, g->alliance[i].name);
+	g->alliance[i].guild_id=0;
+	
+	mapif_guild_alliance(g->guild_id,guild_id,account_id1,account_id2,flag,g->name,name);
+	g->save_flag |= GS_ALLIANCE;
+	return 0;
 }
 
 // Alliance modification
 int mapif_parse_GuildAlliance(int fd,int guild_id1,int guild_id2,int account_id1,int account_id2,int flag)
 {
-    // Could speed up
-    struct guild *g[2];
-    int j,i;
-    g[0] = inter_guild_fromsql(guild_id1);
-    g[1] = inter_guild_fromsql(guild_id2);
-
-    if (g[0] && g[1]==NULL && (flag & GUILD_ALLIANCE_REMOVE)) //Requested to remove an alliance with a not found guild.
-        return mapif_parse_GuildDeleteAlliance(g[0], guild_id2, account_id1, account_id2, flag); //Try to do a manual removal of said guild.
-
-    if (g[0]==NULL || g[1]==NULL)
-        return 0;
-
-    if (flag&GUILD_ALLIANCE_REMOVE) {
-        // Remove alliance/opposition, in case of alliance, remove on both side
-        for (i=0; i<2-(flag&GUILD_ALLIANCE_TYPE_MASK); i++) {
-            ARR_FIND(0, MAX_GUILDALLIANCE, j, g[i]->alliance[j].guild_id == g[1-i]->guild_id && g[i]->alliance[j].opposition == (flag&GUILD_ALLIANCE_TYPE_MASK));
-            if (j < MAX_GUILDALLIANCE)
-                g[i]->alliance[j].guild_id = 0;
-        }
-    } else {
-        // Add alliance, in case of alliance, add on both side
-        for (i=0; i<2-(flag&GUILD_ALLIANCE_TYPE_MASK); i++) {
-            // Search an empty slot
-            ARR_FIND(0, MAX_GUILDALLIANCE, j, g[i]->alliance[j].guild_id == 0);
-            if (j < MAX_GUILDALLIANCE) {
-                g[i]->alliance[j].guild_id=g[1-i]->guild_id;
-                memcpy(g[i]->alliance[j].name,g[1-i]->name,NAME_LENGTH);
-                // Set alliance type
-                g[i]->alliance[j].opposition = flag&GUILD_ALLIANCE_TYPE_MASK;
-            }
-        }
-    }
-
-    // Send on all map the new alliance/opposition
-    mapif_guild_alliance(guild_id1,guild_id2,account_id1,account_id2,flag,g[0]->name,g[1]->name);
-
-    // Mark the two guild to be saved
-    g[0]->save_flag |= GS_ALLIANCE;
-    g[1]->save_flag |= GS_ALLIANCE;
-    return 0;
+	// Could speed up
+	struct guild *g[2];
+	int j,i;
+	g[0] = inter_guild_fromsql(guild_id1);
+	g[1] = inter_guild_fromsql(guild_id2);
+
+	if(g[0] && g[1]==NULL && (flag & GUILD_ALLIANCE_REMOVE)) //Requested to remove an alliance with a not found guild.
+		return mapif_parse_GuildDeleteAlliance(g[0], guild_id2,	account_id1, account_id2, flag); //Try to do a manual removal of said guild.
+		
+	if(g[0]==NULL || g[1]==NULL)
+		return 0;
+
+	if(flag&GUILD_ALLIANCE_REMOVE)
+	{
+		// Remove alliance/opposition, in case of alliance, remove on both side
+		for(i=0;i<2-(flag&GUILD_ALLIANCE_TYPE_MASK);i++)
+		{
+			ARR_FIND( 0, MAX_GUILDALLIANCE, j, g[i]->alliance[j].guild_id == g[1-i]->guild_id && g[i]->alliance[j].opposition == (flag&GUILD_ALLIANCE_TYPE_MASK) );
+			if( j < MAX_GUILDALLIANCE )
+				g[i]->alliance[j].guild_id = 0;
+		}
+	}
+	else
+	{
+		// Add alliance, in case of alliance, add on both side
+		for(i=0;i<2-(flag&GUILD_ALLIANCE_TYPE_MASK);i++)
+		{
+			// Search an empty slot
+			ARR_FIND( 0, MAX_GUILDALLIANCE, j, g[i]->alliance[j].guild_id == 0 );
+			if( j < MAX_GUILDALLIANCE )
+			{
+				g[i]->alliance[j].guild_id=g[1-i]->guild_id;
+				memcpy(g[i]->alliance[j].name,g[1-i]->name,NAME_LENGTH);
+				// Set alliance type
+				g[i]->alliance[j].opposition = flag&GUILD_ALLIANCE_TYPE_MASK;
+			}
+		}
+	}
+
+	// Send on all map the new alliance/opposition
+	mapif_guild_alliance(guild_id1,guild_id2,account_id1,account_id2,flag,g[0]->name,g[1]->name);
+
+	// Mark the two guild to be saved
+	g[0]->save_flag |= GS_ALLIANCE;
+	g[1]->save_flag |= GS_ALLIANCE;
+	return 0;
 }
 
 // Change guild message
 int mapif_parse_GuildNotice(int fd,int guild_id,const char *mes1,const char *mes2)
 {
-    struct guild *g;
+	struct guild *g;
 
-    g = inter_guild_fromsql(guild_id);
-    if (g==NULL)
-        return 0;
+	g = inter_guild_fromsql(guild_id);
+	if(g==NULL)
+		return 0;
 
-    memcpy(g->mes1,mes1,MAX_GUILDMES1);
-    memcpy(g->mes2,mes2,MAX_GUILDMES2);
-    g->save_flag |= GS_MES; //Change mes of guild
-    return mapif_guild_notice(g);
+	memcpy(g->mes1,mes1,MAX_GUILDMES1);
+	memcpy(g->mes2,mes2,MAX_GUILDMES2);
+	g->save_flag |= GS_MES;	//Change mes of guild
+	return mapif_guild_notice(g);
 }
 
 int mapif_parse_GuildEmblem(int fd,int len,int guild_id,int dummy,const char *data)
 {
-    struct guild *g;
+	struct guild * g;
 
-    g = inter_guild_fromsql(guild_id);
-    if (g==NULL)
-        return 0;
+	g = inter_guild_fromsql(guild_id);
+	if(g==NULL)
+		return 0;
 
-    if (len > sizeof(g->emblem_data))
-        len = sizeof(g->emblem_data);
+	if (len > sizeof(g->emblem_data))
+		len = sizeof(g->emblem_data);
 
-    memcpy(g->emblem_data,data,len);
-    g->emblem_len=len;
-    g->emblem_id++;
-    g->save_flag |= GS_EMBLEM;  //Change guild
-    return mapif_guild_emblem(g);
+	memcpy(g->emblem_data,data,len);
+	g->emblem_len=len;
+	g->emblem_id++;
+	g->save_flag |= GS_EMBLEM;	//Change guild
+	return mapif_guild_emblem(g);
 }
 
 int mapif_parse_GuildCastleDataLoad(int fd, int len, int *castle_ids)
 {
-    return mapif_guild_castle_dataload(fd, len, castle_ids);
+	return mapif_guild_castle_dataload(fd, len, castle_ids);
 }
 
 int mapif_parse_GuildCastleDataSave(int fd, int castle_id, int index, int value)
 {
-    struct guild_castle *gc = inter_guildcastle_fromsql(castle_id);
-
-    if (gc == NULL) {
-        ShowError("mapif_parse_GuildCastleDataSave: castle id=%d not found\n", castle_id);
-        return 0;
-    }
-
-    switch (index) {
-        case 1:
-            if (log_inter && gc->guild_id != value) {
-                int gid = (value) ? value : gc->guild_id;
-                struct guild *g = idb_get(guild_db_, gid);
-                inter_log("guild %s (id=%d) %s castle id=%d\n",
-                          (g) ? g->name : "??", gid, (value) ? "occupy" : "abandon", castle_id);
-            }
-            gc->guild_id = value;
-            break;
-        case 2:
-            gc->economy = value;
-            break;
-        case 3:
-            gc->defense = value;
-            break;
-        case 4:
-            gc->triggerE = value;
-            break;
-        case 5:
-            gc->triggerD = value;
-            break;
-        case 6:
-            gc->nextTime = value;
-            break;
-        case 7:
-            gc->payTime = value;
-            break;
-        case 8:
-            gc->createTime = value;
-            break;
-        case 9:
-            gc->visibleC = value;
-            break;
-        default:
-            if (index > 9 && index <= 9+MAX_GUARDIANS) {
-                gc->guardian[index-10].visible = value;
-                break;
-            }
-            ShowError("mapif_parse_GuildCastleDataSave: not found index=%d\n", index);
-            return 0;
-    }
-    inter_guildcastle_tosql(gc);
-    return 0;
+	struct guild_castle *gc = inter_guildcastle_fromsql(castle_id);
+
+	if (gc == NULL) {
+		ShowError("mapif_parse_GuildCastleDataSave: castle id=%d not found\n", castle_id);
+		return 0;
+	}
+
+	switch (index) {
+		case 1:
+			if (log_inter && gc->guild_id != value) {
+				int gid = (value) ? value : gc->guild_id;
+				struct guild *g = idb_get(guild_db_, gid);
+				inter_log("guild %s (id=%d) %s castle id=%d\n",
+				          (g) ? g->name : "??", gid, (value) ? "occupy" : "abandon", castle_id);
+			}
+			gc->guild_id = value;
+			break;
+		case 2: gc->economy = value; break;
+		case 3: gc->defense = value; break;
+		case 4: gc->triggerE = value; break;
+		case 5: gc->triggerD = value; break;
+		case 6: gc->nextTime = value; break;
+		case 7: gc->payTime = value; break;
+		case 8: gc->createTime = value; break;
+		case 9: gc->visibleC = value; break;
+		default:
+			if (index > 9 && index <= 9+MAX_GUARDIANS) {
+				gc->guardian[index-10].visible = value;
+				break;
+			}
+			ShowError("mapif_parse_GuildCastleDataSave: not found index=%d\n", index);
+			return 0;
+	}
+	inter_guildcastle_tosql(gc);
+	return 0;
 }
 
-int mapif_parse_GuildMasterChange(int fd, int guild_id, const char *name, int len)
+int mapif_parse_GuildMasterChange(int fd, int guild_id, const char* name, int len)
 {
-    struct guild *g;
-    struct guild_member gm;
-    int pos;
-
-    g = inter_guild_fromsql(guild_id);
-
-    if (g==NULL || len > NAME_LENGTH)
-        return 0;
-
-    // Find member (name)
-    for (pos = 0; pos < g->max_member && strncmp(g->member[pos].name, name, len); pos++);
-
-    if (pos == g->max_member)
-        return 0; //Character not found??
-
-    // Switch current and old GM
-    memcpy(&gm, &g->member[pos], sizeof(struct guild_member));
-    memcpy(&g->member[pos], &g->member[0], sizeof(struct guild_member));
-    memcpy(&g->member[0], &gm, sizeof(struct guild_member));
-
-    // Switch positions
-    g->member[pos].position = g->member[0].position;
-    g->member[pos].modified = GS_MEMBER_MODIFIED;
-    g->member[0].position = 0; //Position 0: guild Master.
-    g->member[0].modified = GS_MEMBER_MODIFIED;
-
-    strncpy(g->master, name, len);
-    if (len < NAME_LENGTH)
-        g->master[len] = '\0';
-
-    ShowInfo("int_guild: Guildmaster Changed to %s (Guild %d - %s)\n",g->master, guild_id, g->name);
-    g->save_flag |= (GS_BASIC|GS_MEMBER); //Save main data and member data.
-    return mapif_guild_master_changed(g, g->member[0].account_id, g->member[0].char_id);
+	struct guild * g;
+	struct guild_member gm;
+	int pos;
+
+	g = inter_guild_fromsql(guild_id);
+	
+	if(g==NULL || len > NAME_LENGTH)
+		return 0;
+	
+	// Find member (name)
+	for (pos = 0; pos < g->max_member && strncmp(g->member[pos].name, name, len); pos++);
+
+	if (pos == g->max_member)
+		return 0; //Character not found??
+	
+	// Switch current and old GM
+	memcpy(&gm, &g->member[pos], sizeof (struct guild_member));
+	memcpy(&g->member[pos], &g->member[0], sizeof(struct guild_member));
+	memcpy(&g->member[0], &gm, sizeof(struct guild_member));
+
+	// Switch positions
+	g->member[pos].position = g->member[0].position;
+	g->member[pos].modified = GS_MEMBER_MODIFIED;
+	g->member[0].position = 0; //Position 0: guild Master.
+	g->member[0].modified = GS_MEMBER_MODIFIED;
+
+	strncpy(g->master, name, len);
+	if (len < NAME_LENGTH)
+		g->master[len] = '\0';
+
+	ShowInfo("int_guild: Guildmaster Changed to %s (Guild %d - %s)\n",g->master, guild_id, g->name);
+	g->save_flag |= (GS_BASIC|GS_MEMBER); //Save main data and member data.
+	return mapif_guild_master_changed(g, g->member[0].account_id, g->member[0].char_id);
 }
 
 // Communication from the map server
@@ -1814,78 +1842,44 @@ int mapif_parse_GuildMasterChange(int fd, int guild_id, const char *name, int le
 // Data packet length that you set to inter.c
 //- Shouldn't do checking and packet length, RFIFOSKIP is done by the caller
 // Must Return
-//  1 : ok
+//	1 : ok
 //  0 : error
 int inter_guild_parse_frommap(int fd)
 {
-    RFIFOHEAD(fd);
-    switch (RFIFOW(fd,0)) {
-        case 0x3030:
-            mapif_parse_CreateGuild(fd,RFIFOL(fd,4),(char *)RFIFOP(fd,8),(struct guild_member *)RFIFOP(fd,32));
-            break;
-        case 0x3031:
-            mapif_parse_GuildInfo(fd,RFIFOL(fd,2));
-            break;
-        case 0x3032:
-            mapif_parse_GuildAddMember(fd,RFIFOL(fd,4),(struct guild_member *)RFIFOP(fd,8));
-            break;
-        case 0x3033:
-            mapif_parse_GuildMasterChange(fd,RFIFOL(fd,4),(const char *)RFIFOP(fd,8),RFIFOW(fd,2)-8);
-            break;
-        case 0x3034:
-            mapif_parse_GuildLeave(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),(const char *)RFIFOP(fd,15));
-            break;
-        case 0x3035:
-            mapif_parse_GuildChangeMemberInfoShort(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOW(fd,17));
-            break;
-        case 0x3036:
-            mapif_parse_BreakGuild(fd,RFIFOL(fd,2));
-            break;
-        case 0x3037:
-            mapif_parse_GuildMessage(fd,RFIFOL(fd,4),RFIFOL(fd,8),(char *)RFIFOP(fd,12),RFIFOW(fd,2)-12);
-            break;
-        case 0x3039:
-            mapif_parse_GuildBasicInfoChange(fd,RFIFOL(fd,4),RFIFOW(fd,8),(const char *)RFIFOP(fd,10),RFIFOW(fd,2)-10);
-            break;
-        case 0x303A:
-            mapif_parse_GuildMemberInfoChange(fd,RFIFOL(fd,4),RFIFOL(fd,8),RFIFOL(fd,12),RFIFOW(fd,16),(const char *)RFIFOP(fd,18),RFIFOW(fd,2)-18);
-            break;
-        case 0x303B:
-            mapif_parse_GuildPosition(fd,RFIFOL(fd,4),RFIFOL(fd,8),(struct guild_position *)RFIFOP(fd,12));
-            break;
-        case 0x303C:
-            mapif_parse_GuildSkillUp(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOL(fd,14));
-            break;
-        case 0x303D:
-            mapif_parse_GuildAlliance(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOL(fd,14),RFIFOB(fd,18));
-            break;
-        case 0x303E:
-            mapif_parse_GuildNotice(fd,RFIFOL(fd,2),(const char *)RFIFOP(fd,6),(const char *)RFIFOP(fd,66));
-            break;
-        case 0x303F:
-            mapif_parse_GuildEmblem(fd,RFIFOW(fd,2)-12,RFIFOL(fd,4),RFIFOL(fd,8),(const char *)RFIFOP(fd,12));
-            break;
-        case 0x3040:
-            mapif_parse_GuildCastleDataLoad(fd,RFIFOW(fd,2),(int *)RFIFOP(fd,4));
-            break;
-        case 0x3041:
-            mapif_parse_GuildCastleDataSave(fd,RFIFOW(fd,2),RFIFOB(fd,4),RFIFOL(fd,5));
-            break;
-
-        default:
-            return 0;
-    }
-
-    return 1;
+	RFIFOHEAD(fd);
+	switch(RFIFOW(fd,0)) {
+	case 0x3030: mapif_parse_CreateGuild(fd,RFIFOL(fd,4),(char*)RFIFOP(fd,8),(struct guild_member *)RFIFOP(fd,32)); break;
+	case 0x3031: mapif_parse_GuildInfo(fd,RFIFOL(fd,2)); break;
+	case 0x3032: mapif_parse_GuildAddMember(fd,RFIFOL(fd,4),(struct guild_member *)RFIFOP(fd,8)); break;
+	case 0x3033: mapif_parse_GuildMasterChange(fd,RFIFOL(fd,4),(const char*)RFIFOP(fd,8),RFIFOW(fd,2)-8); break;
+	case 0x3034: mapif_parse_GuildLeave(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),(const char*)RFIFOP(fd,15)); break;
+	case 0x3035: mapif_parse_GuildChangeMemberInfoShort(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOW(fd,17)); break;
+	case 0x3036: mapif_parse_BreakGuild(fd,RFIFOL(fd,2)); break;
+	case 0x3037: mapif_parse_GuildMessage(fd,RFIFOL(fd,4),RFIFOL(fd,8),(char*)RFIFOP(fd,12),RFIFOW(fd,2)-12); break;
+	case 0x3039: mapif_parse_GuildBasicInfoChange(fd,RFIFOL(fd,4),RFIFOW(fd,8),(const char*)RFIFOP(fd,10),RFIFOW(fd,2)-10); break;
+	case 0x303A: mapif_parse_GuildMemberInfoChange(fd,RFIFOL(fd,4),RFIFOL(fd,8),RFIFOL(fd,12),RFIFOW(fd,16),(const char*)RFIFOP(fd,18),RFIFOW(fd,2)-18); break;
+	case 0x303B: mapif_parse_GuildPosition(fd,RFIFOL(fd,4),RFIFOL(fd,8),(struct guild_position *)RFIFOP(fd,12)); break;
+	case 0x303C: mapif_parse_GuildSkillUp(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOL(fd,14)); break;
+	case 0x303D: mapif_parse_GuildAlliance(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOL(fd,14),RFIFOB(fd,18)); break;
+	case 0x303E: mapif_parse_GuildNotice(fd,RFIFOL(fd,2),(const char*)RFIFOP(fd,6),(const char*)RFIFOP(fd,66)); break;
+	case 0x303F: mapif_parse_GuildEmblem(fd,RFIFOW(fd,2)-12,RFIFOL(fd,4),RFIFOL(fd,8),(const char*)RFIFOP(fd,12)); break;
+	case 0x3040: mapif_parse_GuildCastleDataLoad(fd,RFIFOW(fd,2),(int *)RFIFOP(fd,4)); break;
+	case 0x3041: mapif_parse_GuildCastleDataSave(fd,RFIFOW(fd,2),RFIFOB(fd,4),RFIFOL(fd,5)); break;
+
+	default:
+		return 0;
+	}
+
+	return 1;
 }
 
 //Leave request from the server (for deleting character from guild)
 int inter_guild_leave(int guild_id, int account_id, int char_id)
 {
-    return mapif_parse_GuildLeave(-1, guild_id, account_id, char_id, 0, "** Character Deleted **");
+	return mapif_parse_GuildLeave(-1, guild_id, account_id, char_id, 0, "** Character Deleted **");
 }
 
 int inter_guild_broken(int guild_id)
 {
-    return mapif_guild_broken(guild_id, 0);
+	return mapif_guild_broken(guild_id, 0);
 }
diff --git a/src/char/int_guild.h b/src/char/int_guild.h
index 5bc3c2fe3..47c42dcc5 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.h
@@ -5,19 +5,19 @@
 #define _INT_GUILD_SQL_H_
 
 enum {
-    GS_BASIC = 0x0001,
-    GS_MEMBER = 0x0002,
-    GS_POSITION = 0x0004,
-    GS_ALLIANCE = 0x0008,
-    GS_EXPULSION = 0x0010,
-    GS_SKILL = 0x0020,
-    GS_EMBLEM = 0x0040,
-    GS_CONNECT = 0x0080,
-    GS_LEVEL = 0x0100,
-    GS_MES = 0x0200,
-    GS_MASK = 0x03FF,
-    GS_BASIC_MASK = (GS_BASIC | GS_EMBLEM | GS_CONNECT | GS_LEVEL | GS_MES),
-    GS_REMOVE = 0x8000,
+	GS_BASIC = 0x0001,
+	GS_MEMBER = 0x0002,
+	GS_POSITION = 0x0004,
+	GS_ALLIANCE = 0x0008,
+	GS_EXPULSION = 0x0010,
+	GS_SKILL = 0x0020,
+	GS_EMBLEM = 0x0040,
+	GS_CONNECT = 0x0080,
+	GS_LEVEL = 0x0100,
+	GS_MES = 0x0200,
+	GS_MASK = 0x03FF,
+	GS_BASIC_MASK = (GS_BASIC | GS_EMBLEM | GS_CONNECT | GS_LEVEL | GS_MES),
+	GS_REMOVE = 0x8000,
 };
 
 struct guild;
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 5676556f4..933661954 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -18,281 +18,279 @@
 
 int inter_homunculus_sql_init(void)
 {
-    return 0;
+	return 0;
 }
 void inter_homunculus_sql_final(void)
 {
-    return;
+	return;
 }
 
 static void mapif_homunculus_created(int fd, int account_id, struct s_homunculus *sh, unsigned char flag)
 {
-    WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
-    WFIFOW(fd,0) = 0x3890;
-    WFIFOW(fd,2) = sizeof(struct s_homunculus)+9;
-    WFIFOL(fd,4) = account_id;
-    WFIFOB(fd,8)= flag;
-    memcpy(WFIFOP(fd,9),sh,sizeof(struct s_homunculus));
-    WFIFOSET(fd, WFIFOW(fd,2));
+	WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
+	WFIFOW(fd,0) = 0x3890;
+	WFIFOW(fd,2) = sizeof(struct s_homunculus)+9;
+	WFIFOL(fd,4) = account_id;
+	WFIFOB(fd,8)= flag;
+	memcpy(WFIFOP(fd,9),sh,sizeof(struct s_homunculus));
+	WFIFOSET(fd, WFIFOW(fd,2));
 }
 
 static void mapif_homunculus_deleted(int fd, int flag)
 {
-    WFIFOHEAD(fd, 3);
-    WFIFOW(fd, 0) = 0x3893;
-    WFIFOB(fd,2) = flag; //Flag 1 = success
-    WFIFOSET(fd, 3);
+	WFIFOHEAD(fd, 3);
+	WFIFOW(fd, 0) = 0x3893;
+	WFIFOB(fd,2) = flag; //Flag 1 = success
+	WFIFOSET(fd, 3);
 }
 
 static void mapif_homunculus_loaded(int fd, int account_id, struct s_homunculus *hd)
 {
-    WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
-    WFIFOW(fd,0) = 0x3891;
-    WFIFOW(fd,2) = sizeof(struct s_homunculus)+9;
-    WFIFOL(fd,4) = account_id;
-    if (hd != NULL) {
-        WFIFOB(fd,8) = 1; // success
-        memcpy(WFIFOP(fd,9), hd, sizeof(struct s_homunculus));
-    } else {
-        WFIFOB(fd,8) = 0; // not found.
-        memset(WFIFOP(fd,9), 0, sizeof(struct s_homunculus));
-    }
-    WFIFOSET(fd, sizeof(struct s_homunculus)+9);
+	WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
+	WFIFOW(fd,0) = 0x3891;
+	WFIFOW(fd,2) = sizeof(struct s_homunculus)+9;
+	WFIFOL(fd,4) = account_id;
+	if( hd != NULL )
+	{
+		WFIFOB(fd,8) = 1; // success
+		memcpy(WFIFOP(fd,9), hd, sizeof(struct s_homunculus));
+	}
+	else
+	{
+		WFIFOB(fd,8) = 0; // not found.
+		memset(WFIFOP(fd,9), 0, sizeof(struct s_homunculus));
+	}
+	WFIFOSET(fd, sizeof(struct s_homunculus)+9);
 }
 
 static void mapif_homunculus_saved(int fd, int account_id, bool flag)
 {
-    WFIFOHEAD(fd, 7);
-    WFIFOW(fd,0) = 0x3892;
-    WFIFOL(fd,2) = account_id;
-    WFIFOB(fd,6) = flag; // 1:success, 0:failure
-    WFIFOSET(fd, 7);
+	WFIFOHEAD(fd, 7);
+	WFIFOW(fd,0) = 0x3892;
+	WFIFOL(fd,2) = account_id;
+	WFIFOB(fd,6) = flag; // 1:success, 0:failure
+	WFIFOSET(fd, 7);
 }
 
-static void mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned char flag, char *name)
+static void mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned char flag, char* name)
 {
-    WFIFOHEAD(fd, NAME_LENGTH+12);
-    WFIFOW(fd, 0) = 0x3894;
-    WFIFOL(fd, 2) = account_id;
-    WFIFOL(fd, 6) = char_id;
-    WFIFOB(fd,10) = flag;
-    safestrncpy((char *)WFIFOP(fd,11), name, NAME_LENGTH);
-    WFIFOSET(fd, NAME_LENGTH+12);
+	WFIFOHEAD(fd, NAME_LENGTH+12);
+	WFIFOW(fd, 0) = 0x3894;
+	WFIFOL(fd, 2) = account_id;
+	WFIFOL(fd, 6) = char_id;
+	WFIFOB(fd,10) = flag;
+	safestrncpy((char*)WFIFOP(fd,11), name, NAME_LENGTH);
+	WFIFOSET(fd, NAME_LENGTH+12);
 }
 
-bool mapif_homunculus_save(struct s_homunculus *hd)
+bool mapif_homunculus_save(struct s_homunculus* hd)
 {
-    bool flag = true;
-    char esc_name[NAME_LENGTH*2+1];
-
-    Sql_EscapeStringLen(sql_handle, esc_name, hd->name, strnlen(hd->name, NAME_LENGTH));
-
-    if (hd->hom_id == 0) {
-        // new homunculus
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
-                                   "(`char_id`, `class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`, `rename_flag`, `vaporize`) "
-                                   "VALUES ('%d', '%d', '%d', '%s', '%d', '%u', '%u', '%d', '%d', %d, '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-                                   homunculus_db, hd->char_id, hd->class_, hd->prev_class, esc_name, hd->level, hd->exp, hd->intimacy, hd->hunger, hd->str, hd->agi, hd->vit, hd->int_, hd->dex, hd->luk,
-                                   hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize)) {
-            Sql_ShowDebug(sql_handle);
-            flag = false;
-        } else {
-            hd->hom_id = (int)Sql_LastInsertId(sql_handle);
-        }
-    } else {
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `char_id`='%d', `class`='%d',`prev_class`='%d',`name`='%s',`level`='%d',`exp`='%u',`intimacy`='%u',`hunger`='%d', `str`='%d', `agi`='%d', `vit`='%d', `int`='%d', `dex`='%d', `luk`='%d', `hp`='%d',`max_hp`='%d',`sp`='%d',`max_sp`='%d',`skill_point`='%d', `rename_flag`='%d', `vaporize`='%d' WHERE `homun_id`='%d'",
-                                   homunculus_db, hd->char_id, hd->class_, hd->prev_class, esc_name, hd->level, hd->exp, hd->intimacy, hd->hunger, hd->str, hd->agi, hd->vit, hd->int_, hd->dex, hd->luk,
-                                   hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize, hd->hom_id)) {
-            Sql_ShowDebug(sql_handle);
-            flag = false;
-        } else {
-            SqlStmt *stmt;
-            int i;
-
-            stmt = SqlStmt_Malloc(sql_handle);
-            if (SQL_ERROR == SqlStmt_Prepare(stmt, "REPLACE INTO `%s` (`homun_id`, `id`, `lv`) VALUES (%d, ?, ?)", skill_homunculus_db, hd->hom_id))
-                SqlStmt_ShowDebug(stmt);
-            for (i = 0; i < MAX_HOMUNSKILL; ++i) {
-                if (hd->hskill[i].id > 0 && hd->hskill[i].lv != 0) {
-                    SqlStmt_BindParam(stmt, 0, SQLDT_USHORT, &hd->hskill[i].id, 0);
-                    SqlStmt_BindParam(stmt, 1, SQLDT_USHORT, &hd->hskill[i].lv, 0);
-                    if (SQL_ERROR == SqlStmt_Execute(stmt)) {
-                        SqlStmt_ShowDebug(stmt);
-                        SqlStmt_Free(stmt);
-                        flag = false;
-                        break;
-                    }
-                }
-            }
-            SqlStmt_Free(stmt);
-        }
-    }
-
-    return flag;
+	bool flag = true;
+	char esc_name[NAME_LENGTH*2+1];
+
+	Sql_EscapeStringLen(sql_handle, esc_name, hd->name, strnlen(hd->name, NAME_LENGTH));
+
+	if( hd->hom_id == 0 )
+	{// new homunculus
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
+			"(`char_id`, `class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`, `rename_flag`, `vaporize`) "
+			"VALUES ('%d', '%d', '%d', '%s', '%d', '%u', '%u', '%d', '%d', %d, '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
+			homunculus_db, hd->char_id, hd->class_, hd->prev_class, esc_name, hd->level, hd->exp, hd->intimacy, hd->hunger, hd->str, hd->agi, hd->vit, hd->int_, hd->dex, hd->luk,
+			hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize) )
+		{
+			Sql_ShowDebug(sql_handle);
+			flag = false;
+		}
+		else
+		{
+			hd->hom_id = (int)Sql_LastInsertId(sql_handle);
+		}
+	}
+	else
+	{
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `char_id`='%d', `class`='%d',`prev_class`='%d',`name`='%s',`level`='%d',`exp`='%u',`intimacy`='%u',`hunger`='%d', `str`='%d', `agi`='%d', `vit`='%d', `int`='%d', `dex`='%d', `luk`='%d', `hp`='%d',`max_hp`='%d',`sp`='%d',`max_sp`='%d',`skill_point`='%d', `rename_flag`='%d', `vaporize`='%d' WHERE `homun_id`='%d'",
+			homunculus_db, hd->char_id, hd->class_, hd->prev_class, esc_name, hd->level, hd->exp, hd->intimacy, hd->hunger, hd->str, hd->agi, hd->vit, hd->int_, hd->dex, hd->luk,
+			hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize, hd->hom_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			flag = false;
+		}
+		else
+		{
+			SqlStmt* stmt;
+			int i;
+
+			stmt = SqlStmt_Malloc(sql_handle);
+			if( SQL_ERROR == SqlStmt_Prepare(stmt, "REPLACE INTO `%s` (`homun_id`, `id`, `lv`) VALUES (%d, ?, ?)", skill_homunculus_db, hd->hom_id) )
+				SqlStmt_ShowDebug(stmt);
+			for( i = 0; i < MAX_HOMUNSKILL; ++i )
+			{
+				if( hd->hskill[i].id > 0 && hd->hskill[i].lv != 0 )
+				{
+					SqlStmt_BindParam(stmt, 0, SQLDT_USHORT, &hd->hskill[i].id, 0);
+					SqlStmt_BindParam(stmt, 1, SQLDT_USHORT, &hd->hskill[i].lv, 0);
+					if( SQL_ERROR == SqlStmt_Execute(stmt) )
+					{
+						SqlStmt_ShowDebug(stmt);
+						SqlStmt_Free(stmt);
+						flag = false;
+						break;
+					}
+				}
+			}
+			SqlStmt_Free(stmt);
+		}
+	}
+
+	return flag;
 }
 
 
 
 // Load an homunculus
-bool mapif_homunculus_load(int homun_id, struct s_homunculus *hd)
+bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd)
 {
-    int i;
-    char *data;
-    size_t len;
-
-    memset(hd, 0, sizeof(*hd));
-
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `homun_id`,`char_id`,`class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`,`rename_flag`, `vaporize` FROM `%s` WHERE `homun_id`='%u'", homunculus_db, homun_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
-
-    if (!Sql_NumRows(sql_handle)) {
-        //No homunculus found.
-        Sql_FreeResult(sql_handle);
-        return false;
-    }
-    if (SQL_SUCCESS != Sql_NextRow(sql_handle)) {
-        Sql_ShowDebug(sql_handle);
-        Sql_FreeResult(sql_handle);
-        return false;
-    }
-
-    hd->hom_id = homun_id;
-    Sql_GetData(sql_handle,  1, &data, NULL);
-    hd->char_id = atoi(data);
-    Sql_GetData(sql_handle,  2, &data, NULL);
-    hd->class_ = atoi(data);
-    Sql_GetData(sql_handle,  3, &data, NULL);
-    hd->prev_class = atoi(data);
-    Sql_GetData(sql_handle,  4, &data, &len);
-    safestrncpy(hd->name, data, sizeof(hd->name));
-    Sql_GetData(sql_handle,  5, &data, NULL);
-    hd->level = atoi(data);
-    Sql_GetData(sql_handle,  6, &data, NULL);
-    hd->exp = atoi(data);
-    Sql_GetData(sql_handle,  7, &data, NULL);
-    hd->intimacy = (unsigned int)strtoul(data, NULL, 10);
-    Sql_GetData(sql_handle,  8, &data, NULL);
-    hd->hunger = atoi(data);
-    Sql_GetData(sql_handle,  9, &data, NULL);
-    hd->str = atoi(data);
-    Sql_GetData(sql_handle, 10, &data, NULL);
-    hd->agi = atoi(data);
-    Sql_GetData(sql_handle, 11, &data, NULL);
-    hd->vit = atoi(data);
-    Sql_GetData(sql_handle, 12, &data, NULL);
-    hd->int_ = atoi(data);
-    Sql_GetData(sql_handle, 13, &data, NULL);
-    hd->dex = atoi(data);
-    Sql_GetData(sql_handle, 14, &data, NULL);
-    hd->luk = atoi(data);
-    Sql_GetData(sql_handle, 15, &data, NULL);
-    hd->hp = atoi(data);
-    Sql_GetData(sql_handle, 16, &data, NULL);
-    hd->max_hp = atoi(data);
-    Sql_GetData(sql_handle, 17, &data, NULL);
-    hd->sp = atoi(data);
-    Sql_GetData(sql_handle, 18, &data, NULL);
-    hd->max_sp = atoi(data);
-    Sql_GetData(sql_handle, 19, &data, NULL);
-    hd->skillpts = atoi(data);
-    Sql_GetData(sql_handle, 20, &data, NULL);
-    hd->rename_flag = atoi(data);
-    Sql_GetData(sql_handle, 21, &data, NULL);
-    hd->vaporize = atoi(data);
-    Sql_FreeResult(sql_handle);
-
-    hd->intimacy = cap_value(hd->intimacy, 0, 100000);
-    hd->hunger = cap_value(hd->hunger, 0, 100);
-
-    // Load Homunculus Skill
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `id`,`lv` FROM `%s` WHERE `homun_id`=%d", skill_homunculus_db, homun_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
-    while (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        // id
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        i = atoi(data);
-        if (i < HM_SKILLBASE || i >= HM_SKILLBASE + MAX_HOMUNSKILL)
-            continue;// invalid skill id
-        i = i - HM_SKILLBASE;
-        hd->hskill[i].id = (unsigned short)atoi(data);
-
-        // lv
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        hd->hskill[i].lv = (unsigned char)atoi(data);
-    }
-    Sql_FreeResult(sql_handle);
-
-    if (save_log)
-        ShowInfo("Homunculus loaded (%d - %s).\n", hd->hom_id, hd->name);
-
-    return true;
+	int i;
+	char* data;
+	size_t len;
+
+	memset(hd, 0, sizeof(*hd));
+
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `homun_id`,`char_id`,`class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`,`rename_flag`, `vaporize` FROM `%s` WHERE `homun_id`='%u'", homunculus_db, homun_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+
+	if( !Sql_NumRows(sql_handle) )
+	{	//No homunculus found.
+		Sql_FreeResult(sql_handle);
+		return false;
+	}
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	{
+		Sql_ShowDebug(sql_handle);
+		Sql_FreeResult(sql_handle);
+		return false;
+	}
+
+	hd->hom_id = homun_id;
+	Sql_GetData(sql_handle,  1, &data, NULL); hd->char_id = atoi(data);
+	Sql_GetData(sql_handle,  2, &data, NULL); hd->class_ = atoi(data);
+	Sql_GetData(sql_handle,  3, &data, NULL); hd->prev_class = atoi(data);
+	Sql_GetData(sql_handle,  4, &data, &len); safestrncpy(hd->name, data, sizeof(hd->name));
+	Sql_GetData(sql_handle,  5, &data, NULL); hd->level = atoi(data);
+	Sql_GetData(sql_handle,  6, &data, NULL); hd->exp = atoi(data);
+	Sql_GetData(sql_handle,  7, &data, NULL); hd->intimacy = (unsigned int)strtoul(data, NULL, 10);
+	Sql_GetData(sql_handle,  8, &data, NULL); hd->hunger = atoi(data);
+	Sql_GetData(sql_handle,  9, &data, NULL); hd->str = atoi(data);
+	Sql_GetData(sql_handle, 10, &data, NULL); hd->agi = atoi(data);
+	Sql_GetData(sql_handle, 11, &data, NULL); hd->vit = atoi(data);
+	Sql_GetData(sql_handle, 12, &data, NULL); hd->int_ = atoi(data);
+	Sql_GetData(sql_handle, 13, &data, NULL); hd->dex = atoi(data);
+	Sql_GetData(sql_handle, 14, &data, NULL); hd->luk = atoi(data);
+	Sql_GetData(sql_handle, 15, &data, NULL); hd->hp = atoi(data);
+	Sql_GetData(sql_handle, 16, &data, NULL); hd->max_hp = atoi(data);
+	Sql_GetData(sql_handle, 17, &data, NULL); hd->sp = atoi(data);
+	Sql_GetData(sql_handle, 18, &data, NULL); hd->max_sp = atoi(data);
+	Sql_GetData(sql_handle, 19, &data, NULL); hd->skillpts = atoi(data);
+	Sql_GetData(sql_handle, 20, &data, NULL); hd->rename_flag = atoi(data);
+	Sql_GetData(sql_handle, 21, &data, NULL); hd->vaporize = atoi(data);
+	Sql_FreeResult(sql_handle);
+
+	hd->intimacy = cap_value(hd->intimacy, 0, 100000);
+	hd->hunger = cap_value(hd->hunger, 0, 100);
+
+	// Load Homunculus Skill
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `id`,`lv` FROM `%s` WHERE `homun_id`=%d", skill_homunculus_db, homun_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+	while( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		// id
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		i = atoi(data);
+		if( i < HM_SKILLBASE || i >= HM_SKILLBASE + MAX_HOMUNSKILL )
+			continue;// invalid skill id
+		i = i - HM_SKILLBASE;
+		hd->hskill[i].id = (unsigned short)atoi(data);
+
+		// lv
+		Sql_GetData(sql_handle, 1, &data, NULL);
+		hd->hskill[i].lv = (unsigned char)atoi(data);
+	}
+	Sql_FreeResult(sql_handle);
+
+	if( save_log )
+		ShowInfo("Homunculus loaded (%d - %s).\n", hd->hom_id, hd->name);
+
+	return true;
 }
 
 bool mapif_homunculus_delete(int homun_id)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `homun_id` = '%u'", homunculus_db, homun_id)
-        ||  SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `homun_id` = '%u'", skill_homunculus_db, homun_id)
-       ) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
-    return true;
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `homun_id` = '%u'", homunculus_db, homun_id)
+	||	SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `homun_id` = '%u'", skill_homunculus_db, homun_id)
+	) {
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+	return true;
 }
 
 bool mapif_homunculus_rename(char *name)
 {
-    int i;
-
-    // Check Authorised letters/symbols in the name of the homun
-    if (char_name_option == 1) {
-        // only letters/symbols in char_name_letters are authorised
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) == NULL)
-                return false;
-    } else if (char_name_option == 2) {
-        // letters/symbols in char_name_letters are forbidden
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) != NULL)
-                return false;
-    }
-
-    return true;
+	int i;
+
+	// Check Authorised letters/symbols in the name of the homun
+	if( char_name_option == 1 )
+	{// only letters/symbols in char_name_letters are authorised
+		for( i = 0; i < NAME_LENGTH && name[i]; i++ )
+			if( strchr(char_name_letters, name[i]) == NULL )
+				return false;
+	} else
+	if( char_name_option == 2 )
+	{// letters/symbols in char_name_letters are forbidden
+		for( i = 0; i < NAME_LENGTH && name[i]; i++ )
+			if( strchr(char_name_letters, name[i]) != NULL )
+				return false;
+	}
+
+	return true;
 }
 
 
-static void mapif_parse_homunculus_create(int fd, int len, int account_id, struct s_homunculus *phd)
+static void mapif_parse_homunculus_create(int fd, int len, int account_id, struct s_homunculus* phd)
 {
-    bool result = mapif_homunculus_save(phd);
-    mapif_homunculus_created(fd, account_id, phd, result);
+	bool result = mapif_homunculus_save(phd);
+	mapif_homunculus_created(fd, account_id, phd, result);
 }
 
 static void mapif_parse_homunculus_delete(int fd, int homun_id)
 {
-    bool result = mapif_homunculus_delete(homun_id);
-    mapif_homunculus_deleted(fd, result);
+	bool result = mapif_homunculus_delete(homun_id);
+	mapif_homunculus_deleted(fd, result);
 }
 
 static void mapif_parse_homunculus_load(int fd, int account_id, int homun_id)
 {
-    struct s_homunculus hd;
-    bool result = mapif_homunculus_load(homun_id, &hd);
-    mapif_homunculus_loaded(fd, account_id, (result ? &hd : NULL));
+	struct s_homunculus hd;
+	bool result = mapif_homunculus_load(homun_id, &hd);
+	mapif_homunculus_loaded(fd, account_id, ( result ? &hd : NULL ));
 }
 
-static void mapif_parse_homunculus_save(int fd, int len, int account_id, struct s_homunculus *phd)
+static void mapif_parse_homunculus_save(int fd, int len, int account_id, struct s_homunculus* phd)
 {
-    bool result = mapif_homunculus_save(phd);
-    mapif_homunculus_saved(fd, account_id, result);
+	bool result = mapif_homunculus_save(phd);
+	mapif_homunculus_saved(fd, account_id, result);
 }
 
-static void mapif_parse_homunculus_rename(int fd, int account_id, int char_id, char *name)
+static void mapif_parse_homunculus_rename(int fd, int account_id, int char_id, char* name)
 {
-    bool result = mapif_homunculus_rename(name);
-    mapif_homunculus_renamed(fd, account_id, char_id, result, name);
+	bool result = mapif_homunculus_rename(name);
+	mapif_homunculus_renamed(fd, account_id, char_id, result, name);
 }
 
 /*==========================================
@@ -300,26 +298,17 @@ static void mapif_parse_homunculus_rename(int fd, int account_id, int char_id, c
  *------------------------------------------*/
 int inter_homunculus_parse_frommap(int fd)
 {
-    unsigned short cmd = RFIFOW(fd,0);
-
-    switch (cmd) {
-        case 0x3090:
-            mapif_parse_homunculus_create(fd, (int)RFIFOW(fd,2), (int)RFIFOL(fd,4), (struct s_homunculus *)RFIFOP(fd,8));
-            break;
-        case 0x3091:
-            mapif_parse_homunculus_load(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6));
-            break;
-        case 0x3092:
-            mapif_parse_homunculus_save(fd, (int)RFIFOW(fd,2), (int)RFIFOL(fd,4), (struct s_homunculus *)RFIFOP(fd,8));
-            break;
-        case 0x3093:
-            mapif_parse_homunculus_delete(fd, (int)RFIFOL(fd,2));
-            break;
-        case 0x3094:
-            mapif_parse_homunculus_rename(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6), (char *)RFIFOP(fd,10));
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+	unsigned short cmd = RFIFOW(fd,0);
+
+	switch( cmd )
+	{
+		case 0x3090: mapif_parse_homunculus_create(fd, (int)RFIFOW(fd,2), (int)RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,8)); break;
+		case 0x3091: mapif_parse_homunculus_load  (fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6)); break;
+		case 0x3092: mapif_parse_homunculus_save  (fd, (int)RFIFOW(fd,2), (int)RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,8)); break;
+		case 0x3093: mapif_parse_homunculus_delete(fd, (int)RFIFOL(fd,2)); break;
+		case 0x3094: mapif_parse_homunculus_rename(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6), (char*)RFIFOP(fd,10)); break;
+		default:
+			return 0;
+	}
+	return 1;
 }
diff --git a/src/char/int_homun.h b/src/char/int_homun.h
index e7976d51a..1c0d76269 100644
--- a/src/char/int_homun.h
+++ b/src/char/int_homun.h
@@ -10,8 +10,8 @@ int inter_homunculus_sql_init(void);
 void inter_homunculus_sql_final(void);
 int inter_homunculus_parse_frommap(int fd);
 
-bool mapif_homunculus_save(struct s_homunculus *hd);
-bool mapif_homunculus_load(int homun_id, struct s_homunculus *hd);
+bool mapif_homunculus_save(struct s_homunculus* hd);
+bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd);
 bool mapif_homunculus_delete(int homun_id);
 bool mapif_homunculus_rename(char *name);
 
diff --git a/src/char/int_mail.c b/src/char/int_mail.c
index 2e34d9014..98da43aeb 100644
--- a/src/char/int_mail.c
+++ b/src/char/int_mail.c
@@ -15,200 +15,180 @@
 #include <string.h>
 #include <stdlib.h>
 
-static int mail_fromsql(int char_id, struct mail_data *md)
+static int mail_fromsql(int char_id, struct mail_data* md)
 {
-    int i, j;
-    struct mail_message *msg;
-    struct item *item;
-    char *data;
-    StringBuf buf;
-
-    memset(md, 0, sizeof(struct mail_data));
-    md->amount = 0;
-    md->full = false;
-
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`status`,"
-                        "`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`");
-    for (i = 0; i < MAX_SLOTS; i++)
-        StringBuf_Printf(&buf, ",`card%d`", i);
-
-    // I keep the `status` < 3 just in case someone forget to apply the sqlfix
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `dest_id`='%d' AND `status` < 3 ORDER BY `id` LIMIT %d",
-                     mail_db, char_id, MAIL_MAX_INBOX + 1);
-
-    if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)))
-        Sql_ShowDebug(sql_handle);
-
-    StringBuf_Destroy(&buf);
-
-    for (i = 0; i < MAIL_MAX_INBOX && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i) {
-        msg = &md->msg[i];
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        msg->id = atoi(data);
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        safestrncpy(msg->send_name, data, NAME_LENGTH);
-        Sql_GetData(sql_handle, 2, &data, NULL);
-        msg->send_id = atoi(data);
-        Sql_GetData(sql_handle, 3, &data, NULL);
-        safestrncpy(msg->dest_name, data, NAME_LENGTH);
-        Sql_GetData(sql_handle, 4, &data, NULL);
-        msg->dest_id = atoi(data);
-        Sql_GetData(sql_handle, 5, &data, NULL);
-        safestrncpy(msg->title, data, MAIL_TITLE_LENGTH);
-        Sql_GetData(sql_handle, 6, &data, NULL);
-        safestrncpy(msg->body, data, MAIL_BODY_LENGTH);
-        Sql_GetData(sql_handle, 7, &data, NULL);
-        msg->timestamp = atoi(data);
-        Sql_GetData(sql_handle, 8, &data, NULL);
-        msg->status = (mail_status)atoi(data);
-        Sql_GetData(sql_handle, 9, &data, NULL);
-        msg->zeny = atoi(data);
-        item = &msg->item;
-        Sql_GetData(sql_handle,10, &data, NULL);
-        item->amount = (short)atoi(data);
-        Sql_GetData(sql_handle,11, &data, NULL);
-        item->nameid = atoi(data);
-        Sql_GetData(sql_handle,12, &data, NULL);
-        item->refine = atoi(data);
-        Sql_GetData(sql_handle,13, &data, NULL);
-        item->attribute = atoi(data);
-        Sql_GetData(sql_handle,14, &data, NULL);
-        item->identify = atoi(data);
-        item->expire_time = 0;
-
-        for (j = 0; j < MAX_SLOTS; j++) {
-            Sql_GetData(sql_handle, 15 + j, &data, NULL);
-            item->card[j] = atoi(data);
-        }
-    }
-
-    md->full = (Sql_NumRows(sql_handle) > MAIL_MAX_INBOX);
-
-    md->amount = i;
-    Sql_FreeResult(sql_handle);
-
-    md->unchecked = 0;
-    md->unread = 0;
-    for (i = 0; i < md->amount; i++) {
-        msg = &md->msg[i];
-        if (msg->status == MAIL_NEW) {
-            if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `status` = '%d' WHERE `id` = '%d'", mail_db, MAIL_UNREAD, msg->id))
-                Sql_ShowDebug(sql_handle);
-
-            msg->status = MAIL_UNREAD;
-            md->unchecked++;
-        } else if (msg->status == MAIL_UNREAD)
-            md->unread++;
-    }
-
-    ShowInfo("mail load complete from DB - id: %d (total: %d)\n", char_id, md->amount);
-    return 1;
+	int i, j;
+	struct mail_message *msg;
+	struct item *item;
+	char *data;
+	StringBuf buf;
+
+	memset(md, 0, sizeof(struct mail_data));
+	md->amount = 0;
+	md->full = false;
+
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`status`,"
+		"`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`");
+	for (i = 0; i < MAX_SLOTS; i++)
+		StringBuf_Printf(&buf, ",`card%d`", i);
+
+	// I keep the `status` < 3 just in case someone forget to apply the sqlfix
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `dest_id`='%d' AND `status` < 3 ORDER BY `id` LIMIT %d",
+		mail_db, char_id, MAIL_MAX_INBOX + 1);
+
+	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+		Sql_ShowDebug(sql_handle);
+
+	StringBuf_Destroy(&buf);
+
+	for (i = 0; i < MAIL_MAX_INBOX && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	{
+		msg = &md->msg[i];
+		Sql_GetData(sql_handle, 0, &data, NULL); msg->id = atoi(data);
+		Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(msg->send_name, data, NAME_LENGTH);
+		Sql_GetData(sql_handle, 2, &data, NULL); msg->send_id = atoi(data);
+		Sql_GetData(sql_handle, 3, &data, NULL); safestrncpy(msg->dest_name, data, NAME_LENGTH);
+		Sql_GetData(sql_handle, 4, &data, NULL); msg->dest_id = atoi(data);
+		Sql_GetData(sql_handle, 5, &data, NULL); safestrncpy(msg->title, data, MAIL_TITLE_LENGTH);
+		Sql_GetData(sql_handle, 6, &data, NULL); safestrncpy(msg->body, data, MAIL_BODY_LENGTH);
+		Sql_GetData(sql_handle, 7, &data, NULL); msg->timestamp = atoi(data);
+		Sql_GetData(sql_handle, 8, &data, NULL); msg->status = (mail_status)atoi(data);
+		Sql_GetData(sql_handle, 9, &data, NULL); msg->zeny = atoi(data);
+		item = &msg->item;
+		Sql_GetData(sql_handle,10, &data, NULL); item->amount = (short)atoi(data);
+		Sql_GetData(sql_handle,11, &data, NULL); item->nameid = atoi(data);
+		Sql_GetData(sql_handle,12, &data, NULL); item->refine = atoi(data);
+		Sql_GetData(sql_handle,13, &data, NULL); item->attribute = atoi(data);
+		Sql_GetData(sql_handle,14, &data, NULL); item->identify = atoi(data);
+		item->expire_time = 0;
+
+		for (j = 0; j < MAX_SLOTS; j++)
+		{
+			Sql_GetData(sql_handle, 15 + j, &data, NULL);
+			item->card[j] = atoi(data);
+		}
+	}
+
+	md->full = ( Sql_NumRows(sql_handle) > MAIL_MAX_INBOX );
+
+	md->amount = i;
+	Sql_FreeResult(sql_handle);
+
+	md->unchecked = 0;
+	md->unread = 0;
+	for (i = 0; i < md->amount; i++)
+	{
+		msg = &md->msg[i];
+		if( msg->status == MAIL_NEW )
+		{
+			if ( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `status` = '%d' WHERE `id` = '%d'", mail_db, MAIL_UNREAD, msg->id) )
+				Sql_ShowDebug(sql_handle);
+
+			msg->status = MAIL_UNREAD;
+			md->unchecked++;
+		}
+		else if ( msg->status == MAIL_UNREAD )
+			md->unread++;
+	}
+
+	ShowInfo("mail load complete from DB - id: %d (total: %d)\n", char_id, md->amount);
+	return 1;
 }
 
 /// Stores a single message in the database.
 /// Returns the message's ID if successful (or 0 if it fails).
-int mail_savemessage(struct mail_message *msg)
+int mail_savemessage(struct mail_message* msg)
 {
-    StringBuf buf;
-    SqlStmt *stmt;
-    int j;
-
-    // build message save query
-    StringBuf_Init(&buf);
-    StringBuf_Printf(&buf, "INSERT INTO `%s` (`send_name`, `send_id`, `dest_name`, `dest_id`, `title`, `message`, `time`, `status`, `zeny`, `amount`, `nameid`, `refine`, `attribute`, `identify`", mail_db);
-    for (j = 0; j < MAX_SLOTS; j++)
-        StringBuf_Printf(&buf, ", `card%d`", j);
-    StringBuf_Printf(&buf, ") VALUES (?, '%d', ?, '%d', ?, ?, '%lu', '%d', '%d', '%d', '%d', '%d', '%d', '%d'",
-                     msg->send_id, msg->dest_id, (unsigned long)msg->timestamp, msg->status, msg->zeny, msg->item.amount, msg->item.nameid, msg->item.refine, msg->item.attribute, msg->item.identify);
-    for (j = 0; j < MAX_SLOTS; j++)
-        StringBuf_Printf(&buf, ", '%d'", msg->item.card[j]);
-    StringBuf_AppendStr(&buf, ")");
-
-    // prepare and execute query
-    stmt = SqlStmt_Malloc(sql_handle);
-    if (SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, msg->send_name, strnlen(msg->send_name, NAME_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, msg->dest_name, strnlen(msg->dest_name, NAME_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, msg->title, strnlen(msg->title, MAIL_TITLE_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 3, SQLDT_STRING, msg->body, strnlen(msg->body, MAIL_BODY_LENGTH))
-        ||  SQL_SUCCESS != SqlStmt_Execute(stmt)) {
-        SqlStmt_ShowDebug(stmt);
-        msg->id = 0;
-    } else
-        msg->id = (int)SqlStmt_LastInsertId(stmt);
-
-    SqlStmt_Free(stmt);
-    StringBuf_Destroy(&buf);
-
-    return msg->id;
+	StringBuf buf;
+	SqlStmt* stmt;
+	int j;
+
+	// build message save query
+	StringBuf_Init(&buf);
+	StringBuf_Printf(&buf, "INSERT INTO `%s` (`send_name`, `send_id`, `dest_name`, `dest_id`, `title`, `message`, `time`, `status`, `zeny`, `amount`, `nameid`, `refine`, `attribute`, `identify`", mail_db);
+	for (j = 0; j < MAX_SLOTS; j++)
+		StringBuf_Printf(&buf, ", `card%d`", j);
+	StringBuf_Printf(&buf, ") VALUES (?, '%d', ?, '%d', ?, ?, '%lu', '%d', '%d', '%d', '%d', '%d', '%d', '%d'",
+		msg->send_id, msg->dest_id, (unsigned long)msg->timestamp, msg->status, msg->zeny, msg->item.amount, msg->item.nameid, msg->item.refine, msg->item.attribute, msg->item.identify);
+	for (j = 0; j < MAX_SLOTS; j++)
+		StringBuf_Printf(&buf, ", '%d'", msg->item.card[j]);
+	StringBuf_AppendStr(&buf, ")");
+
+	// prepare and execute query
+	stmt = SqlStmt_Malloc(sql_handle);
+	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, msg->send_name, strnlen(msg->send_name, NAME_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, msg->dest_name, strnlen(msg->dest_name, NAME_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, msg->title, strnlen(msg->title, MAIL_TITLE_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 3, SQLDT_STRING, msg->body, strnlen(msg->body, MAIL_BODY_LENGTH))
+	||  SQL_SUCCESS != SqlStmt_Execute(stmt) )
+	{
+		SqlStmt_ShowDebug(stmt);
+		msg->id = 0;
+	} else
+		msg->id = (int)SqlStmt_LastInsertId(stmt);
+
+	SqlStmt_Free(stmt);
+	StringBuf_Destroy(&buf);
+
+	return msg->id;
 }
 
 /// Retrieves a single message from the database.
 /// Returns true if the operation succeeds (or false if it fails).
-static bool mail_loadmessage(int mail_id, struct mail_message *msg)
+static bool mail_loadmessage(int mail_id, struct mail_message* msg)
 {
-    int j;
-    StringBuf buf;
-
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`status`,"
-                        "`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`");
-    for (j = 0; j < MAX_SLOTS; j++)
-        StringBuf_Printf(&buf, ",`card%d`", j);
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `id` = '%d'", mail_db, mail_id);
-
-    if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf))
-        ||  SQL_SUCCESS != Sql_NextRow(sql_handle)) {
-        Sql_ShowDebug(sql_handle);
-        Sql_FreeResult(sql_handle);
-        StringBuf_Destroy(&buf);
-        return false;
-    } else {
-        char *data;
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        msg->id = atoi(data);
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        safestrncpy(msg->send_name, data, NAME_LENGTH);
-        Sql_GetData(sql_handle, 2, &data, NULL);
-        msg->send_id = atoi(data);
-        Sql_GetData(sql_handle, 3, &data, NULL);
-        safestrncpy(msg->dest_name, data, NAME_LENGTH);
-        Sql_GetData(sql_handle, 4, &data, NULL);
-        msg->dest_id = atoi(data);
-        Sql_GetData(sql_handle, 5, &data, NULL);
-        safestrncpy(msg->title, data, MAIL_TITLE_LENGTH);
-        Sql_GetData(sql_handle, 6, &data, NULL);
-        safestrncpy(msg->body, data, MAIL_BODY_LENGTH);
-        Sql_GetData(sql_handle, 7, &data, NULL);
-        msg->timestamp = atoi(data);
-        Sql_GetData(sql_handle, 8, &data, NULL);
-        msg->status = (mail_status)atoi(data);
-        Sql_GetData(sql_handle, 9, &data, NULL);
-        msg->zeny = atoi(data);
-        Sql_GetData(sql_handle,10, &data, NULL);
-        msg->item.amount = (short)atoi(data);
-        Sql_GetData(sql_handle,11, &data, NULL);
-        msg->item.nameid = atoi(data);
-        Sql_GetData(sql_handle,12, &data, NULL);
-        msg->item.refine = atoi(data);
-        Sql_GetData(sql_handle,13, &data, NULL);
-        msg->item.attribute = atoi(data);
-        Sql_GetData(sql_handle,14, &data, NULL);
-        msg->item.identify = atoi(data);
-        msg->item.expire_time = 0;
-
-        for (j = 0; j < MAX_SLOTS; j++) {
-            Sql_GetData(sql_handle,15 + j, &data, NULL);
-            msg->item.card[j] = atoi(data);
-        }
-    }
-
-    StringBuf_Destroy(&buf);
-    Sql_FreeResult(sql_handle);
-
-    return true;
+	int j;
+	StringBuf buf;
+
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`status`,"
+		"`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`");
+	for( j = 0; j < MAX_SLOTS; j++ )
+		StringBuf_Printf(&buf, ",`card%d`", j);
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `id` = '%d'", mail_db, mail_id);
+
+	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf))
+	||  SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	{
+		Sql_ShowDebug(sql_handle);
+		Sql_FreeResult(sql_handle);
+		StringBuf_Destroy(&buf);
+		return false;
+	}
+	else
+	{
+		char* data;
+
+		Sql_GetData(sql_handle, 0, &data, NULL); msg->id = atoi(data);
+		Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(msg->send_name, data, NAME_LENGTH);
+		Sql_GetData(sql_handle, 2, &data, NULL); msg->send_id = atoi(data);
+		Sql_GetData(sql_handle, 3, &data, NULL); safestrncpy(msg->dest_name, data, NAME_LENGTH);
+		Sql_GetData(sql_handle, 4, &data, NULL); msg->dest_id = atoi(data);
+		Sql_GetData(sql_handle, 5, &data, NULL); safestrncpy(msg->title, data, MAIL_TITLE_LENGTH);
+		Sql_GetData(sql_handle, 6, &data, NULL); safestrncpy(msg->body, data, MAIL_BODY_LENGTH);
+		Sql_GetData(sql_handle, 7, &data, NULL); msg->timestamp = atoi(data);
+		Sql_GetData(sql_handle, 8, &data, NULL); msg->status = (mail_status)atoi(data);
+		Sql_GetData(sql_handle, 9, &data, NULL); msg->zeny = atoi(data);
+		Sql_GetData(sql_handle,10, &data, NULL); msg->item.amount = (short)atoi(data);
+		Sql_GetData(sql_handle,11, &data, NULL); msg->item.nameid = atoi(data);
+		Sql_GetData(sql_handle,12, &data, NULL); msg->item.refine = atoi(data);
+		Sql_GetData(sql_handle,13, &data, NULL); msg->item.attribute = atoi(data);
+		Sql_GetData(sql_handle,14, &data, NULL); msg->item.identify = atoi(data);
+		msg->item.expire_time = 0;
+
+		for( j = 0; j < MAX_SLOTS; j++ )
+		{
+			Sql_GetData(sql_handle,15 + j, &data, NULL);
+			msg->item.card[j] = atoi(data);
+		}
+	}
+
+	StringBuf_Destroy(&buf);
+	Sql_FreeResult(sql_handle);
+
+	return true;
 }
 
 /*==========================================
@@ -216,22 +196,22 @@ static bool mail_loadmessage(int mail_id, struct mail_message *msg)
  *------------------------------------------*/
 static void mapif_Mail_sendinbox(int fd, int char_id, unsigned char flag)
 {
-    struct mail_data md;
-    mail_fromsql(char_id, &md);
-
-    //FIXME: dumping the whole structure like this is unsafe [ultramage]
-    WFIFOHEAD(fd, sizeof(md) + 9);
-    WFIFOW(fd,0) = 0x3848;
-    WFIFOW(fd,2) = sizeof(md) + 9;
-    WFIFOL(fd,4) = char_id;
-    WFIFOB(fd,8) = flag;
-    memcpy(WFIFOP(fd,9),&md,sizeof(md));
-    WFIFOSET(fd,WFIFOW(fd,2));
+	struct mail_data md;
+	mail_fromsql(char_id, &md);
+
+	//FIXME: dumping the whole structure like this is unsafe [ultramage]
+	WFIFOHEAD(fd, sizeof(md) + 9);
+	WFIFOW(fd,0) = 0x3848;
+	WFIFOW(fd,2) = sizeof(md) + 9;
+	WFIFOL(fd,4) = char_id;
+	WFIFOB(fd,8) = flag;
+	memcpy(WFIFOP(fd,9),&md,sizeof(md));
+	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
 static void mapif_parse_Mail_requestinbox(int fd)
 {
-    mapif_Mail_sendinbox(fd, RFIFOL(fd,2), RFIFOB(fd,6));
+	mapif_Mail_sendinbox(fd, RFIFOL(fd,2), RFIFOB(fd,6));
 }
 
 /*==========================================
@@ -239,9 +219,9 @@ static void mapif_parse_Mail_requestinbox(int fd)
  *------------------------------------------*/
 static void mapif_parse_Mail_read(int fd)
 {
-    int mail_id = RFIFOL(fd,2);
-    if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `status` = '%d' WHERE `id` = '%d'", mail_db, MAIL_READ, mail_id))
-        Sql_ShowDebug(sql_handle);
+	int mail_id = RFIFOL(fd,2);
+	if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `status` = '%d' WHERE `id` = '%d'", mail_db, MAIL_READ, mail_id) )
+		Sql_ShowDebug(sql_handle);
 }
 
 /*==========================================
@@ -249,57 +229,58 @@ static void mapif_parse_Mail_read(int fd)
  *------------------------------------------*/
 static bool mail_DeleteAttach(int mail_id)
 {
-    StringBuf buf;
-    int i;
+	StringBuf buf;
+	int i;
 
-    StringBuf_Init(&buf);
-    StringBuf_Printf(&buf, "UPDATE `%s` SET `zeny` = '0', `nameid` = '0', `amount` = '0', `refine` = '0', `attribute` = '0', `identify` = '0'", mail_db);
-    for (i = 0; i < MAX_SLOTS; i++)
-        StringBuf_Printf(&buf, ", `card%d` = '0'", i);
-    StringBuf_Printf(&buf, " WHERE `id` = '%d'", mail_id);
+	StringBuf_Init(&buf);
+	StringBuf_Printf(&buf, "UPDATE `%s` SET `zeny` = '0', `nameid` = '0', `amount` = '0', `refine` = '0', `attribute` = '0', `identify` = '0'", mail_db);
+	for (i = 0; i < MAX_SLOTS; i++)
+		StringBuf_Printf(&buf, ", `card%d` = '0'", i);
+	StringBuf_Printf(&buf, " WHERE `id` = '%d'", mail_id);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf))) {
-        Sql_ShowDebug(sql_handle);
-        StringBuf_Destroy(&buf);
+	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+	{
+		Sql_ShowDebug(sql_handle);
+		StringBuf_Destroy(&buf);
 
-        return false;
-    }
+		return false;
+	}
 
-    StringBuf_Destroy(&buf);
-    return true;
+	StringBuf_Destroy(&buf);
+	return true;
 }
 
 static void mapif_Mail_getattach(int fd, int char_id, int mail_id)
 {
-    struct mail_message msg;
+	struct mail_message msg;
 
-    if (!mail_loadmessage(mail_id, &msg))
-        return;
+	if( !mail_loadmessage(mail_id, &msg) )
+		return;
 
-    if (msg.dest_id != char_id)
-        return;
+	if( msg.dest_id != char_id )
+		return;
 
-    if (msg.status != MAIL_READ)
-        return;
+	if( msg.status != MAIL_READ )
+		return;
 
-    if ((msg.item.nameid < 1 || msg.item.amount < 1) && msg.zeny < 1)
-        return; // No Attachment
+	if( (msg.item.nameid < 1 || msg.item.amount < 1) && msg.zeny < 1 )
+		return; // No Attachment
 
-    if (!mail_DeleteAttach(mail_id))
-        return;
+	if( !mail_DeleteAttach(mail_id) )
+		return;
 
-    WFIFOHEAD(fd, sizeof(struct item) + 12);
-    WFIFOW(fd,0) = 0x384a;
-    WFIFOW(fd,2) = sizeof(struct item) + 12;
-    WFIFOL(fd,4) = char_id;
-    WFIFOL(fd,8) = (msg.zeny > 0)?msg.zeny:0;
-    memcpy(WFIFOP(fd,12), &msg.item, sizeof(struct item));
-    WFIFOSET(fd,WFIFOW(fd,2));
+	WFIFOHEAD(fd, sizeof(struct item) + 12);
+	WFIFOW(fd,0) = 0x384a;
+	WFIFOW(fd,2) = sizeof(struct item) + 12;
+	WFIFOL(fd,4) = char_id;
+	WFIFOL(fd,8) = (msg.zeny > 0)?msg.zeny:0;
+	memcpy(WFIFOP(fd,12), &msg.item, sizeof(struct item));
+	WFIFOSET(fd,WFIFOW(fd,2));
 }
 
 static void mapif_parse_Mail_getattach(int fd)
 {
-    mapif_Mail_getattach(fd, RFIFOL(fd,2), RFIFOL(fd,6));
+	mapif_Mail_getattach(fd, RFIFOL(fd,2), RFIFOL(fd,6));
 }
 
 /*==========================================
@@ -307,23 +288,24 @@ static void mapif_parse_Mail_getattach(int fd)
  *------------------------------------------*/
 static void mapif_Mail_delete(int fd, int char_id, int mail_id)
 {
-    bool failed = false;
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id)) {
-        Sql_ShowDebug(sql_handle);
-        failed = true;
-    }
-
-    WFIFOHEAD(fd,11);
-    WFIFOW(fd,0) = 0x384b;
-    WFIFOL(fd,2) = char_id;
-    WFIFOL(fd,6) = mail_id;
-    WFIFOB(fd,10) = failed;
-    WFIFOSET(fd,11);
+	bool failed = false;
+	if ( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		failed = true;
+	}
+
+	WFIFOHEAD(fd,11);
+	WFIFOW(fd,0) = 0x384b;
+	WFIFOL(fd,2) = char_id;
+	WFIFOL(fd,6) = mail_id;
+	WFIFOB(fd,10) = failed;
+	WFIFOSET(fd,11);
 }
 
 static void mapif_parse_Mail_delete(int fd)
 {
-    mapif_Mail_delete(fd, RFIFOL(fd,2), RFIFOL(fd,6));
+	mapif_Mail_delete(fd, RFIFOL(fd,2), RFIFOL(fd,6));
 }
 
 /*==========================================
@@ -331,17 +313,17 @@ static void mapif_parse_Mail_delete(int fd)
  *------------------------------------------*/
 void mapif_Mail_new(struct mail_message *msg)
 {
-    unsigned char buf[74];
-
-    if (!msg || !msg->id)
-        return;
-
-    WBUFW(buf,0) = 0x3849;
-    WBUFL(buf,2) = msg->dest_id;
-    WBUFL(buf,6) = msg->id;
-    memcpy(WBUFP(buf,10), msg->send_name, NAME_LENGTH);
-    memcpy(WBUFP(buf,34), msg->title, MAIL_TITLE_LENGTH);
-    mapif_sendall(buf, 74);
+	unsigned char buf[74];
+	
+	if( !msg || !msg->id )
+		return;
+
+	WBUFW(buf,0) = 0x3849;
+	WBUFL(buf,2) = msg->dest_id;
+	WBUFL(buf,6) = msg->id;
+	memcpy(WBUFP(buf,10), msg->send_name, NAME_LENGTH);
+	memcpy(WBUFP(buf,34), msg->title, MAIL_TITLE_LENGTH);
+	mapif_sendall(buf, 74);
 }
 
 /*==========================================
@@ -349,116 +331,120 @@ void mapif_Mail_new(struct mail_message *msg)
  *------------------------------------------*/
 static void mapif_Mail_return(int fd, int char_id, int mail_id)
 {
-    struct mail_message msg;
-    int new_mail = 0;
-
-    if (mail_loadmessage(mail_id, &msg)) {
-        if (msg.dest_id != char_id)
-            return;
-        else if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id))
-            Sql_ShowDebug(sql_handle);
-        else {
-            char temp_[MAIL_TITLE_LENGTH];
-
-            // swap sender and receiver
-            swap(msg.send_id, msg.dest_id);
-            safestrncpy(temp_, msg.send_name, NAME_LENGTH);
-            safestrncpy(msg.send_name, msg.dest_name, NAME_LENGTH);
-            safestrncpy(msg.dest_name, temp_, NAME_LENGTH);
-
-            // set reply message title
-            snprintf(temp_, MAIL_TITLE_LENGTH, "RE:%s", msg.title);
-            safestrncpy(msg.title, temp_, MAIL_TITLE_LENGTH);
-
-            msg.status = MAIL_NEW;
-            msg.timestamp = time(NULL);
-
-            new_mail = mail_savemessage(&msg);
-            mapif_Mail_new(&msg);
-        }
-    }
-
-    WFIFOHEAD(fd,11);
-    WFIFOW(fd,0) = 0x384c;
-    WFIFOL(fd,2) = char_id;
-    WFIFOL(fd,6) = mail_id;
-    WFIFOB(fd,10) = (new_mail == 0);
-    WFIFOSET(fd,11);
+	struct mail_message msg;
+	int new_mail = 0;
+
+	if( mail_loadmessage(mail_id, &msg) )
+	{
+		if( msg.dest_id != char_id)
+			return;
+		else if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id) )
+			Sql_ShowDebug(sql_handle);
+		else
+		{
+			char temp_[MAIL_TITLE_LENGTH];
+
+			// swap sender and receiver
+			swap(msg.send_id, msg.dest_id);
+			safestrncpy(temp_, msg.send_name, NAME_LENGTH);
+			safestrncpy(msg.send_name, msg.dest_name, NAME_LENGTH);
+			safestrncpy(msg.dest_name, temp_, NAME_LENGTH);
+
+			// set reply message title
+			snprintf(temp_, MAIL_TITLE_LENGTH, "RE:%s", msg.title);
+			safestrncpy(msg.title, temp_, MAIL_TITLE_LENGTH);
+
+			msg.status = MAIL_NEW;
+			msg.timestamp = time(NULL);
+
+			new_mail = mail_savemessage(&msg);
+			mapif_Mail_new(&msg);
+		}
+	}
+
+	WFIFOHEAD(fd,11);
+	WFIFOW(fd,0) = 0x384c;
+	WFIFOL(fd,2) = char_id;
+	WFIFOL(fd,6) = mail_id;
+	WFIFOB(fd,10) = (new_mail == 0);
+	WFIFOSET(fd,11);
 }
 
 static void mapif_parse_Mail_return(int fd)
 {
-    mapif_Mail_return(fd, RFIFOL(fd,2), RFIFOL(fd,6));
+	mapif_Mail_return(fd, RFIFOL(fd,2), RFIFOL(fd,6));
 }
 
 /*==========================================
  * Send Mail
  *------------------------------------------*/
-static void mapif_Mail_send(int fd, struct mail_message *msg)
+static void mapif_Mail_send(int fd, struct mail_message* msg)
 {
-    int len = sizeof(struct mail_message) + 4;
-
-    WFIFOHEAD(fd,len);
-    WFIFOW(fd,0) = 0x384d;
-    WFIFOW(fd,2) = len;
-    memcpy(WFIFOP(fd,4), msg, sizeof(struct mail_message));
-    WFIFOSET(fd,len);
+	int len = sizeof(struct mail_message) + 4;
+	
+	WFIFOHEAD(fd,len);
+	WFIFOW(fd,0) = 0x384d;
+	WFIFOW(fd,2) = len;
+	memcpy(WFIFOP(fd,4), msg, sizeof(struct mail_message));
+	WFIFOSET(fd,len);
 }
 
 static void mapif_parse_Mail_send(int fd)
 {
-    struct mail_message msg;
-    char esc_name[NAME_LENGTH*2+1];
-    int account_id = 0;
-
-    if (RFIFOW(fd,2) != 8 + sizeof(struct mail_message))
-        return;
-
-    account_id = RFIFOL(fd,4);
-    memcpy(&msg, RFIFOP(fd,8), sizeof(struct mail_message));
-
-    // Try to find the Dest Char by Name
-    Sql_EscapeStringLen(sql_handle, esc_name, msg.dest_name, strnlen(msg.dest_name, NAME_LENGTH));
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`, `char_id` FROM `%s` WHERE `name` = '%s'", char_db, esc_name))
-        Sql_ShowDebug(sql_handle);
-    else if (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        char *data;
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        if (atoi(data) != account_id) {
-            // Cannot send mail to char in the same account
-            Sql_GetData(sql_handle, 1, &data, NULL);
-            msg.dest_id = atoi(data);
-        }
-    }
-    Sql_FreeResult(sql_handle);
-    msg.status = MAIL_NEW;
-
-    if (msg.dest_id > 0)
-        msg.id = mail_savemessage(&msg);
-
-    mapif_Mail_send(fd, &msg); // notify sender
-    mapif_Mail_new(&msg); // notify recipient
+	struct mail_message msg;
+	char esc_name[NAME_LENGTH*2+1];
+	int account_id = 0;
+
+	if(RFIFOW(fd,2) != 8 + sizeof(struct mail_message))
+		return;
+
+	account_id = RFIFOL(fd,4);
+	memcpy(&msg, RFIFOP(fd,8), sizeof(struct mail_message));
+
+	// Try to find the Dest Char by Name
+	Sql_EscapeStringLen(sql_handle, esc_name, msg.dest_name, strnlen(msg.dest_name, NAME_LENGTH));
+	if ( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`, `char_id` FROM `%s` WHERE `name` = '%s'", char_db, esc_name) )
+		Sql_ShowDebug(sql_handle);
+	else
+	if ( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		char *data;
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		if (atoi(data) != account_id)
+		{ // Cannot send mail to char in the same account
+			Sql_GetData(sql_handle, 1, &data, NULL);
+			msg.dest_id = atoi(data);
+		}
+	}
+	Sql_FreeResult(sql_handle);
+	msg.status = MAIL_NEW;
+
+	if( msg.dest_id > 0 )
+		msg.id = mail_savemessage(&msg);
+
+	mapif_Mail_send(fd, &msg); // notify sender
+	mapif_Mail_new(&msg); // notify recipient
 }
 
-void mail_sendmail(int send_id, const char *send_name, int dest_id, const char *dest_name, const char *title, const char *body, int zeny, struct item *item)
+void mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item)
 {
-    struct mail_message msg;
-    memset(&msg, 0, sizeof(struct mail_message));
-
-    msg.send_id = send_id;
-    safestrncpy(msg.send_name, send_name, NAME_LENGTH);
-    msg.dest_id = dest_id;
-    safestrncpy(msg.dest_name, dest_name, NAME_LENGTH);
-    safestrncpy(msg.title, title, MAIL_TITLE_LENGTH);
-    safestrncpy(msg.body, body, MAIL_BODY_LENGTH);
-    msg.zeny = zeny;
-    if (item != NULL)
-        memcpy(&msg.item, item, sizeof(struct item));
-
-    msg.timestamp = time(NULL);
-
-    mail_savemessage(&msg);
-    mapif_Mail_new(&msg);
+	struct mail_message msg;
+	memset(&msg, 0, sizeof(struct mail_message));
+
+	msg.send_id = send_id;
+	safestrncpy(msg.send_name, send_name, NAME_LENGTH);
+	msg.dest_id = dest_id;
+	safestrncpy(msg.dest_name, dest_name, NAME_LENGTH);
+	safestrncpy(msg.title, title, MAIL_TITLE_LENGTH);
+	safestrncpy(msg.body, body, MAIL_BODY_LENGTH);
+	msg.zeny = zeny;
+	if( item != NULL )
+		memcpy(&msg.item, item, sizeof(struct item));
+
+	msg.timestamp = time(NULL);
+
+	mail_savemessage(&msg);
+	mapif_Mail_new(&msg);
 }
 
 /*==========================================
@@ -466,37 +452,26 @@ void mail_sendmail(int send_id, const char *send_name, int dest_id, const char *
  *------------------------------------------*/
 int inter_mail_parse_frommap(int fd)
 {
-    switch (RFIFOW(fd,0)) {
-        case 0x3048:
-            mapif_parse_Mail_requestinbox(fd);
-            break;
-        case 0x3049:
-            mapif_parse_Mail_read(fd);
-            break;
-        case 0x304a:
-            mapif_parse_Mail_getattach(fd);
-            break;
-        case 0x304b:
-            mapif_parse_Mail_delete(fd);
-            break;
-        case 0x304c:
-            mapif_parse_Mail_return(fd);
-            break;
-        case 0x304d:
-            mapif_parse_Mail_send(fd);
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+	switch(RFIFOW(fd,0))
+	{
+		case 0x3048: mapif_parse_Mail_requestinbox(fd); break;
+		case 0x3049: mapif_parse_Mail_read(fd); break;
+		case 0x304a: mapif_parse_Mail_getattach(fd); break;
+		case 0x304b: mapif_parse_Mail_delete(fd); break;
+		case 0x304c: mapif_parse_Mail_return(fd); break;
+		case 0x304d: mapif_parse_Mail_send(fd); break;
+		default:
+			return 0;
+	}
+	return 1;
 }
 
 int inter_mail_sql_init(void)
 {
-    return 1;
+	return 1;
 }
 
 void inter_mail_sql_final(void)
 {
-    return;
+	return;
 }
diff --git a/src/char/int_mail.h b/src/char/int_mail.h
index 0fef3d4ab..77db51e5b 100644
--- a/src/char/int_mail.h
+++ b/src/char/int_mail.h
@@ -5,12 +5,12 @@
 #define _INT_MAIL_SQL_H_
 
 int inter_mail_parse_frommap(int fd);
-void mail_sendmail(int send_id, const char *send_name, int dest_id, const char *dest_name, const char *title, const char *body, int zeny, struct item *item);
+void mail_sendmail(int send_id, const char* send_name, int dest_id, const char* dest_name, const char* title, const char* body, int zeny, struct item *item);
 
 int inter_mail_sql_init(void);
 void inter_mail_sql_final(void);
 
-int mail_savemessage(struct mail_message *msg);
+int mail_savemessage(struct mail_message* msg);
 void mapif_Mail_new(struct mail_message *msg);
 
 #endif /* _INT_MAIL_SQL_H_ */
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c
index 528f05524..3b3714416 100644
--- a/src/char/int_mercenary.c
+++ b/src/char/int_mercenary.c
@@ -17,188 +17,185 @@
 
 bool mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status)
 {
-    char *data;
-
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `merc_id`, `arch_calls`, `arch_faith`, `spear_calls`, `spear_faith`, `sword_calls`, `sword_faith` FROM `%s` WHERE `char_id` = '%d'", mercenary_owner_db, char_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
-
-    if (SQL_SUCCESS != Sql_NextRow(sql_handle)) {
-        Sql_FreeResult(sql_handle);
-        return false;
-    }
-
-    Sql_GetData(sql_handle,  0, &data, NULL);
-    status->mer_id = atoi(data);
-    Sql_GetData(sql_handle,  1, &data, NULL);
-    status->arch_calls = atoi(data);
-    Sql_GetData(sql_handle,  2, &data, NULL);
-    status->arch_faith = atoi(data);
-    Sql_GetData(sql_handle,  3, &data, NULL);
-    status->spear_calls = atoi(data);
-    Sql_GetData(sql_handle,  4, &data, NULL);
-    status->spear_faith = atoi(data);
-    Sql_GetData(sql_handle,  5, &data, NULL);
-    status->sword_calls = atoi(data);
-    Sql_GetData(sql_handle,  6, &data, NULL);
-    status->sword_faith = atoi(data);
-    Sql_FreeResult(sql_handle);
-
-    return true;
+	char* data;
+
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `merc_id`, `arch_calls`, `arch_faith`, `spear_calls`, `spear_faith`, `sword_calls`, `sword_faith` FROM `%s` WHERE `char_id` = '%d'", mercenary_owner_db, char_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	{
+		Sql_FreeResult(sql_handle);
+		return false;
+	}
+
+	Sql_GetData(sql_handle,  0, &data, NULL); status->mer_id = atoi(data);
+	Sql_GetData(sql_handle,  1, &data, NULL); status->arch_calls = atoi(data);
+	Sql_GetData(sql_handle,  2, &data, NULL); status->arch_faith = atoi(data);
+	Sql_GetData(sql_handle,  3, &data, NULL); status->spear_calls = atoi(data);
+	Sql_GetData(sql_handle,  4, &data, NULL); status->spear_faith = atoi(data);
+	Sql_GetData(sql_handle,  5, &data, NULL); status->sword_calls = atoi(data);
+	Sql_GetData(sql_handle,  6, &data, NULL); status->sword_faith = atoi(data);
+	Sql_FreeResult(sql_handle);
+
+	return true;
 }
 
 bool mercenary_owner_tosql(int char_id, struct mmo_charstatus *status)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`char_id`, `merc_id`, `arch_calls`, `arch_faith`, `spear_calls`, `spear_faith`, `sword_calls`, `sword_faith`) VALUES ('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-                               mercenary_owner_db, char_id, status->mer_id, status->arch_calls, status->arch_faith, status->spear_calls, status->spear_faith, status->sword_calls, status->sword_faith)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
+	if( SQL_ERROR == Sql_Query(sql_handle, "REPLACE INTO `%s` (`char_id`, `merc_id`, `arch_calls`, `arch_faith`, `spear_calls`, `spear_faith`, `sword_calls`, `sword_faith`) VALUES ('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
+		mercenary_owner_db, char_id, status->mer_id, status->arch_calls, status->arch_faith, status->spear_calls, status->spear_faith, status->sword_calls, status->sword_faith) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 bool mercenary_owner_delete(int char_id)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", mercenary_owner_db, char_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", mercenary_owner_db, char_id) )
+		Sql_ShowDebug(sql_handle);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", mercenary_db, char_id))
-        Sql_ShowDebug(sql_handle);
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", mercenary_db, char_id) )
+		Sql_ShowDebug(sql_handle);
 
-    return true;
+	return true;
 }
 
-bool mapif_mercenary_save(struct s_mercenary *merc)
+bool mapif_mercenary_save(struct s_mercenary* merc)
 {
-    bool flag = true;
+	bool flag = true;
 
-    if (merc->mercenary_id == 0) {
-        // Create new DB entry
-        if (SQL_ERROR == Sql_Query(sql_handle,
-                                   "INSERT INTO `%s` (`char_id`,`class`,`hp`,`sp`,`kill_counter`,`life_time`) VALUES ('%d','%d','%d','%d','%u','%u')",
-                                   mercenary_db, merc->char_id, merc->class_, merc->hp, merc->sp, merc->kill_count, merc->life_time)) {
-            Sql_ShowDebug(sql_handle);
-            flag = false;
-        } else
-            merc->mercenary_id = (int)Sql_LastInsertId(sql_handle);
-    } else if (SQL_ERROR == Sql_Query(sql_handle,
-                                      "UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `hp` = '%d', `sp` = '%d', `kill_counter` = '%u', `life_time` = '%u' WHERE `mer_id` = '%d'",
-                                      mercenary_db, merc->char_id, merc->class_, merc->hp, merc->sp, merc->kill_count, merc->life_time, merc->mercenary_id)) {
-        // Update DB entry
-        Sql_ShowDebug(sql_handle);
-        flag = false;
-    }
+	if( merc->mercenary_id == 0 )
+	{ // Create new DB entry
+		if( SQL_ERROR == Sql_Query(sql_handle,
+			"INSERT INTO `%s` (`char_id`,`class`,`hp`,`sp`,`kill_counter`,`life_time`) VALUES ('%d','%d','%d','%d','%u','%u')",
+			mercenary_db, merc->char_id, merc->class_, merc->hp, merc->sp, merc->kill_count, merc->life_time) )
+		{
+			Sql_ShowDebug(sql_handle);
+			flag = false;
+		}
+		else
+			merc->mercenary_id = (int)Sql_LastInsertId(sql_handle);
+	}
+	else if( SQL_ERROR == Sql_Query(sql_handle,
+		"UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `hp` = '%d', `sp` = '%d', `kill_counter` = '%u', `life_time` = '%u' WHERE `mer_id` = '%d'",
+		mercenary_db, merc->char_id, merc->class_, merc->hp, merc->sp, merc->kill_count, merc->life_time, merc->mercenary_id) )
+	{ // Update DB entry
+		Sql_ShowDebug(sql_handle);
+		flag = false;
+	}
 
-    return flag;
+	return flag;
 }
 
 bool mapif_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc)
 {
-    char *data;
-
-    memset(merc, 0, sizeof(struct s_mercenary));
-    merc->mercenary_id = merc_id;
-    merc->char_id = char_id;
+	char* data;
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `class`, `hp`, `sp`, `kill_counter`, `life_time` FROM `%s` WHERE `mer_id` = '%d' AND `char_id` = '%d'", mercenary_db, merc_id, char_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
+	memset(merc, 0, sizeof(struct s_mercenary));
+	merc->mercenary_id = merc_id;
+	merc->char_id = char_id;
 
-    if (SQL_SUCCESS != Sql_NextRow(sql_handle)) {
-        Sql_FreeResult(sql_handle);
-        return false;
-    }
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `class`, `hp`, `sp`, `kill_counter`, `life_time` FROM `%s` WHERE `mer_id` = '%d' AND `char_id` = '%d'", mercenary_db, merc_id, char_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
 
-    Sql_GetData(sql_handle,  0, &data, NULL);
-    merc->class_ = atoi(data);
-    Sql_GetData(sql_handle,  1, &data, NULL);
-    merc->hp = atoi(data);
-    Sql_GetData(sql_handle,  2, &data, NULL);
-    merc->sp = atoi(data);
-    Sql_GetData(sql_handle,  3, &data, NULL);
-    merc->kill_count = atoi(data);
-    Sql_GetData(sql_handle,  4, &data, NULL);
-    merc->life_time = atoi(data);
-    Sql_FreeResult(sql_handle);
-    if (save_log)
-        ShowInfo("Mercenary loaded (%d - %d).\n", merc->mercenary_id, merc->char_id);
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	{
+		Sql_FreeResult(sql_handle);
+		return false;
+	}
 
-    return true;
+	Sql_GetData(sql_handle,  0, &data, NULL); merc->class_ = atoi(data);
+	Sql_GetData(sql_handle,  1, &data, NULL); merc->hp = atoi(data);
+	Sql_GetData(sql_handle,  2, &data, NULL); merc->sp = atoi(data);
+	Sql_GetData(sql_handle,  3, &data, NULL); merc->kill_count = atoi(data);
+	Sql_GetData(sql_handle,  4, &data, NULL); merc->life_time = atoi(data);
+	Sql_FreeResult(sql_handle);
+	if( save_log )
+		ShowInfo("Mercenary loaded (%d - %d).\n", merc->mercenary_id, merc->char_id);
+	
+	return true;
 }
 
 bool mapif_mercenary_delete(int merc_id)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `mer_id` = '%d'", mercenary_db, merc_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `mer_id` = '%d'", mercenary_db, merc_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag)
 {
-    int size = sizeof(struct s_mercenary) + 5;
+	int size = sizeof(struct s_mercenary) + 5;
 
-    WFIFOHEAD(fd,size);
-    WFIFOW(fd,0) = 0x3870;
-    WFIFOW(fd,2) = size;
-    WFIFOB(fd,4) = flag;
-    memcpy(WFIFOP(fd,5),merc,sizeof(struct s_mercenary));
-    WFIFOSET(fd,size);
+	WFIFOHEAD(fd,size);
+	WFIFOW(fd,0) = 0x3870;
+	WFIFOW(fd,2) = size;
+	WFIFOB(fd,4) = flag;
+	memcpy(WFIFOP(fd,5),merc,sizeof(struct s_mercenary));
+	WFIFOSET(fd,size);
 }
 
-static void mapif_parse_mercenary_create(int fd, struct s_mercenary *merc)
+static void mapif_parse_mercenary_create(int fd, struct s_mercenary* merc)
 {
-    bool result = mapif_mercenary_save(merc);
-    mapif_mercenary_send(fd, merc, result);
+	bool result = mapif_mercenary_save(merc);
+	mapif_mercenary_send(fd, merc, result);
 }
 
 static void mapif_parse_mercenary_load(int fd, int merc_id, int char_id)
 {
-    struct s_mercenary merc;
-    bool result = mapif_mercenary_load(merc_id, char_id, &merc);
-    mapif_mercenary_send(fd, &merc, result);
+	struct s_mercenary merc;
+	bool result = mapif_mercenary_load(merc_id, char_id, &merc);
+	mapif_mercenary_send(fd, &merc, result);
 }
 
 static void mapif_mercenary_deleted(int fd, unsigned char flag)
 {
-    WFIFOHEAD(fd,3);
-    WFIFOW(fd,0) = 0x3871;
-    WFIFOB(fd,2) = flag;
-    WFIFOSET(fd,3);
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x3871;
+	WFIFOB(fd,2) = flag;
+	WFIFOSET(fd,3);
 }
 
 static void mapif_parse_mercenary_delete(int fd, int merc_id)
 {
-    bool result = mapif_mercenary_delete(merc_id);
-    mapif_mercenary_deleted(fd, result);
+	bool result = mapif_mercenary_delete(merc_id);
+	mapif_mercenary_deleted(fd, result);
 }
 
 static void mapif_mercenary_saved(int fd, unsigned char flag)
 {
-    WFIFOHEAD(fd,3);
-    WFIFOW(fd,0) = 0x3872;
-    WFIFOB(fd,2) = flag;
-    WFIFOSET(fd,3);
+	WFIFOHEAD(fd,3);
+	WFIFOW(fd,0) = 0x3872;
+	WFIFOB(fd,2) = flag;
+	WFIFOSET(fd,3);
 }
 
-static void mapif_parse_mercenary_save(int fd, struct s_mercenary *merc)
+static void mapif_parse_mercenary_save(int fd, struct s_mercenary* merc)
 {
-    bool result = mapif_mercenary_save(merc);
-    mapif_mercenary_saved(fd, result);
+	bool result = mapif_mercenary_save(merc);
+	mapif_mercenary_saved(fd, result);
 }
 
 int inter_mercenary_sql_init(void)
 {
-    return 0;
+	return 0;
 }
 void inter_mercenary_sql_final(void)
 {
-    return;
+	return;
 }
 
 /*==========================================
@@ -206,23 +203,16 @@ void inter_mercenary_sql_final(void)
  *------------------------------------------*/
 int inter_mercenary_parse_frommap(int fd)
 {
-    unsigned short cmd = RFIFOW(fd,0);
-
-    switch (cmd) {
-        case 0x3070:
-            mapif_parse_mercenary_create(fd, (struct s_mercenary *)RFIFOP(fd,4));
-            break;
-        case 0x3071:
-            mapif_parse_mercenary_load(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6));
-            break;
-        case 0x3072:
-            mapif_parse_mercenary_delete(fd, (int)RFIFOL(fd,2));
-            break;
-        case 0x3073:
-            mapif_parse_mercenary_save(fd, (struct s_mercenary *)RFIFOP(fd,4));
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+	unsigned short cmd = RFIFOW(fd,0);
+
+	switch( cmd )
+	{
+		case 0x3070: mapif_parse_mercenary_create(fd, (struct s_mercenary*)RFIFOP(fd,4)); break;
+		case 0x3071: mapif_parse_mercenary_load(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6)); break;
+		case 0x3072: mapif_parse_mercenary_delete(fd, (int)RFIFOL(fd,2)); break;
+		case 0x3073: mapif_parse_mercenary_save(fd, (struct s_mercenary*)RFIFOP(fd,4)); break;
+		default:
+			return 0;
+	}
+	return 1;
 }
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 862a943f1..a88e5c586 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -19,14 +19,14 @@
 #include <string.h>
 
 struct party_data {
-    struct party party;
-    unsigned int min_lv, max_lv;
-    int family; //Is this party a family? if so, this holds the child id.
-    unsigned char size; //Total size of party.
+	struct party party;
+	unsigned int min_lv, max_lv;
+	int family; //Is this party a family? if so, this holds the child id.
+	unsigned char size; //Total size of party.
 };
 
 static struct party_data *party_pt;
-static DBMap *party_db_; // int party_id -> struct party_data*
+static DBMap* party_db_; // int party_id -> struct party_data*
 
 int mapif_party_broken(int party_id,int flag);
 int party_check_empty(struct party_data *p);
@@ -35,297 +35,292 @@ int party_check_exp_share(struct party_data *p);
 int mapif_party_optionchanged(int fd,struct party *p, int account_id, int flag);
 
 //Updates party's level range and unsets even share if broken.
-static int int_party_check_lv(struct party_data *p)
-{
-    int i;
-    unsigned int lv;
-    p->min_lv = UINT_MAX;
-    p->max_lv = 0;
-    for (i=0; i<MAX_PARTY; i++) {
-        /**
-         * - If not online OR if it's a family party and this is the child (doesn't affect exp range)
-         **/
-        if (!p->party.member[i].online || p->party.member[i].char_id == p->family)
-            continue;
-
-        lv=p->party.member[i].lv;
-        if (lv < p->min_lv) p->min_lv = lv;
-        if (lv > p->max_lv) p->max_lv = lv;
-    }
-
-    if (p->party.exp && !party_check_exp_share(p)) {
-        p->party.exp = 0;
-        mapif_party_optionchanged(0, &p->party, 0, 0);
-        return 0;
-    }
-    return 1;
+static int int_party_check_lv(struct party_data *p) {
+	int i;
+	unsigned int lv;
+	p->min_lv = UINT_MAX;
+	p->max_lv = 0;
+	for(i=0;i<MAX_PARTY;i++){
+		/**
+		 * - If not online OR if it's a family party and this is the child (doesn't affect exp range)
+		 **/
+		if(!p->party.member[i].online || p->party.member[i].char_id == p->family )
+			continue;
+
+		lv=p->party.member[i].lv;
+		if (lv < p->min_lv) p->min_lv = lv;
+		if (lv > p->max_lv) p->max_lv = lv;
+	}
+
+	if (p->party.exp && !party_check_exp_share(p)) {
+		p->party.exp = 0;
+		mapif_party_optionchanged(0, &p->party, 0, 0);
+		return 0;
+	}
+	return 1;
 }
 //Calculates the state of a party.
 static void int_party_calc_state(struct party_data *p)
 {
-    int i;
-    unsigned int lv;
-    p->min_lv = UINT_MAX;
-    p->max_lv = 0;
-    p->party.count =
-        p->size =
-            p->family = 0;
-
-    //Check party size
-    for (i=0; i<MAX_PARTY; i++) {
-        if (!p->party.member[i].lv) continue;
-        p->size++;
-        if (p->party.member[i].online)
-            p->party.count++;
-    }
-    if (p->size == 2 && (char_child(p->party.member[0].char_id,p->party.member[1].char_id) || char_child(p->party.member[1].char_id,p->party.member[0].char_id))) {
-        //Child should be able to share with either of their parents  [RoM]
-        if (p->party.member[0].class_&0x2000) //first slot is the child?
-            p->family = p->party.member[0].char_id;
-        else
-            p->family = p->party.member[1].char_id;
-    } else if (p->size == 3) {
-        //Check Family State.
-        p->family = char_family(
-                        p->party.member[0].char_id,
-                        p->party.member[1].char_id,
-                        p->party.member[2].char_id
-                    );
-    }
-    //max/min levels.
-    for (i=0; i<MAX_PARTY; i++) {
-        lv=p->party.member[i].lv;
-        if (!lv) continue;
-        if (p->party.member[i].online &&
-            //On families, the kid is not counted towards exp share rules.
-            p->party.member[i].char_id != p->family) {
-            if (lv < p->min_lv) p->min_lv=lv;
-            if (p->max_lv < lv) p->max_lv=lv;
-        }
-    }
-
-    if (p->party.exp && !party_check_exp_share(p)) {
-        p->party.exp = 0; //Set off even share.
-        mapif_party_optionchanged(0, &p->party, 0, 0);
-    }
-    return;
+	int i;
+	unsigned int lv;
+	p->min_lv = UINT_MAX;
+	p->max_lv = 0;
+	p->party.count =
+	p->size =
+	p->family = 0;
+
+	//Check party size
+	for(i=0;i<MAX_PARTY;i++){
+		if (!p->party.member[i].lv) continue;
+		p->size++;
+		if(p->party.member[i].online)
+			p->party.count++;
+	}
+	if( p->size == 2 && ( char_child(p->party.member[0].char_id,p->party.member[1].char_id) || char_child(p->party.member[1].char_id,p->party.member[0].char_id) ) ) {
+		//Child should be able to share with either of their parents  [RoM]
+		if(p->party.member[0].class_&0x2000) //first slot is the child?
+			p->family = p->party.member[0].char_id;
+		else
+			p->family = p->party.member[1].char_id;
+	} else if( p->size == 3 ) {
+		//Check Family State.
+		p->family = char_family(
+			p->party.member[0].char_id,
+			p->party.member[1].char_id,
+			p->party.member[2].char_id
+		);
+	}
+	//max/min levels.
+	for(i=0;i<MAX_PARTY;i++){
+		lv=p->party.member[i].lv;
+		if (!lv) continue;
+		if(p->party.member[i].online &&
+			//On families, the kid is not counted towards exp share rules.
+			p->party.member[i].char_id != p->family)
+		{
+			if( lv < p->min_lv ) p->min_lv=lv;
+			if( p->max_lv < lv ) p->max_lv=lv;
+		}
+	}
+
+	if (p->party.exp && !party_check_exp_share(p)) {
+		p->party.exp = 0; //Set off even share.
+		mapif_party_optionchanged(0, &p->party, 0, 0);
+	}
+	return;
 }
 
 // Save party to mysql
 int inter_party_tosql(struct party *p, int flag, int index)
 {
-    // 'party' ('party_id','name','exp','item','leader_id','leader_char')
-    char esc_name[NAME_LENGTH*2+1];// escaped party name
-    int party_id;
+	// 'party' ('party_id','name','exp','item','leader_id','leader_char')
+	char esc_name[NAME_LENGTH*2+1];// escaped party name
+	int party_id;
 
-    if (p == NULL || p->party_id == 0)
-        return 0;
-    party_id = p->party_id;
+	if( p == NULL || p->party_id == 0 )
+		return 0;
+	party_id = p->party_id;
 
 #ifdef NOISY
-    ShowInfo("Save party request ("CL_BOLD"%d"CL_RESET" - %s).\n", party_id, p->name);
+	ShowInfo("Save party request ("CL_BOLD"%d"CL_RESET" - %s).\n", party_id, p->name);
 #endif
-    Sql_EscapeStringLen(sql_handle, esc_name, p->name, strnlen(p->name, NAME_LENGTH));
-
-    if (flag & PS_BREAK) {
-        // Break the party
-        // we'll skip name-checking and just reset everyone with the same party id [celest]
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d'", char_db, party_id))
-            Sql_ShowDebug(sql_handle);
-        if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `party_id`='%d'", party_db, party_id))
-            Sql_ShowDebug(sql_handle);
-        //Remove from memory
-        idb_remove(party_db_, party_id);
-        return 1;
-    }
-
-    if (flag & PS_CREATE) {
-        // Create party
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
-                                   "(`name`, `exp`, `item`, `leader_id`, `leader_char`) "
-                                   "VALUES ('%s', '%d', '%d', '%d', '%d')",
-                                   party_db, esc_name, p->exp, p->item, p->member[index].account_id, p->member[index].char_id)) {
-            Sql_ShowDebug(sql_handle);
-            return 0;
-        }
-        party_id = p->party_id = (int)Sql_LastInsertId(sql_handle);
-    }
-
-    if (flag & PS_BASIC) {
-        // Update party info.
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `name`='%s', `exp`='%d', `item`='%d' WHERE `party_id`='%d'",
-                                   party_db, esc_name, p->exp, p->item, party_id))
-            Sql_ShowDebug(sql_handle);
-    }
-
-    if (flag & PS_LEADER) {
-        // Update leader
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s`  SET `leader_id`='%d', `leader_char`='%d' WHERE `party_id`='%d'",
-                                   party_db, p->member[index].account_id, p->member[index].char_id, party_id))
-            Sql_ShowDebug(sql_handle);
-    }
-
-    if (flag & PS_ADDMEMBER) {
-        // Add one party member.
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `party_id`='%d' WHERE `account_id`='%d' AND `char_id`='%d'",
-                                   char_db, party_id, p->member[index].account_id, p->member[index].char_id))
-            Sql_ShowDebug(sql_handle);
-    }
-
-    if (flag & PS_DELMEMBER) {
-        // Remove one party member.
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d' AND `account_id`='%d' AND `char_id`='%d'",
-                                   char_db, party_id, p->member[index].account_id, p->member[index].char_id))
-            Sql_ShowDebug(sql_handle);
-    }
-
-    if (save_log)
-        ShowInfo("Party Saved (%d - %s)\n", party_id, p->name);
-    return 1;
+	Sql_EscapeStringLen(sql_handle, esc_name, p->name, strnlen(p->name, NAME_LENGTH));
+
+	if( flag & PS_BREAK )
+	{// Break the party
+		// we'll skip name-checking and just reset everyone with the same party id [celest]
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d'", char_db, party_id) )
+			Sql_ShowDebug(sql_handle);
+		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `party_id`='%d'", party_db, party_id) )
+			Sql_ShowDebug(sql_handle);
+		//Remove from memory
+		idb_remove(party_db_, party_id);
+		return 1;
+	}
+
+	if( flag & PS_CREATE )
+	{// Create party
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
+			"(`name`, `exp`, `item`, `leader_id`, `leader_char`) "
+			"VALUES ('%s', '%d', '%d', '%d', '%d')",
+			party_db, esc_name, p->exp, p->item, p->member[index].account_id, p->member[index].char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+		party_id = p->party_id = (int)Sql_LastInsertId(sql_handle);
+	}
+
+	if( flag & PS_BASIC )
+	{// Update party info.
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `name`='%s', `exp`='%d', `item`='%d' WHERE `party_id`='%d'",
+			party_db, esc_name, p->exp, p->item, party_id) )
+			Sql_ShowDebug(sql_handle);
+	}
+
+	if( flag & PS_LEADER )
+	{// Update leader
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s`  SET `leader_id`='%d', `leader_char`='%d' WHERE `party_id`='%d'",
+			party_db, p->member[index].account_id, p->member[index].char_id, party_id) )
+			Sql_ShowDebug(sql_handle);
+	}
+	
+	if( flag & PS_ADDMEMBER )
+	{// Add one party member.
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `party_id`='%d' WHERE `account_id`='%d' AND `char_id`='%d'",
+			char_db, party_id, p->member[index].account_id, p->member[index].char_id) )
+			Sql_ShowDebug(sql_handle);
+	}
+
+	if( flag & PS_DELMEMBER )
+	{// Remove one party member.
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d' AND `account_id`='%d' AND `char_id`='%d'",
+			char_db, party_id, p->member[index].account_id, p->member[index].char_id) )
+			Sql_ShowDebug(sql_handle);
+	}
+
+	if( save_log )
+		ShowInfo("Party Saved (%d - %s)\n", party_id, p->name);
+	return 1;
 }
 
 // Read party from mysql
-struct party_data *inter_party_fromsql(int party_id) {
-    int leader_id = 0;
-    int leader_char = 0;
-    struct party_data *p;
-    struct party_member *m;
-    char *data;
-    size_t len;
-    int i;
+struct party_data *inter_party_fromsql(int party_id)
+{
+	int leader_id = 0;
+	int leader_char = 0;
+	struct party_data* p;
+	struct party_member* m;
+	char* data;
+	size_t len;
+	int i;
 
 #ifdef NOISY
-    ShowInfo("Load party request ("CL_BOLD"%d"CL_RESET")\n", party_id);
+	ShowInfo("Load party request ("CL_BOLD"%d"CL_RESET")\n", party_id);
 #endif
-    if (party_id <= 0)
-        return NULL;
-
-    //Load from memory
-    p = (struct party_data *)idb_get(party_db_, party_id);
-    if (p != NULL)
-        return p;
-
-    p = party_pt;
-    memset(p, 0, sizeof(struct party_data));
-
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `party_id`, `name`,`exp`,`item`, `leader_id`, `leader_char` FROM `%s` WHERE `party_id`='%d'", party_db, party_id)) {
-        Sql_ShowDebug(sql_handle);
-        return NULL;
-    }
-
-    if (SQL_SUCCESS != Sql_NextRow(sql_handle))
-        return NULL;
-
-    p->party.party_id = party_id;
-    Sql_GetData(sql_handle, 1, &data, &len);
-    memcpy(p->party.name, data, min(len, NAME_LENGTH));
-    Sql_GetData(sql_handle, 2, &data, NULL);
-    p->party.exp = (atoi(data) ? 1 : 0);
-    Sql_GetData(sql_handle, 3, &data, NULL);
-    p->party.item = atoi(data);
-    Sql_GetData(sql_handle, 4, &data, NULL);
-    leader_id = atoi(data);
-    Sql_GetData(sql_handle, 5, &data, NULL);
-    leader_char = atoi(data);
-    Sql_FreeResult(sql_handle);
-
-    // Load members
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`char_id`,`name`,`base_level`,`last_map`,`online`,`class` FROM `%s` WHERE `party_id`='%d'", char_db, party_id)) {
-        Sql_ShowDebug(sql_handle);
-        return NULL;
-    }
-    for (i = 0; i < MAX_PARTY && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i) {
-        m = &p->party.member[i];
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        m->account_id = atoi(data);
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        m->char_id = atoi(data);
-        Sql_GetData(sql_handle, 2, &data, &len);
-        memcpy(m->name, data, min(len, NAME_LENGTH));
-        Sql_GetData(sql_handle, 3, &data, NULL);
-        m->lv = atoi(data);
-        Sql_GetData(sql_handle, 4, &data, NULL);
-        m->map = mapindex_name2id(data);
-        Sql_GetData(sql_handle, 5, &data, NULL);
-        m->online = (atoi(data) ? 1 : 0);
-        Sql_GetData(sql_handle, 6, &data, NULL);
-        m->class_ = atoi(data);
-        m->leader = (m->account_id == leader_id && m->char_id == leader_char ? 1 : 0);
-    }
-    Sql_FreeResult(sql_handle);
-
-    if (save_log)
-        ShowInfo("Party loaded (%d - %s).\n", party_id, p->party.name);
-    //Add party to memory.
-    CREATE(p, struct party_data, 1);
-    memcpy(p, party_pt, sizeof(struct party_data));
-    //init state
-    int_party_calc_state(p);
-    idb_put(party_db_, party_id, p);
-    return p;
+	if( party_id <= 0 )
+		return NULL;
+	
+	//Load from memory
+	p = (struct party_data*)idb_get(party_db_, party_id);
+	if( p != NULL )
+		return p;
+
+	p = party_pt;
+	memset(p, 0, sizeof(struct party_data));
+
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `party_id`, `name`,`exp`,`item`, `leader_id`, `leader_char` FROM `%s` WHERE `party_id`='%d'", party_db, party_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return NULL;
+	}
+
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+		return NULL;
+
+	p->party.party_id = party_id;
+	Sql_GetData(sql_handle, 1, &data, &len); memcpy(p->party.name, data, min(len, NAME_LENGTH));
+	Sql_GetData(sql_handle, 2, &data, NULL); p->party.exp = (atoi(data) ? 1 : 0);
+	Sql_GetData(sql_handle, 3, &data, NULL); p->party.item = atoi(data);
+	Sql_GetData(sql_handle, 4, &data, NULL); leader_id = atoi(data);
+	Sql_GetData(sql_handle, 5, &data, NULL); leader_char = atoi(data);
+	Sql_FreeResult(sql_handle);
+
+	// Load members
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`char_id`,`name`,`base_level`,`last_map`,`online`,`class` FROM `%s` WHERE `party_id`='%d'", char_db, party_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return NULL;
+	}
+	for( i = 0; i < MAX_PARTY && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	{
+		m = &p->party.member[i];
+		Sql_GetData(sql_handle, 0, &data, NULL); m->account_id = atoi(data);
+		Sql_GetData(sql_handle, 1, &data, NULL); m->char_id = atoi(data);
+		Sql_GetData(sql_handle, 2, &data, &len); memcpy(m->name, data, min(len, NAME_LENGTH));
+		Sql_GetData(sql_handle, 3, &data, NULL); m->lv = atoi(data);
+		Sql_GetData(sql_handle, 4, &data, NULL); m->map = mapindex_name2id(data);
+		Sql_GetData(sql_handle, 5, &data, NULL); m->online = (atoi(data) ? 1 : 0);
+		Sql_GetData(sql_handle, 6, &data, NULL); m->class_ = atoi(data);
+		m->leader = (m->account_id == leader_id && m->char_id == leader_char ? 1 : 0);
+	}
+	Sql_FreeResult(sql_handle);
+
+	if( save_log )
+		ShowInfo("Party loaded (%d - %s).\n", party_id, p->party.name);
+	//Add party to memory.
+	CREATE(p, struct party_data, 1);
+	memcpy(p, party_pt, sizeof(struct party_data));
+	//init state
+	int_party_calc_state(p);
+	idb_put(party_db_, party_id, p);
+	return p;
 }
 
 int inter_party_sql_init(void)
 {
-    //memory alloc
-    party_db_ = idb_alloc(DB_OPT_RELEASE_DATA);
-    party_pt = (struct party_data *)aCalloc(sizeof(struct party_data), 1);
-    if (!party_pt) {
-        ShowFatalError("inter_party_sql_init: Out of Memory!\n");
-        exit(EXIT_FAILURE);
-    }
-
-    /* Uncomment the following if you want to do a party_db cleanup (remove parties with no members) on startup.[Skotlex]
-    ShowStatus("cleaning party table...\n");
-    if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` USING `%s` LEFT JOIN `%s` ON `%s`.leader_id =`%s`.account_id AND `%s`.leader_char = `%s`.char_id WHERE `%s`.account_id IS NULL",
-        party_db, party_db, char_db, party_db, char_db, party_db, char_db, char_db) )
-        Sql_ShowDebug(sql_handle);
-    */
-    return 0;
+	//memory alloc
+	party_db_ = idb_alloc(DB_OPT_RELEASE_DATA);
+	party_pt = (struct party_data*)aCalloc(sizeof(struct party_data), 1);
+	if (!party_pt) {
+		ShowFatalError("inter_party_sql_init: Out of Memory!\n");
+		exit(EXIT_FAILURE);
+	}
+
+	/* Uncomment the following if you want to do a party_db cleanup (remove parties with no members) on startup.[Skotlex]
+	ShowStatus("cleaning party table...\n");
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` USING `%s` LEFT JOIN `%s` ON `%s`.leader_id =`%s`.account_id AND `%s`.leader_char = `%s`.char_id WHERE `%s`.account_id IS NULL",
+		party_db, party_db, char_db, party_db, char_db, party_db, char_db, char_db) )
+		Sql_ShowDebug(sql_handle);
+	*/
+	return 0;
 }
 
 void inter_party_sql_final(void)
 {
-    party_db_->destroy(party_db_, NULL);
-    aFree(party_pt);
-    return;
+	party_db_->destroy(party_db_, NULL);
+	aFree(party_pt);
+	return;
 }
 
 // Search for the party according to its name
-struct party_data *search_partyname(char *str) {
-    char esc_name[NAME_LENGTH*2+1];
-    char *data;
-    struct party_data *p = NULL;
-
-    Sql_EscapeStringLen(sql_handle, esc_name, str, safestrnlen(str, NAME_LENGTH));
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `party_id` FROM `%s` WHERE `name`='%s'", party_db, esc_name))
-        Sql_ShowDebug(sql_handle);
-    else if (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        p = inter_party_fromsql(atoi(data));
-    }
-    Sql_FreeResult(sql_handle);
-
-    return p;
+struct party_data* search_partyname(char* str)
+{
+	char esc_name[NAME_LENGTH*2+1];
+	char* data;
+	struct party_data* p = NULL;
+
+	Sql_EscapeStringLen(sql_handle, esc_name, str, safestrnlen(str, NAME_LENGTH));
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `party_id` FROM `%s` WHERE `name`='%s'", party_db, esc_name) )
+		Sql_ShowDebug(sql_handle);
+	else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		p = inter_party_fromsql(atoi(data));
+	}
+	Sql_FreeResult(sql_handle);
+
+	return p;
 }
 
 // Returns whether this party can keep having exp share or not.
 int party_check_exp_share(struct party_data *p)
 {
-    return (p->party.count < 2 || p->max_lv - p->min_lv <= party_share_level);
+	return (p->party.count < 2 || p->max_lv - p->min_lv <= party_share_level);
 }
 
 // Is there any member in the party?
 int party_check_empty(struct party_data *p)
 {
-    int i;
-    if (p==NULL||p->party.party_id==0) return 1;
-    for (i=0; i<MAX_PARTY && !p->party.member[i].account_id; i++);
-    if (i < MAX_PARTY) return 0;
-    // If there is no member, then break the party
-    mapif_party_broken(p->party.party_id,0);
-    inter_party_tosql(&p->party, PS_BREAK, 0);
-    return 1;
+	int i;
+	if (p==NULL||p->party.party_id==0) return 1;
+	for(i=0;i<MAX_PARTY && !p->party.member[i].account_id;i++);
+	if (i < MAX_PARTY) return 0;
+	// If there is no member, then break the party
+	mapif_party_broken(p->party.party_id,0);
+	inter_party_tosql(&p->party, PS_BREAK, 0);
+	return 1;
 }
 
 //-------------------------------------------------------------------
@@ -335,135 +330,133 @@ int party_check_empty(struct party_data *p)
 // Create a party whether or not
 int mapif_party_created(int fd,int account_id,int char_id,struct party *p)
 {
-    WFIFOHEAD(fd, 39);
-    WFIFOW(fd,0)=0x3820;
-    WFIFOL(fd,2)=account_id;
-    WFIFOL(fd,6)=char_id;
-    if (p!=NULL) {
-        WFIFOB(fd,10)=0;
-        WFIFOL(fd,11)=p->party_id;
-        memcpy(WFIFOP(fd,15),p->name,NAME_LENGTH);
-        ShowInfo("int_party: Party created (%d - %s)\n",p->party_id,p->name);
-    } else {
-        WFIFOB(fd,10)=1;
-        WFIFOL(fd,11)=0;
-        memset(WFIFOP(fd,15),0,NAME_LENGTH);
-    }
-    WFIFOSET(fd,39);
-
-    return 0;
+	WFIFOHEAD(fd, 39);
+	WFIFOW(fd,0)=0x3820;
+	WFIFOL(fd,2)=account_id;
+	WFIFOL(fd,6)=char_id;
+	if(p!=NULL){
+		WFIFOB(fd,10)=0;
+		WFIFOL(fd,11)=p->party_id;
+		memcpy(WFIFOP(fd,15),p->name,NAME_LENGTH);
+		ShowInfo("int_party: Party created (%d - %s)\n",p->party_id,p->name);
+	}else{
+		WFIFOB(fd,10)=1;
+		WFIFOL(fd,11)=0;
+		memset(WFIFOP(fd,15),0,NAME_LENGTH);
+	}
+	WFIFOSET(fd,39);
+
+	return 0;
 }
 
 //Party information not found
 static void mapif_party_noinfo(int fd, int party_id, int char_id)
 {
-    WFIFOHEAD(fd, 12);
-    WFIFOW(fd,0) = 0x3821;
-    WFIFOW(fd,2) = 12;
-    WFIFOL(fd,4) = char_id;
-    WFIFOL(fd,8) = party_id;
-    WFIFOSET(fd,12);
-    ShowWarning("int_party: info not found (party_id=%d char_id=%d)\n", party_id, char_id);
+	WFIFOHEAD(fd, 12);
+	WFIFOW(fd,0) = 0x3821;
+	WFIFOW(fd,2) = 12;
+	WFIFOL(fd,4) = char_id;
+	WFIFOL(fd,8) = party_id;
+	WFIFOSET(fd,12);
+	ShowWarning("int_party: info not found (party_id=%d char_id=%d)\n", party_id, char_id);
 }
 
 //Digest party information
-static void mapif_party_info(int fd, struct party *p, int char_id)
+static void mapif_party_info(int fd, struct party* p, int char_id)
 {
-    unsigned char buf[8 + sizeof(struct party)];
-    WBUFW(buf,0) = 0x3821;
-    WBUFW(buf,2) = 8 + sizeof(struct party);
-    WBUFL(buf,4) = char_id;
-    memcpy(WBUFP(buf,8), p, sizeof(struct party));
-
-    if (fd<0)
-        mapif_sendall(buf,WBUFW(buf,2));
-    else
-        mapif_send(fd,buf,WBUFW(buf,2));
+	unsigned char buf[8 + sizeof(struct party)];
+	WBUFW(buf,0) = 0x3821;
+	WBUFW(buf,2) = 8 + sizeof(struct party);
+	WBUFL(buf,4) = char_id;
+	memcpy(WBUFP(buf,8), p, sizeof(struct party));
+
+	if(fd<0)
+		mapif_sendall(buf,WBUFW(buf,2));
+	else
+		mapif_send(fd,buf,WBUFW(buf,2));
 }
 
 //Whether or not additional party members
-int mapif_party_memberadded(int fd, int party_id, int account_id, int char_id, int flag)
-{
-    WFIFOHEAD(fd, 15);
-    WFIFOW(fd,0) = 0x3822;
-    WFIFOL(fd,2) = party_id;
-    WFIFOL(fd,6) = account_id;
-    WFIFOL(fd,10) = char_id;
-    WFIFOB(fd,14) = flag;
-    WFIFOSET(fd,15);
-
-    return 0;
+int mapif_party_memberadded(int fd, int party_id, int account_id, int char_id, int flag) {
+	WFIFOHEAD(fd, 15);
+	WFIFOW(fd,0) = 0x3822;
+	WFIFOL(fd,2) = party_id;
+	WFIFOL(fd,6) = account_id;
+	WFIFOL(fd,10) = char_id;
+	WFIFOB(fd,14) = flag;
+	WFIFOSET(fd,15);
+
+	return 0;
 }
 
 // Party setting change notification
 int mapif_party_optionchanged(int fd,struct party *p,int account_id,int flag)
 {
-    unsigned char buf[16];
-    WBUFW(buf,0)=0x3823;
-    WBUFL(buf,2)=p->party_id;
-    WBUFL(buf,6)=account_id;
-    WBUFW(buf,10)=p->exp;
-    WBUFW(buf,12)=p->item;
-    WBUFB(buf,14)=flag;
-    if (flag==0)
-        mapif_sendall(buf,15);
-    else
-        mapif_send(fd,buf,15);
-    return 0;
+	unsigned char buf[16];
+	WBUFW(buf,0)=0x3823;
+	WBUFL(buf,2)=p->party_id;
+	WBUFL(buf,6)=account_id;
+	WBUFW(buf,10)=p->exp;
+	WBUFW(buf,12)=p->item;
+	WBUFB(buf,14)=flag;
+	if(flag==0)
+		mapif_sendall(buf,15);
+	else
+		mapif_send(fd,buf,15);
+	return 0;
 }
 
 //Withdrawal notification party
-int mapif_party_withdraw(int party_id,int account_id, int char_id)
-{
-    unsigned char buf[16];
-
-    WBUFW(buf,0) = 0x3824;
-    WBUFL(buf,2) = party_id;
-    WBUFL(buf,6) = account_id;
-    WBUFL(buf,10) = char_id;
-    mapif_sendall(buf, 14);
-    return 0;
+int mapif_party_withdraw(int party_id,int account_id, int char_id) {
+	unsigned char buf[16];
+
+	WBUFW(buf,0) = 0x3824;
+	WBUFL(buf,2) = party_id;
+	WBUFL(buf,6) = account_id;
+	WBUFL(buf,10) = char_id;
+	mapif_sendall(buf, 14);
+	return 0;
 }
 
 //Party map update notification
 int mapif_party_membermoved(struct party *p,int idx)
 {
-    unsigned char buf[20];
-
-    WBUFW(buf,0) = 0x3825;
-    WBUFL(buf,2) = p->party_id;
-    WBUFL(buf,6) = p->member[idx].account_id;
-    WBUFL(buf,10) = p->member[idx].char_id;
-    WBUFW(buf,14) = p->member[idx].map;
-    WBUFB(buf,16) = p->member[idx].online;
-    WBUFW(buf,17) = p->member[idx].lv;
-    mapif_sendall(buf, 19);
-    return 0;
+	unsigned char buf[20];
+
+	WBUFW(buf,0) = 0x3825;
+	WBUFL(buf,2) = p->party_id;
+	WBUFL(buf,6) = p->member[idx].account_id;
+	WBUFL(buf,10) = p->member[idx].char_id;
+	WBUFW(buf,14) = p->member[idx].map;
+	WBUFB(buf,16) = p->member[idx].online;
+	WBUFW(buf,17) = p->member[idx].lv;
+	mapif_sendall(buf, 19);
+	return 0;
 }
 
 //Dissolution party notification
 int mapif_party_broken(int party_id,int flag)
 {
-    unsigned char buf[16];
-    WBUFW(buf,0)=0x3826;
-    WBUFL(buf,2)=party_id;
-    WBUFB(buf,6)=flag;
-    mapif_sendall(buf,7);
-    //printf("int_party: broken %d\n",party_id);
-    return 0;
+	unsigned char buf[16];
+	WBUFW(buf,0)=0x3826;
+	WBUFL(buf,2)=party_id;
+	WBUFB(buf,6)=flag;
+	mapif_sendall(buf,7);
+	//printf("int_party: broken %d\n",party_id);
+	return 0;
 }
 
 //Remarks in the party
 int mapif_party_message(int party_id,int account_id,char *mes,int len, int sfd)
 {
-    unsigned char buf[512];
-    WBUFW(buf,0)=0x3827;
-    WBUFW(buf,2)=len+12;
-    WBUFL(buf,4)=party_id;
-    WBUFL(buf,8)=account_id;
-    memcpy(WBUFP(buf,12),mes,len);
-    mapif_sendallwos(sfd, buf,len+12);
-    return 0;
+	unsigned char buf[512];
+	WBUFW(buf,0)=0x3827;
+	WBUFW(buf,2)=len+12;
+	WBUFL(buf,4)=party_id;
+	WBUFL(buf,8)=account_id;
+	memcpy(WBUFP(buf,12),mes,len);
+	mapif_sendallwos(sfd, buf,len+12);
+	return 0;
 }
 
 //-------------------------------------------------------------------
@@ -473,267 +466,273 @@ int mapif_party_message(int party_id,int account_id,char *mes,int len, int sfd)
 // Create Party
 int mapif_parse_CreateParty(int fd, char *name, int item, int item2, struct party_member *leader)
 {
-    struct party_data *p;
-    int i;
-    if ((p=search_partyname(name))!=NULL) {
-        mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
-        return 0;
-    }
-    // Check Authorised letters/symbols in the name of the character
-    if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) == NULL) {
-                mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
-                return 0;
-            }
-    } else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) != NULL) {
-                mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
-                return 0;
-            }
-    }
-
-    p = (struct party_data *)aCalloc(1, sizeof(struct party_data));
-
-    memcpy(p->party.name,name,NAME_LENGTH);
-    p->party.exp=0;
-    p->party.item=(item?1:0)|(item2?2:0);
-
-    memcpy(&p->party.member[0], leader, sizeof(struct party_member));
-    p->party.member[0].leader=1;
-    p->party.member[0].online=1;
-
-    p->party.party_id=-1;//New party.
-    if (inter_party_tosql(&p->party,PS_CREATE|PS_ADDMEMBER,0)) {
-        //Add party to db
-        int_party_calc_state(p);
-        idb_put(party_db_, p->party.party_id, p);
-        mapif_party_info(fd, &p->party, 0);
-        mapif_party_created(fd,leader->account_id,leader->char_id,&p->party);
-    } else { //Failed to create party.
-        aFree(p);
-        mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
-    }
-
-    return 0;
+	struct party_data *p;
+	int i;
+	if( (p=search_partyname(name))!=NULL){
+		mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
+		return 0;
+	}
+	// Check Authorised letters/symbols in the name of the character
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+		for (i = 0; i < NAME_LENGTH && name[i]; i++)
+			if (strchr(char_name_letters, name[i]) == NULL) {
+				mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
+				return 0;
+			}
+	} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
+		for (i = 0; i < NAME_LENGTH && name[i]; i++)
+			if (strchr(char_name_letters, name[i]) != NULL) {
+				mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
+				return 0;
+			}
+	}
+
+	p = (struct party_data*)aCalloc(1, sizeof(struct party_data));
+	
+	memcpy(p->party.name,name,NAME_LENGTH);
+	p->party.exp=0;
+	p->party.item=(item?1:0)|(item2?2:0);
+
+	memcpy(&p->party.member[0], leader, sizeof(struct party_member));
+	p->party.member[0].leader=1;
+	p->party.member[0].online=1;
+
+	p->party.party_id=-1;//New party.
+	if (inter_party_tosql(&p->party,PS_CREATE|PS_ADDMEMBER,0)) {
+		//Add party to db
+		int_party_calc_state(p);
+		idb_put(party_db_, p->party.party_id, p);
+		mapif_party_info(fd, &p->party, 0);
+		mapif_party_created(fd,leader->account_id,leader->char_id,&p->party);
+	} else { //Failed to create party.
+		aFree(p);
+		mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
+	}
+
+	return 0;
 }
 
 // Party information request
 static void mapif_parse_PartyInfo(int fd, int party_id, int char_id)
 {
-    struct party_data *p;
-    p = inter_party_fromsql(party_id);
+	struct party_data *p;
+	p = inter_party_fromsql(party_id);
 
-    if (p)
-        mapif_party_info(fd, &p->party, char_id);
-    else
-        mapif_party_noinfo(fd, party_id, char_id);
+	if (p)
+		mapif_party_info(fd, &p->party, char_id);
+	else
+		mapif_party_noinfo(fd, party_id, char_id);
 }
 
 // Add a player to party request
 int mapif_parse_PartyAddMember(int fd, int party_id, struct party_member *member)
 {
-    struct party_data *p;
-    int i;
-
-    p = inter_party_fromsql(party_id);
-    if (p == NULL || p->size == MAX_PARTY) {
-        mapif_party_memberadded(fd, party_id, member->account_id, member->char_id, 1);
-        return 0;
-    }
-
-    ARR_FIND(0, MAX_PARTY, i, p->party.member[i].account_id == 0);
-    if (i == MAX_PARTY) {
-        // Party full
-        mapif_party_memberadded(fd, party_id, member->account_id, member->char_id, 1);
-        return 0;
-    }
-
-    memcpy(&p->party.member[i], member, sizeof(struct party_member));
-    p->party.member[i].leader = 0;
-    if (p->party.member[i].online) p->party.count++;
-    p->size++;
-    if (p->size == 2 || p->size == 3) // Check family state. And also accept either of their Parents. [RoM]
-        int_party_calc_state(p);
-    else //Check even share range.
-        if (member->lv < p->min_lv || member->lv > p->max_lv || p->family) {
-            if (p->family) p->family = 0; //Family state broken.
-            int_party_check_lv(p);
-        }
-
-    mapif_party_info(-1, &p->party, 0);
-    mapif_party_memberadded(fd, party_id, member->account_id, member->char_id, 0);
-    inter_party_tosql(&p->party, PS_ADDMEMBER, i);
-
-    return 0;
+	struct party_data *p;
+	int i;
+
+	p = inter_party_fromsql(party_id);
+	if( p == NULL || p->size == MAX_PARTY ) {
+		mapif_party_memberadded(fd, party_id, member->account_id, member->char_id, 1);
+		return 0;
+	}
+
+	ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == 0 );
+	if( i == MAX_PARTY )
+	{// Party full
+		mapif_party_memberadded(fd, party_id, member->account_id, member->char_id, 1);
+		return 0;
+	}
+
+	memcpy(&p->party.member[i], member, sizeof(struct party_member));
+	p->party.member[i].leader = 0;
+	if (p->party.member[i].online) p->party.count++;
+	p->size++;
+	if (p->size == 2 || p->size == 3) // Check family state. And also accept either of their Parents. [RoM]
+		int_party_calc_state(p);
+	else //Check even share range.
+	if (member->lv < p->min_lv || member->lv > p->max_lv || p->family) {
+		if (p->family) p->family = 0; //Family state broken.
+		int_party_check_lv(p);
+	}
+
+	mapif_party_info(-1, &p->party, 0);
+	mapif_party_memberadded(fd, party_id, member->account_id, member->char_id, 0);
+	inter_party_tosql(&p->party, PS_ADDMEMBER, i);
+
+	return 0;
 }
 
 //Party setting change request
 int mapif_parse_PartyChangeOption(int fd,int party_id,int account_id,int exp,int item)
 {
-    struct party_data *p;
-    int flag = 0;
-    p = inter_party_fromsql(party_id);
-
-    if (!p)
-        return 0;
-
-    p->party.exp=exp;
-    if (exp && !party_check_exp_share(p)) {
-        flag|=0x01;
-        p->party.exp=0;
-    }
-    p->party.item = item&0x3; //Filter out invalid values.
-    mapif_party_optionchanged(fd,&p->party,account_id,flag);
-    inter_party_tosql(&p->party, PS_BASIC, 0);
-    return 0;
+	struct party_data *p;
+	int flag = 0;
+	p = inter_party_fromsql(party_id);
+
+	if(!p)
+		return 0;
+
+	p->party.exp=exp;
+	if( exp && !party_check_exp_share(p) ){
+		flag|=0x01;
+		p->party.exp=0;
+	}
+	p->party.item = item&0x3; //Filter out invalid values.
+	mapif_party_optionchanged(fd,&p->party,account_id,flag);
+	inter_party_tosql(&p->party, PS_BASIC, 0);
+	return 0;
 }
 
 //Request leave party
 int mapif_parse_PartyLeave(int fd, int party_id, int account_id, int char_id)
 {
-    struct party_data *p;
-    int i,j=-1;
-
-    p = inter_party_fromsql(party_id);
-    if (p == NULL) {
-        // Party does not exists?
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d'", char_db, party_id))
-            Sql_ShowDebug(sql_handle);
-        return 0;
-    }
-
-    for (i = 0; i < MAX_PARTY; i++) {
-        if (p->party.member[i].account_id == account_id &&
-            p->party.member[i].char_id == char_id) {
-            break;
-        }
-    }
-    if (i >= MAX_PARTY)
-        return 0; //Member not found?
-
-    mapif_party_withdraw(party_id, account_id, char_id);
-
-    if (p->party.member[i].leader) {
-        p->party.member[i].account_id = 0;
-        for (j = 0; j < MAX_PARTY; j++) {
-            if (!p->party.member[j].account_id)
-                continue;
-            mapif_party_withdraw(party_id, p->party.member[j].account_id, p->party.member[j].char_id);
-            p->party.member[j].account_id = 0;
-        }
-        //Party gets deleted on the check_empty call below.
-    } else {
-        inter_party_tosql(&p->party,PS_DELMEMBER,i);
-        j = p->party.member[i].lv;
-        if (p->party.member[i].online) p->party.count--;
-        memset(&p->party.member[i], 0, sizeof(struct party_member));
-        p->size--;
-        if (j == p->min_lv || j == p->max_lv || p->family) {
-            if (p->family) p->family = 0; //Family state broken.
-            int_party_check_lv(p);
-        }
-    }
-
-    if (party_check_empty(p) == 0)
-        mapif_party_info(-1, &p->party, 0);
-    return 0;
+	struct party_data *p;
+	int i,j=-1;
+
+	p = inter_party_fromsql(party_id);
+	if( p == NULL )
+	{// Party does not exists?
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d'", char_db, party_id) )
+			Sql_ShowDebug(sql_handle);
+		return 0;
+	}
+
+	for (i = 0; i < MAX_PARTY; i++) {
+		if(p->party.member[i].account_id == account_id &&
+			p->party.member[i].char_id == char_id) {
+			break;
+		}
+	}
+	if (i >= MAX_PARTY)
+		return 0; //Member not found?
+
+	mapif_party_withdraw(party_id, account_id, char_id);
+
+	if (p->party.member[i].leader){
+		p->party.member[i].account_id = 0;
+		for (j = 0; j < MAX_PARTY; j++) {
+			if (!p->party.member[j].account_id)
+				continue;
+			mapif_party_withdraw(party_id, p->party.member[j].account_id, p->party.member[j].char_id);
+			p->party.member[j].account_id = 0;
+		}
+		//Party gets deleted on the check_empty call below.
+	} else {
+		inter_party_tosql(&p->party,PS_DELMEMBER,i);
+		j = p->party.member[i].lv;
+		if(p->party.member[i].online) p->party.count--;
+		memset(&p->party.member[i], 0, sizeof(struct party_member));
+		p->size--;
+		if (j == p->min_lv || j == p->max_lv || p->family)
+		{
+			if(p->family) p->family = 0; //Family state broken.
+			int_party_check_lv(p);
+		}
+	}
+		
+	if (party_check_empty(p) == 0)
+		mapif_party_info(-1, &p->party, 0);
+	return 0;
 }
 // When member goes to other map or levels up.
 int mapif_parse_PartyChangeMap(int fd, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv)
 {
-    struct party_data *p;
-    int i;
-
-    p = inter_party_fromsql(party_id);
-    if (p == NULL)
-        return 0;
-
-    for (i = 0; i < MAX_PARTY &&
-         (p->party.member[i].account_id != account_id ||
-          p->party.member[i].char_id != char_id); i++);
-
-    if (i == MAX_PARTY) return 0;
-
-    if (p->party.member[i].online != online) {
-        p->party.member[i].online = online;
-        if (online)
-            p->party.count++;
-        else
-            p->party.count--;
-        // Even share check situations: Family state (always breaks)
-        // character logging on/off is max/min level (update level range)
-        // or character logging on/off has a different level (update level range using new level)
-        if (p->family ||
-            (p->party.member[i].lv <= p->min_lv || p->party.member[i].lv >= p->max_lv) ||
-            (p->party.member[i].lv != lv && (lv <= p->min_lv || lv >= p->max_lv))
-           ) {
-            p->party.member[i].lv = lv;
-            int_party_check_lv(p);
-        }
-        //Send online/offline update.
-        mapif_party_membermoved(&p->party, i);
-    }
-
-    if (p->party.member[i].lv != lv) {
-        if (p->party.member[i].lv == p->min_lv ||
-            p->party.member[i].lv == p->max_lv) {
-            p->party.member[i].lv = lv;
-            int_party_check_lv(p);
-        } else
-            p->party.member[i].lv = lv;
-        //There is no need to send level update to map servers
-        //since they do nothing with it.
-    }
-
-    if (p->party.member[i].map != map) {
-        p->party.member[i].map = map;
-        mapif_party_membermoved(&p->party, i);
-    }
-    return 0;
+	struct party_data *p;
+	int i;
+
+	p = inter_party_fromsql(party_id);
+	if (p == NULL)
+		return 0;
+
+	for(i = 0; i < MAX_PARTY && 
+		(p->party.member[i].account_id != account_id ||
+		p->party.member[i].char_id != char_id); i++);
+
+	if (i == MAX_PARTY) return 0;
+
+	if (p->party.member[i].online != online)
+	{
+		p->party.member[i].online = online;
+		if (online)
+			p->party.count++;
+		else
+			p->party.count--;
+		// Even share check situations: Family state (always breaks)
+		// character logging on/off is max/min level (update level range) 
+		// or character logging on/off has a different level (update level range using new level)
+		if (p->family ||
+			(p->party.member[i].lv <= p->min_lv || p->party.member[i].lv >= p->max_lv) ||
+			(p->party.member[i].lv != lv && (lv <= p->min_lv || lv >= p->max_lv))
+			)
+		{
+			p->party.member[i].lv = lv;
+			int_party_check_lv(p);
+		}
+		//Send online/offline update.
+		mapif_party_membermoved(&p->party, i);
+	}
+
+	if (p->party.member[i].lv != lv) {
+		if(p->party.member[i].lv == p->min_lv ||
+			p->party.member[i].lv == p->max_lv)
+		{
+			p->party.member[i].lv = lv;
+			int_party_check_lv(p);
+		} else
+			p->party.member[i].lv = lv;
+		//There is no need to send level update to map servers
+		//since they do nothing with it.
+	}
+
+	if (p->party.member[i].map != map) {
+		p->party.member[i].map = map;
+		mapif_party_membermoved(&p->party, i);
+	}
+	return 0;
 }
 
 //Request party dissolution
 int mapif_parse_BreakParty(int fd,int party_id)
 {
-    struct party_data *p;
+	struct party_data *p;
 
-    p = inter_party_fromsql(party_id);
+	p = inter_party_fromsql(party_id);
 
-    if (!p)
-        return 0;
-    inter_party_tosql(&p->party,PS_BREAK,0);
-    mapif_party_broken(fd,party_id);
-    return 0;
+	if(!p)
+		return 0;
+	inter_party_tosql(&p->party,PS_BREAK,0);
+	mapif_party_broken(fd,party_id);
+	return 0;
 }
 
 //Party sending the message
 int mapif_parse_PartyMessage(int fd,int party_id,int account_id,char *mes,int len)
 {
-    return mapif_party_message(party_id,account_id,mes,len, fd);
+	return mapif_party_message(party_id,account_id,mes,len, fd);
 }
 
 int mapif_parse_PartyLeaderChange(int fd,int party_id,int account_id,int char_id)
 {
-    struct party_data *p;
-    int i;
-
-    p = inter_party_fromsql(party_id);
-
-    if (!p)
-        return 0;
-
-    for (i = 0; i < MAX_PARTY; i++) {
-        if (p->party.member[i].leader)
-            p->party.member[i].leader = 0;
-        if (p->party.member[i].account_id == account_id &&
-            p->party.member[i].char_id == char_id) {
-            p->party.member[i].leader = 1;
-            inter_party_tosql(&p->party,PS_LEADER, i);
-        }
-    }
-    return 1;
+	struct party_data *p;
+	int i;
+
+	p = inter_party_fromsql(party_id);
+
+	if(!p)
+		return 0;
+
+	for (i = 0; i < MAX_PARTY; i++)
+	{
+		if(p->party.member[i].leader) 
+			p->party.member[i].leader = 0;
+		if(p->party.member[i].account_id == account_id &&
+			p->party.member[i].char_id == char_id)
+	  	{
+			p->party.member[i].leader = 1;
+			inter_party_tosql(&p->party,PS_LEADER, i);
+		}
+	}
+	return 1;
 }
 
 
@@ -742,139 +741,123 @@ int mapif_parse_PartyLeaderChange(int fd,int party_id,int account_id,int char_id
 // Data packet length is set to inter.c that you
 // Do NOT go and check the packet length, RFIFOSKIP is done by the caller
 // Return :
-//  0 : error
-//  1 : ok
+// 	0 : error
+//	1 : ok
 int inter_party_parse_frommap(int fd)
 {
-    RFIFOHEAD(fd);
-    switch (RFIFOW(fd,0)) {
-        case 0x3020:
-            mapif_parse_CreateParty(fd, (char *)RFIFOP(fd,4), RFIFOB(fd,28), RFIFOB(fd,29), (struct party_member *)RFIFOP(fd,30));
-            break;
-        case 0x3021:
-            mapif_parse_PartyInfo(fd, RFIFOL(fd,2), RFIFOL(fd,6));
-            break;
-        case 0x3022:
-            mapif_parse_PartyAddMember(fd, RFIFOL(fd,4), (struct party_member *)RFIFOP(fd,8));
-            break;
-        case 0x3023:
-            mapif_parse_PartyChangeOption(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOW(fd,10), RFIFOW(fd,12));
-            break;
-        case 0x3024:
-            mapif_parse_PartyLeave(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
-            break;
-        case 0x3025:
-            mapif_parse_PartyChangeMap(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOW(fd,14), RFIFOB(fd,16), RFIFOW(fd,17));
-            break;
-        case 0x3026:
-            mapif_parse_BreakParty(fd, RFIFOL(fd,2));
-            break;
-        case 0x3027:
-            mapif_parse_PartyMessage(fd, RFIFOL(fd,4), RFIFOL(fd,8), (char *)RFIFOP(fd,12), RFIFOW(fd,2)-12);
-            break;
-        case 0x3029:
-            mapif_parse_PartyLeaderChange(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+	RFIFOHEAD(fd);
+	switch(RFIFOW(fd,0)) {
+	case 0x3020: mapif_parse_CreateParty(fd, (char*)RFIFOP(fd,4), RFIFOB(fd,28), RFIFOB(fd,29), (struct party_member*)RFIFOP(fd,30)); break;
+	case 0x3021: mapif_parse_PartyInfo(fd, RFIFOL(fd,2), RFIFOL(fd,6)); break;
+	case 0x3022: mapif_parse_PartyAddMember(fd, RFIFOL(fd,4), (struct party_member*)RFIFOP(fd,8)); break;
+	case 0x3023: mapif_parse_PartyChangeOption(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOW(fd,10), RFIFOW(fd,12)); break;
+	case 0x3024: mapif_parse_PartyLeave(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); break;
+	case 0x3025: mapif_parse_PartyChangeMap(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOW(fd,14), RFIFOB(fd,16), RFIFOW(fd,17)); break;
+	case 0x3026: mapif_parse_BreakParty(fd, RFIFOL(fd,2)); break;
+	case 0x3027: mapif_parse_PartyMessage(fd, RFIFOL(fd,4), RFIFOL(fd,8), (char*)RFIFOP(fd,12), RFIFOW(fd,2)-12); break;
+	case 0x3029: mapif_parse_PartyLeaderChange(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); break;
+	default:
+		return 0;
+	}
+	return 1;
 }
 
 //Leave request from the server (for delete character)
 int inter_party_leave(int party_id,int account_id, int char_id)
 {
-    return mapif_parse_PartyLeave(-1,party_id,account_id, char_id);
+	return mapif_parse_PartyLeave(-1,party_id,account_id, char_id);
 }
 
 int inter_party_CharOnline(int char_id, int party_id)
 {
-    struct party_data *p;
-    int i;
-
-    if (party_id == -1) {
-        // Get party_id from the database
-        char *data;
-
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT party_id FROM `%s` WHERE char_id='%d'", char_db, char_id)) {
-            Sql_ShowDebug(sql_handle);
-            return 0;
-        }
-
-        if (SQL_SUCCESS != Sql_NextRow(sql_handle))
-            return 0; //Eh? No party?
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        party_id = atoi(data);
-        Sql_FreeResult(sql_handle);
-    }
-    if (party_id == 0)
-        return 0; //No party...
-
-    p = inter_party_fromsql(party_id);
-    if (!p) {
-        ShowError("Character %d's party %d not found!\n", char_id, party_id);
-        return 0;
-    }
-
-    //Set member online
-    for (i=0; i<MAX_PARTY; i++) {
-        if (p->party.member[i].char_id == char_id) {
-            if (!p->party.member[i].online) {
-                p->party.member[i].online = 1;
-                p->party.count++;
-                if (p->party.member[i].lv < p->min_lv ||
-                    p->party.member[i].lv > p->max_lv)
-                    int_party_check_lv(p);
-            }
-            break;
-        }
-    }
-    return 1;
+	struct party_data* p;
+	int i;
+
+	if( party_id == -1 )
+	{// Get party_id from the database
+		char* data;
+
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT party_id FROM `%s` WHERE char_id='%d'", char_db, char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+
+		if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+			return 0; //Eh? No party?
+
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		party_id = atoi(data);
+		Sql_FreeResult(sql_handle);
+	}
+	if (party_id == 0)
+		return 0; //No party...
+	
+	p = inter_party_fromsql(party_id);
+	if(!p) {
+		ShowError("Character %d's party %d not found!\n", char_id, party_id);
+		return 0;
+	}
+
+	//Set member online
+	for(i=0; i<MAX_PARTY; i++) {
+		if (p->party.member[i].char_id == char_id) {
+			if (!p->party.member[i].online) {
+				p->party.member[i].online = 1;
+				p->party.count++;
+				if (p->party.member[i].lv < p->min_lv ||
+					p->party.member[i].lv > p->max_lv)
+					int_party_check_lv(p);
+			}
+			break;
+		}
+	}
+	return 1;
 }
 
-int inter_party_CharOffline(int char_id, int party_id)
-{
-    struct party_data *p=NULL;
-    int i;
-
-    if (party_id == -1) {
-        // Get guild_id from the database
-        char *data;
-
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT party_id FROM `%s` WHERE char_id='%d'", char_db, char_id)) {
-            Sql_ShowDebug(sql_handle);
-            return 0;
-        }
-
-        if (SQL_SUCCESS != Sql_NextRow(sql_handle))
-            return 0; //Eh? No party?
-
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        party_id = atoi(data);
-        Sql_FreeResult(sql_handle);
-    }
-    if (party_id == 0)
-        return 0; //No party...
-
-    //Character has a party, set character offline and check if they were the only member online
-    if ((p = inter_party_fromsql(party_id)) == NULL)
-        return 0;
-
-    //Set member offline
-    for (i=0; i< MAX_PARTY; i++) {
-        if (p->party.member[i].char_id == char_id) {
-            p->party.member[i].online = 0;
-            p->party.count--;
-            if (p->party.member[i].lv == p->min_lv ||
-                p->party.member[i].lv == p->max_lv)
-                int_party_check_lv(p);
-            break;
-        }
-    }
-
-    if (!p->party.count)
-        //Parties don't have any data that needs be saved at this point... so just remove it from memory.
-        idb_remove(party_db_, party_id);
-    return 1;
+int inter_party_CharOffline(int char_id, int party_id) {
+	struct party_data *p=NULL;
+	int i;
+
+	if( party_id == -1 )
+	{// Get guild_id from the database
+		char* data;
+
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT party_id FROM `%s` WHERE char_id='%d'", char_db, char_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+
+		if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+			return 0; //Eh? No party?
+
+		Sql_GetData(sql_handle, 0, &data, NULL);
+		party_id = atoi(data);
+		Sql_FreeResult(sql_handle);
+	}
+	if (party_id == 0)
+		return 0; //No party...
+	
+	//Character has a party, set character offline and check if they were the only member online
+	if ((p = inter_party_fromsql(party_id)) == NULL)
+		return 0;
+
+	//Set member offline
+	for(i=0; i< MAX_PARTY; i++) {
+		if(p->party.member[i].char_id == char_id)
+		{
+			p->party.member[i].online = 0;
+			p->party.count--;
+			if(p->party.member[i].lv == p->min_lv ||
+				p->party.member[i].lv == p->max_lv)
+				int_party_check_lv(p);
+			break;
+		}
+	}
+
+	if(!p->party.count)
+		//Parties don't have any data that needs be saved at this point... so just remove it from memory.
+		idb_remove(party_db_, party_id);
+	return 1;
 }
diff --git a/src/char/int_party.h b/src/char/int_party.h
index 27df25f15..d8cdcdc6a 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.h
@@ -6,12 +6,12 @@
 
 //Party Flags on what to save/delete.
 enum {
-    PS_CREATE = 0x01, //Create a new party entry (index holds leader's info)
-    PS_BASIC = 0x02, //Update basic party info.
-    PS_LEADER = 0x04, //Update party's leader
-    PS_ADDMEMBER = 0x08, //Specify new party member (index specifies which party member)
-    PS_DELMEMBER = 0x10, //Specify member that left (index specifies which party member)
-    PS_BREAK = 0x20, //Specify that this party must be deleted.
+	PS_CREATE = 0x01, //Create a new party entry (index holds leader's info) 
+	PS_BASIC = 0x02, //Update basic party info.
+	PS_LEADER = 0x04, //Update party's leader
+	PS_ADDMEMBER = 0x08, //Specify new party member (index specifies which party member)
+	PS_DELMEMBER = 0x10, //Specify member that left (index specifies which party member)
+	PS_BREAK = 0x20, //Specify that this party must be deleted.
 };
 
 struct party;
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index e04138c0a..114398290 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -18,319 +18,292 @@
 struct s_pet *pet_pt;
 
 //---------------------------------------------------------
-int inter_pet_tosql(int pet_id, struct s_pet *p)
+int inter_pet_tosql(int pet_id, struct s_pet* p)
 {
-    //`pet` (`pet_id`, `class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate`)
-    char esc_name[NAME_LENGTH*2+1];// escaped pet name
-
-    Sql_EscapeStringLen(sql_handle, esc_name, p->name, strnlen(p->name, NAME_LENGTH));
-    p->hungry = cap_value(p->hungry, 0, 100);
-    p->intimate = cap_value(p->intimate, 0, 1000);
-
-    if (pet_id == -1) {
-        // New pet.
-        if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
-                                   "(`class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate`) "
-                                   "VALUES ('%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-                                   pet_db, p->class_, esc_name, p->account_id, p->char_id, p->level, p->egg_id,
-                                   p->equip, p->intimate, p->hungry, p->rename_flag, p->incuvate)) {
-            Sql_ShowDebug(sql_handle);
-            return 0;
-        }
-        p->pet_id = (int)Sql_LastInsertId(sql_handle);
-    } else {
-        // Update pet.
-        if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `class`='%d',`name`='%s',`account_id`='%d',`char_id`='%d',`level`='%d',`egg_id`='%d',`equip`='%d',`intimate`='%d',`hungry`='%d',`rename_flag`='%d',`incuvate`='%d' WHERE `pet_id`='%d'",
-                                   pet_db, p->class_, esc_name, p->account_id, p->char_id, p->level, p->egg_id,
-                                   p->equip, p->intimate, p->hungry, p->rename_flag, p->incuvate, p->pet_id)) {
-            Sql_ShowDebug(sql_handle);
-            return 0;
-        }
-    }
-
-    if (save_log)
-        ShowInfo("Pet saved %d - %s.\n", pet_id, p->name);
-    return 1;
+	//`pet` (`pet_id`, `class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate`)
+	char esc_name[NAME_LENGTH*2+1];// escaped pet name
+
+	Sql_EscapeStringLen(sql_handle, esc_name, p->name, strnlen(p->name, NAME_LENGTH));
+	p->hungry = cap_value(p->hungry, 0, 100);
+	p->intimate = cap_value(p->intimate, 0, 1000);
+
+	if( pet_id == -1 )
+	{// New pet.
+		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
+			"(`class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate`) "
+			"VALUES ('%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
+			pet_db, p->class_, esc_name, p->account_id, p->char_id, p->level, p->egg_id,
+			p->equip, p->intimate, p->hungry, p->rename_flag, p->incuvate) )
+		{
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+		p->pet_id = (int)Sql_LastInsertId(sql_handle);
+	}
+	else
+	{// Update pet.
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `class`='%d',`name`='%s',`account_id`='%d',`char_id`='%d',`level`='%d',`egg_id`='%d',`equip`='%d',`intimate`='%d',`hungry`='%d',`rename_flag`='%d',`incuvate`='%d' WHERE `pet_id`='%d'",
+			pet_db, p->class_, esc_name, p->account_id, p->char_id, p->level, p->egg_id,
+			p->equip, p->intimate, p->hungry, p->rename_flag, p->incuvate, p->pet_id) )
+		{
+			Sql_ShowDebug(sql_handle);
+			return 0;
+		}
+	}
+
+	if (save_log)
+		ShowInfo("Pet saved %d - %s.\n", pet_id, p->name);
+	return 1;
 }
 
-int inter_pet_fromsql(int pet_id, struct s_pet *p)
+int inter_pet_fromsql(int pet_id, struct s_pet* p)
 {
-    char *data;
-    size_t len;
+	char* data;
+	size_t len;
 
 #ifdef NOISY
-    ShowInfo("Loading pet (%d)...\n",pet_id);
+	ShowInfo("Loading pet (%d)...\n",pet_id);
 #endif
-    memset(p, 0, sizeof(struct s_pet));
-
-    //`pet` (`pet_id`, `class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate`)
-
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `pet_id`, `class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate` FROM `%s` WHERE `pet_id`='%d'", pet_db, pet_id)) {
-        Sql_ShowDebug(sql_handle);
-        return 0;
-    }
-
-    if (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-        p->pet_id = pet_id;
-        Sql_GetData(sql_handle,  1, &data, NULL);
-        p->class_ = atoi(data);
-        Sql_GetData(sql_handle,  2, &data, &len);
-        memcpy(p->name, data, min(len, NAME_LENGTH));
-        Sql_GetData(sql_handle,  3, &data, NULL);
-        p->account_id = atoi(data);
-        Sql_GetData(sql_handle,  4, &data, NULL);
-        p->char_id = atoi(data);
-        Sql_GetData(sql_handle,  5, &data, NULL);
-        p->level = atoi(data);
-        Sql_GetData(sql_handle,  6, &data, NULL);
-        p->egg_id = atoi(data);
-        Sql_GetData(sql_handle,  7, &data, NULL);
-        p->equip = atoi(data);
-        Sql_GetData(sql_handle,  8, &data, NULL);
-        p->intimate = atoi(data);
-        Sql_GetData(sql_handle,  9, &data, NULL);
-        p->hungry = atoi(data);
-        Sql_GetData(sql_handle, 10, &data, NULL);
-        p->rename_flag = atoi(data);
-        Sql_GetData(sql_handle, 11, &data, NULL);
-        p->incuvate = atoi(data);
-
-        Sql_FreeResult(sql_handle);
-
-        p->hungry = cap_value(p->hungry, 0, 100);
-        p->intimate = cap_value(p->intimate, 0, 1000);
-
-        if (save_log)
-            ShowInfo("Pet loaded (%d - %s).\n", pet_id, p->name);
-    }
-    return 0;
+	memset(p, 0, sizeof(struct s_pet));
+
+	//`pet` (`pet_id`, `class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate`)
+
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `pet_id`, `class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate` FROM `%s` WHERE `pet_id`='%d'", pet_db, pet_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return 0;
+	}
+
+	if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	{
+		p->pet_id = pet_id;
+		Sql_GetData(sql_handle,  1, &data, NULL); p->class_ = atoi(data);
+		Sql_GetData(sql_handle,  2, &data, &len); memcpy(p->name, data, min(len, NAME_LENGTH));
+		Sql_GetData(sql_handle,  3, &data, NULL); p->account_id = atoi(data);
+		Sql_GetData(sql_handle,  4, &data, NULL); p->char_id = atoi(data);
+		Sql_GetData(sql_handle,  5, &data, NULL); p->level = atoi(data);
+		Sql_GetData(sql_handle,  6, &data, NULL); p->egg_id = atoi(data);
+		Sql_GetData(sql_handle,  7, &data, NULL); p->equip = atoi(data);
+		Sql_GetData(sql_handle,  8, &data, NULL); p->intimate = atoi(data);
+		Sql_GetData(sql_handle,  9, &data, NULL); p->hungry = atoi(data);
+		Sql_GetData(sql_handle, 10, &data, NULL); p->rename_flag = atoi(data);
+		Sql_GetData(sql_handle, 11, &data, NULL); p->incuvate = atoi(data);
+
+		Sql_FreeResult(sql_handle);
+
+		p->hungry = cap_value(p->hungry, 0, 100);
+		p->intimate = cap_value(p->intimate, 0, 1000);
+
+		if( save_log )
+			ShowInfo("Pet loaded (%d - %s).\n", pet_id, p->name);
+	}
+	return 0;
 }
 //----------------------------------------------
 
-int inter_pet_sql_init(void)
-{
-    //memory alloc
-    pet_pt = (struct s_pet *)aCalloc(sizeof(struct s_pet), 1);
-    return 0;
+int inter_pet_sql_init(void){
+	//memory alloc
+	pet_pt = (struct s_pet*)aCalloc(sizeof(struct s_pet), 1);
+	return 0;
 }
-void inter_pet_sql_final(void)
-{
-    if (pet_pt) aFree(pet_pt);
-    return;
+void inter_pet_sql_final(void){
+	if (pet_pt) aFree(pet_pt);
+	return;
 }
 //----------------------------------
-int inter_pet_delete(int pet_id)
-{
-    ShowInfo("delete pet request: %d...\n",pet_id);
+int inter_pet_delete(int pet_id){
+	ShowInfo("delete pet request: %d...\n",pet_id);
 
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `pet_id`='%d'", pet_db, pet_id))
-        Sql_ShowDebug(sql_handle);
-    return 0;
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `pet_id`='%d'", pet_db, pet_id) )
+		Sql_ShowDebug(sql_handle);
+	return 0;
 }
 //------------------------------------------------------
 int mapif_pet_created(int fd, int account_id, struct s_pet *p)
 {
-    WFIFOHEAD(fd, 11);
-    WFIFOW(fd, 0) =0x3880;
-    WFIFOL(fd, 2) =account_id;
-    if (p!=NULL) {
-        WFIFOB(fd, 6)=0;
-        WFIFOL(fd, 7) =p->pet_id;
-        ShowInfo("int_pet: created pet %d - %s\n", p->pet_id, p->name);
-    } else {
-        WFIFOB(fd, 6)=1;
-        WFIFOL(fd, 7)=0;
-    }
-    WFIFOSET(fd, 11);
-
-    return 0;
+	WFIFOHEAD(fd, 11);
+	WFIFOW(fd, 0) =0x3880;
+	WFIFOL(fd, 2) =account_id;
+	if(p!=NULL){
+		WFIFOB(fd, 6)=0;
+		WFIFOL(fd, 7) =p->pet_id;
+		ShowInfo("int_pet: created pet %d - %s\n", p->pet_id, p->name);
+	}else{
+		WFIFOB(fd, 6)=1;
+		WFIFOL(fd, 7)=0;
+	}
+	WFIFOSET(fd, 11);
+
+	return 0;
 }
 
-int mapif_pet_info(int fd, int account_id, struct s_pet *p)
-{
-    WFIFOHEAD(fd, sizeof(struct s_pet) + 9);
-    WFIFOW(fd, 0) =0x3881;
-    WFIFOW(fd, 2) =sizeof(struct s_pet) + 9;
-    WFIFOL(fd, 4) =account_id;
-    WFIFOB(fd, 8)=0;
-    memcpy(WFIFOP(fd, 9), p, sizeof(struct s_pet));
-    WFIFOSET(fd, WFIFOW(fd, 2));
-
-    return 0;
+int mapif_pet_info(int fd, int account_id, struct s_pet *p){
+	WFIFOHEAD(fd, sizeof(struct s_pet) + 9);
+	WFIFOW(fd, 0) =0x3881;
+	WFIFOW(fd, 2) =sizeof(struct s_pet) + 9;
+	WFIFOL(fd, 4) =account_id;
+	WFIFOB(fd, 8)=0;
+	memcpy(WFIFOP(fd, 9), p, sizeof(struct s_pet));
+	WFIFOSET(fd, WFIFOW(fd, 2));
+
+	return 0;
 }
 
-int mapif_pet_noinfo(int fd, int account_id)
-{
-    WFIFOHEAD(fd, sizeof(struct s_pet) + 9);
-    WFIFOW(fd, 0) =0x3881;
-    WFIFOW(fd, 2) =sizeof(struct s_pet) + 9;
-    WFIFOL(fd, 4) =account_id;
-    WFIFOB(fd, 8)=1;
-    memset(WFIFOP(fd, 9), 0, sizeof(struct s_pet));
-    WFIFOSET(fd, WFIFOW(fd, 2));
-
-    return 0;
+int mapif_pet_noinfo(int fd, int account_id){
+	WFIFOHEAD(fd, sizeof(struct s_pet) + 9);
+	WFIFOW(fd, 0) =0x3881;
+	WFIFOW(fd, 2) =sizeof(struct s_pet) + 9;
+	WFIFOL(fd, 4) =account_id;
+	WFIFOB(fd, 8)=1;
+	memset(WFIFOP(fd, 9), 0, sizeof(struct s_pet));
+	WFIFOSET(fd, WFIFOW(fd, 2));
+
+	return 0;
 }
 
-int mapif_save_pet_ack(int fd, int account_id, int flag)
-{
-    WFIFOHEAD(fd, 7);
-    WFIFOW(fd, 0) =0x3882;
-    WFIFOL(fd, 2) =account_id;
-    WFIFOB(fd, 6) =flag;
-    WFIFOSET(fd, 7);
+int mapif_save_pet_ack(int fd, int account_id, int flag){
+	WFIFOHEAD(fd, 7);
+	WFIFOW(fd, 0) =0x3882;
+	WFIFOL(fd, 2) =account_id;
+	WFIFOB(fd, 6) =flag;
+	WFIFOSET(fd, 7);
 
-    return 0;
+	return 0;
 }
 
-int mapif_delete_pet_ack(int fd, int flag)
-{
-    WFIFOHEAD(fd, 3);
-    WFIFOW(fd, 0) =0x3883;
-    WFIFOB(fd, 2) =flag;
-    WFIFOSET(fd, 3);
+int mapif_delete_pet_ack(int fd, int flag){
+	WFIFOHEAD(fd, 3);
+	WFIFOW(fd, 0) =0x3883;
+	WFIFOB(fd, 2) =flag;
+	WFIFOSET(fd, 3);
 
-    return 0;
+	return 0;
 }
 
 int mapif_create_pet(int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id,
-                     short pet_equip, short intimate, short hungry, char rename_flag, char incuvate, char *pet_name)
+	short pet_equip, short intimate, short hungry, char rename_flag, char incuvate, char *pet_name)
 {
-    memset(pet_pt, 0, sizeof(struct s_pet));
-    strncpy(pet_pt->name, pet_name, NAME_LENGTH);
-    if (incuvate == 1)
-        pet_pt->account_id = pet_pt->char_id = 0;
-    else {
-        pet_pt->account_id = account_id;
-        pet_pt->char_id = char_id;
-    }
-    pet_pt->class_ = pet_class;
-    pet_pt->level = pet_lv;
-    pet_pt->egg_id = pet_egg_id;
-    pet_pt->equip = pet_equip;
-    pet_pt->intimate = intimate;
-    pet_pt->hungry = hungry;
-    pet_pt->rename_flag = rename_flag;
-    pet_pt->incuvate = incuvate;
-
-    if (pet_pt->hungry < 0)
-        pet_pt->hungry = 0;
-    else if (pet_pt->hungry > 100)
-        pet_pt->hungry = 100;
-    if (pet_pt->intimate < 0)
-        pet_pt->intimate = 0;
-    else if (pet_pt->intimate > 1000)
-        pet_pt->intimate = 1000;
-
-    pet_pt->pet_id = -1; //Signal NEW pet.
-    if (inter_pet_tosql(pet_pt->pet_id,pet_pt))
-        mapif_pet_created(fd, account_id, pet_pt);
-    else    //Failed...
-        mapif_pet_created(fd, account_id, NULL);
-
-    return 0;
+	memset(pet_pt, 0, sizeof(struct s_pet));
+	strncpy(pet_pt->name, pet_name, NAME_LENGTH);
+	if(incuvate == 1)
+		pet_pt->account_id = pet_pt->char_id = 0;
+	else {
+		pet_pt->account_id = account_id;
+		pet_pt->char_id = char_id;
+	}
+	pet_pt->class_ = pet_class;
+	pet_pt->level = pet_lv;
+	pet_pt->egg_id = pet_egg_id;
+	pet_pt->equip = pet_equip;
+	pet_pt->intimate = intimate;
+	pet_pt->hungry = hungry;
+	pet_pt->rename_flag = rename_flag;
+	pet_pt->incuvate = incuvate;
+
+	if(pet_pt->hungry < 0)
+		pet_pt->hungry = 0;
+	else if(pet_pt->hungry > 100)
+		pet_pt->hungry = 100;
+	if(pet_pt->intimate < 0)
+		pet_pt->intimate = 0;
+	else if(pet_pt->intimate > 1000)
+		pet_pt->intimate = 1000;
+
+	pet_pt->pet_id = -1; //Signal NEW pet.
+	if (inter_pet_tosql(pet_pt->pet_id,pet_pt))
+		mapif_pet_created(fd, account_id, pet_pt);
+	else	//Failed...
+		mapif_pet_created(fd, account_id, NULL);
+
+	return 0;
 }
 
-int mapif_load_pet(int fd, int account_id, int char_id, int pet_id)
-{
-    memset(pet_pt, 0, sizeof(struct s_pet));
-
-    inter_pet_fromsql(pet_id, pet_pt);
-
-    if (pet_pt!=NULL) {
-        if (pet_pt->incuvate == 1) {
-            pet_pt->account_id = pet_pt->char_id = 0;
-            mapif_pet_info(fd, account_id, pet_pt);
-        } else if (account_id == pet_pt->account_id && char_id == pet_pt->char_id)
-            mapif_pet_info(fd, account_id, pet_pt);
-        else
-            mapif_pet_noinfo(fd, account_id);
-    } else
-        mapif_pet_noinfo(fd, account_id);
-
-    return 0;
+int mapif_load_pet(int fd, int account_id, int char_id, int pet_id){
+	memset(pet_pt, 0, sizeof(struct s_pet));
+
+	inter_pet_fromsql(pet_id, pet_pt);
+
+	if(pet_pt!=NULL) {
+		if(pet_pt->incuvate == 1) {
+			pet_pt->account_id = pet_pt->char_id = 0;
+			mapif_pet_info(fd, account_id, pet_pt);
+		}
+		else if(account_id == pet_pt->account_id && char_id == pet_pt->char_id)
+			mapif_pet_info(fd, account_id, pet_pt);
+		else
+			mapif_pet_noinfo(fd, account_id);
+	}
+	else
+		mapif_pet_noinfo(fd, account_id);
+
+	return 0;
 }
 
-int mapif_save_pet(int fd, int account_id, struct s_pet *data)
-{
-    //here process pet save request.
-    int len;
-    RFIFOHEAD(fd);
-    len=RFIFOW(fd, 2);
-    if (sizeof(struct s_pet)!=len-8) {
-        ShowError("inter pet: data size error %d %d\n", sizeof(struct s_pet), len-8);
-    }
-
-    else {
-        if (data->hungry < 0)
-            data->hungry = 0;
-        else if (data->hungry > 100)
-            data->hungry = 100;
-        if (data->intimate < 0)
-            data->intimate = 0;
-        else if (data->intimate > 1000)
-            data->intimate = 1000;
-        inter_pet_tosql(data->pet_id,data);
-        mapif_save_pet_ack(fd, account_id, 0);
-    }
-
-    return 0;
+int mapif_save_pet(int fd, int account_id, struct s_pet *data) {
+	//here process pet save request.
+	int len;
+	RFIFOHEAD(fd);
+	len=RFIFOW(fd, 2);
+	if(sizeof(struct s_pet)!=len-8) {
+		ShowError("inter pet: data size error %d %d\n", sizeof(struct s_pet), len-8);
+	}
+
+	else{
+		if(data->hungry < 0)
+			data->hungry = 0;
+		else if(data->hungry > 100)
+			data->hungry = 100;
+		if(data->intimate < 0)
+			data->intimate = 0;
+		else if(data->intimate > 1000)
+			data->intimate = 1000;
+		inter_pet_tosql(data->pet_id,data);
+		mapif_save_pet_ack(fd, account_id, 0);
+	}
+
+	return 0;
 }
 
-int mapif_delete_pet(int fd, int pet_id)
-{
-    mapif_delete_pet_ack(fd, inter_pet_delete(pet_id));
+int mapif_delete_pet(int fd, int pet_id){
+	mapif_delete_pet_ack(fd, inter_pet_delete(pet_id));
 
-    return 0;
+	return 0;
 }
 
-int mapif_parse_CreatePet(int fd)
-{
-    RFIFOHEAD(fd);
-    mapif_create_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOW(fd, 10), RFIFOW(fd, 12), RFIFOW(fd, 14), RFIFOW(fd, 16), RFIFOW(fd, 18),
-                     RFIFOW(fd, 20), RFIFOB(fd, 22), RFIFOB(fd, 23), (char *)RFIFOP(fd, 24));
-    return 0;
+int mapif_parse_CreatePet(int fd){
+	RFIFOHEAD(fd);
+	mapif_create_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOW(fd, 10), RFIFOW(fd, 12), RFIFOW(fd, 14), RFIFOW(fd, 16), RFIFOW(fd, 18),
+		RFIFOW(fd, 20), RFIFOB(fd, 22), RFIFOB(fd, 23), (char*)RFIFOP(fd, 24));
+	return 0;
 }
 
-int mapif_parse_LoadPet(int fd)
-{
-    RFIFOHEAD(fd);
-    mapif_load_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
-    return 0;
+int mapif_parse_LoadPet(int fd){
+	RFIFOHEAD(fd);
+	mapif_load_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
+	return 0;
 }
 
-int mapif_parse_SavePet(int fd)
-{
-    RFIFOHEAD(fd);
-    mapif_save_pet(fd, RFIFOL(fd, 4), (struct s_pet *) RFIFOP(fd, 8));
-    return 0;
+int mapif_parse_SavePet(int fd){
+	RFIFOHEAD(fd);
+	mapif_save_pet(fd, RFIFOL(fd, 4), (struct s_pet *) RFIFOP(fd, 8));
+	return 0;
 }
 
-int mapif_parse_DeletePet(int fd)
-{
-    RFIFOHEAD(fd);
-    mapif_delete_pet(fd, RFIFOL(fd, 2));
-    return 0;
+int mapif_parse_DeletePet(int fd){
+	RFIFOHEAD(fd);
+	mapif_delete_pet(fd, RFIFOL(fd, 2));
+	return 0;
 }
 
-int inter_pet_parse_frommap(int fd)
-{
-    RFIFOHEAD(fd);
-    switch (RFIFOW(fd, 0)) {
-        case 0x3080:
-            mapif_parse_CreatePet(fd);
-            break;
-        case 0x3081:
-            mapif_parse_LoadPet(fd);
-            break;
-        case 0x3082:
-            mapif_parse_SavePet(fd);
-            break;
-        case 0x3083:
-            mapif_parse_DeletePet(fd);
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+int inter_pet_parse_frommap(int fd){
+	RFIFOHEAD(fd);
+	switch(RFIFOW(fd, 0)){
+	case 0x3080: mapif_parse_CreatePet(fd); break;
+	case 0x3081: mapif_parse_LoadPet(fd); break;
+	case 0x3082: mapif_parse_SavePet(fd); break;
+	case 0x3083: mapif_parse_DeletePet(fd); break;
+	default:
+		return 0;
+	}
+	return 1;
 }
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 8ba6ef95a..224205412 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -21,158 +21,164 @@
 //Load entire questlog for a character
 int mapif_quests_fromsql(int char_id, struct quest questlog[])
 {
-    int i;
-    struct quest tmp_quest;
-    SqlStmt *stmt;
-
-    stmt = SqlStmt_Malloc(sql_handle);
-    if (stmt == NULL) {
-        SqlStmt_ShowDebug(stmt);
-        return 0;
-    }
-
-    memset(&tmp_quest, 0, sizeof(struct quest));
-
-    if (SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `quest_id`, `state`, `time`, `count1`, `count2`, `count3` FROM `%s` WHERE `char_id`=? LIMIT %d", quest_db, MAX_QUEST_DB)
-        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-        ||  SQL_ERROR == SqlStmt_Execute(stmt)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,    &tmp_quest.quest_id, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_INT,    &tmp_quest.state, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_UINT,   &tmp_quest.time, 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_INT,    &tmp_quest.count[0], 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 4, SQLDT_INT,    &tmp_quest.count[1], 0, NULL, NULL)
-        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 5, SQLDT_INT,    &tmp_quest.count[2], 0, NULL, NULL))
-        SqlStmt_ShowDebug(stmt);
-
-    for (i = 0; i < MAX_QUEST_DB && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i)
-        memcpy(&questlog[i], &tmp_quest, sizeof(tmp_quest));
-
-    SqlStmt_Free(stmt);
-    return i;
+	int i;
+	struct quest tmp_quest;
+	SqlStmt * stmt;
+
+	stmt = SqlStmt_Malloc(sql_handle);
+	if( stmt == NULL )
+	{
+		SqlStmt_ShowDebug(stmt);
+		return 0;
+	}
+
+	memset(&tmp_quest, 0, sizeof(struct quest));
+
+	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `quest_id`, `state`, `time`, `count1`, `count2`, `count3` FROM `%s` WHERE `char_id`=? LIMIT %d", quest_db, MAX_QUEST_DB)
+	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+	||	SQL_ERROR == SqlStmt_Execute(stmt)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,    &tmp_quest.quest_id, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_INT,    &tmp_quest.state, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_UINT,   &tmp_quest.time, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_INT,    &tmp_quest.count[0], 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 4, SQLDT_INT,    &tmp_quest.count[1], 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 5, SQLDT_INT,    &tmp_quest.count[2], 0, NULL, NULL) )
+		SqlStmt_ShowDebug(stmt);
+
+	for( i = 0; i < MAX_QUEST_DB && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i )
+		memcpy(&questlog[i], &tmp_quest, sizeof(tmp_quest));
+
+	SqlStmt_Free(stmt);
+	return i;
 }
 
 //Delete a quest
 bool mapif_quest_delete(int char_id, int quest_id)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, quest_id, char_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
+	if ( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, quest_id, char_id) )
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 //Add a quest to a questlog
 bool mapif_quest_add(int char_id, struct quest qd)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`quest_id`, `char_id`, `state`, `time`, `count1`, `count2`, `count3`) VALUES ('%d', '%d', '%d','%d', '%d', '%d', '%d')", quest_db, qd.quest_id, char_id, qd.state, qd.time, qd.count[0], qd.count[1], qd.count[2])) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
+	if ( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`quest_id`, `char_id`, `state`, `time`, `count1`, `count2`, `count3`) VALUES ('%d', '%d', '%d','%d', '%d', '%d', '%d')", quest_db, qd.quest_id, char_id, qd.state, qd.time, qd.count[0], qd.count[1], qd.count[2]) ) 
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 //Update a questlog
 bool mapif_quest_update(int char_id, struct quest qd)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `state`='%d', `count1`='%d', `count2`='%d', `count3`='%d' WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, qd.state, qd.count[0], qd.count[1], qd.count[2], qd.quest_id, char_id)) {
-        Sql_ShowDebug(sql_handle);
-        return false;
-    }
+	if ( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `state`='%d', `count1`='%d', `count2`='%d', `count3`='%d' WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, qd.state, qd.count[0], qd.count[1], qd.count[2], qd.quest_id, char_id) ) 
+	{
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 //Save quests
 int mapif_parse_quest_save(int fd)
 {
-    int i, j, k, num2, num1 = (RFIFOW(fd,2)-8)/sizeof(struct quest);
-    int char_id = RFIFOL(fd,4);
-    struct quest qd1[MAX_QUEST_DB],qd2[MAX_QUEST_DB];
-    bool success = true;
-
-    memset(qd1, 0, sizeof(qd1));
-    memset(qd2, 0, sizeof(qd2));
-    if (num1) memcpy(&qd1, RFIFOP(fd,8), RFIFOW(fd,2)-8);
-    num2 = mapif_quests_fromsql(char_id, qd2);
-
-    for (i = 0; i < num1; i++) {
-        ARR_FIND(0, num2, j, qd1[i].quest_id == qd2[j].quest_id);
-        if (j < num2) { // Update existed quests
-            // Only states and counts are changable.
-            ARR_FIND(0, MAX_QUEST_OBJECTIVES, k, qd1[i].count[k] != qd2[j].count[k]);
-            if (k != MAX_QUEST_OBJECTIVES || qd1[i].state != qd2[j].state)
-                success &= mapif_quest_update(char_id, qd1[i]);
-
-            if (j < (--num2)) {
-                memmove(&qd2[j],&qd2[j+1],sizeof(struct quest)*(num2-j));
-                memset(&qd2[num2], 0, sizeof(struct quest));
-            }
-
-        } else // Add new quests
-            success &= mapif_quest_add(char_id, qd1[i]);
-    }
-
-    for (i = 0; i < num2; i++)  // Quests not in qd1 but in qd2 are to be erased.
-        success &= mapif_quest_delete(char_id, qd2[i].quest_id);
-
-    WFIFOHEAD(fd,7);
-    WFIFOW(fd,0) = 0x3861;
-    WFIFOL(fd,2) = char_id;
-    WFIFOB(fd,6) = success?1:0;
-    WFIFOSET(fd,7);
-
-    return 0;
+	int i, j, k, num2, num1 = (RFIFOW(fd,2)-8)/sizeof(struct quest);
+	int char_id = RFIFOL(fd,4);
+	struct quest qd1[MAX_QUEST_DB],qd2[MAX_QUEST_DB];
+	bool success = true;
+
+	memset(qd1, 0, sizeof(qd1));
+	memset(qd2, 0, sizeof(qd2));
+	if( num1 ) memcpy(&qd1, RFIFOP(fd,8), RFIFOW(fd,2)-8);
+	num2 = mapif_quests_fromsql(char_id, qd2);
+
+	for( i = 0; i < num1; i++ )
+	{
+		ARR_FIND( 0, num2, j, qd1[i].quest_id == qd2[j].quest_id );
+		if( j < num2 ) // Update existed quests
+		{	// Only states and counts are changable.
+			ARR_FIND( 0, MAX_QUEST_OBJECTIVES, k, qd1[i].count[k] != qd2[j].count[k] );
+			if( k != MAX_QUEST_OBJECTIVES || qd1[i].state != qd2[j].state )
+				success &= mapif_quest_update(char_id, qd1[i]);
+
+			if( j < (--num2) )
+			{
+				memmove(&qd2[j],&qd2[j+1],sizeof(struct quest)*(num2-j));
+				memset(&qd2[num2], 0, sizeof(struct quest));
+			}
+
+		}
+		else // Add new quests
+			success &= mapif_quest_add(char_id, qd1[i]);
+	}
+
+	for( i = 0; i < num2; i++ ) // Quests not in qd1 but in qd2 are to be erased.
+		success &= mapif_quest_delete(char_id, qd2[i].quest_id);
+
+	WFIFOHEAD(fd,7);
+	WFIFOW(fd,0) = 0x3861;
+	WFIFOL(fd,2) = char_id;
+	WFIFOB(fd,6) = success?1:0;
+	WFIFOSET(fd,7);
+
+	return 0;
 }
 
 //Send questlog to map server
 int mapif_parse_quest_load(int fd)
 {
-    int char_id = RFIFOL(fd,2);
-    struct quest tmp_questlog[MAX_QUEST_DB];
-    int num_quests, i, num_complete = 0;
-    int complete[MAX_QUEST_DB];
-
-    memset(tmp_questlog, 0, sizeof(tmp_questlog));
-    memset(complete, 0, sizeof(complete));
-
-    num_quests = mapif_quests_fromsql(char_id, tmp_questlog);
-
-    WFIFOHEAD(fd,num_quests*sizeof(struct quest)+8);
-    WFIFOW(fd,0) = 0x3860;
-    WFIFOW(fd,2) = num_quests*sizeof(struct quest)+8;
-    WFIFOL(fd,4) = char_id;
-
-    //Active and inactive quests
-    for (i = 0; i < num_quests; i++) {
-        if (tmp_questlog[i].state == Q_COMPLETE) {
-            complete[num_complete++] = i;
-            continue;
-        }
-        memcpy(WFIFOP(fd,(i-num_complete)*sizeof(struct quest)+8), &tmp_questlog[i], sizeof(struct quest));
-    }
-
-    // Completed quests
-    for (i = num_quests - num_complete; i < num_quests; i++)
-        memcpy(WFIFOP(fd,i*sizeof(struct quest)+8), &tmp_questlog[complete[i-num_quests+num_complete]], sizeof(struct quest));
-
-    WFIFOSET(fd,num_quests*sizeof(struct quest)+8);
-
-    return 0;
+	int char_id = RFIFOL(fd,2);
+	struct quest tmp_questlog[MAX_QUEST_DB];
+	int num_quests, i, num_complete = 0;
+	int complete[MAX_QUEST_DB];
+
+	memset(tmp_questlog, 0, sizeof(tmp_questlog));
+	memset(complete, 0, sizeof(complete));
+
+	num_quests = mapif_quests_fromsql(char_id, tmp_questlog);
+
+	WFIFOHEAD(fd,num_quests*sizeof(struct quest)+8);
+	WFIFOW(fd,0) = 0x3860;
+	WFIFOW(fd,2) = num_quests*sizeof(struct quest)+8;
+	WFIFOL(fd,4) = char_id;
+
+	//Active and inactive quests
+	for( i = 0; i < num_quests; i++ )
+	{
+		if( tmp_questlog[i].state == Q_COMPLETE )
+		{
+			complete[num_complete++] = i;
+			continue;
+		}
+		memcpy(WFIFOP(fd,(i-num_complete)*sizeof(struct quest)+8), &tmp_questlog[i], sizeof(struct quest));
+	}
+
+	// Completed quests
+	for( i = num_quests - num_complete; i < num_quests; i++ )
+		memcpy(WFIFOP(fd,i*sizeof(struct quest)+8), &tmp_questlog[complete[i-num_quests+num_complete]], sizeof(struct quest));
+
+	WFIFOSET(fd,num_quests*sizeof(struct quest)+8);
+
+	return 0;
 }
 
 int inter_quest_parse_frommap(int fd)
 {
-    switch (RFIFOW(fd,0)) {
-        case 0x3060:
-            mapif_parse_quest_load(fd);
-            break;
-        case 0x3061:
-            mapif_parse_quest_save(fd);
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+	switch(RFIFOW(fd,0))
+	{
+		case 0x3060: mapif_parse_quest_load(fd); break;
+		case 0x3061: mapif_parse_quest_save(fd); break;
+		default:
+			return 0;
+	}
+	return 1;
 }
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index 6f94ecc32..248a4521f 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -15,155 +15,142 @@
 #include <stdlib.h>
 
 
-#define STORAGE_MEMINC  16
+#define STORAGE_MEMINC	16
 
 /// Save storage data to sql
-int storage_tosql(int account_id, struct storage_data *p)
+int storage_tosql(int account_id, struct storage_data* p)
 {
-    memitemdata_to_sql(p->items, MAX_STORAGE, account_id, TABLE_STORAGE);
-    return 0;
+	memitemdata_to_sql(p->items, MAX_STORAGE, account_id, TABLE_STORAGE);
+	return 0;
 }
 
 /// Load storage data to mem
-int storage_fromsql(int account_id, struct storage_data *p)
+int storage_fromsql(int account_id, struct storage_data* p)
 {
-    StringBuf buf;
-    struct item *item;
-    char *data;
-    int i;
-    int j;
-
-    memset(p, 0, sizeof(struct storage_data)); //clean up memory
-    p->storage_amount = 0;
-
-    // storage {`account_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`attribute`/`card0`/`card1`/`card2`/`card3`}
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`expire_time`");
-    for (j = 0; j < MAX_SLOTS; ++j)
-        StringBuf_Printf(&buf, ",`card%d`", j);
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `account_id`='%d' ORDER BY `nameid`", storage_db, account_id);
-
-    if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)))
-        Sql_ShowDebug(sql_handle);
-
-    StringBuf_Destroy(&buf);
-
-    for (i = 0; i < MAX_STORAGE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i) {
-        item = &p->items[i];
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        item->id = atoi(data);
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        item->nameid = atoi(data);
-        Sql_GetData(sql_handle, 2, &data, NULL);
-        item->amount = atoi(data);
-        Sql_GetData(sql_handle, 3, &data, NULL);
-        item->equip = atoi(data);
-        Sql_GetData(sql_handle, 4, &data, NULL);
-        item->identify = atoi(data);
-        Sql_GetData(sql_handle, 5, &data, NULL);
-        item->refine = atoi(data);
-        Sql_GetData(sql_handle, 6, &data, NULL);
-        item->attribute = atoi(data);
-        Sql_GetData(sql_handle, 7, &data, NULL);
-        item->expire_time = (unsigned int)atoi(data);
-        for (j = 0; j < MAX_SLOTS; ++j) {
-            Sql_GetData(sql_handle, 8+j, &data, NULL);
-            item->card[j] = atoi(data);
-        }
-    }
-    p->storage_amount = i;
-    Sql_FreeResult(sql_handle);
-
-    ShowInfo("storage load complete from DB - id: %d (total: %d)\n", account_id, p->storage_amount);
-    return 1;
+	StringBuf buf;
+	struct item* item;
+	char* data;
+	int i;
+	int j;
+
+	memset(p, 0, sizeof(struct storage_data)); //clean up memory
+	p->storage_amount = 0;
+
+	// storage {`account_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`attribute`/`card0`/`card1`/`card2`/`card3`}
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`expire_time`");
+	for( j = 0; j < MAX_SLOTS; ++j )
+		StringBuf_Printf(&buf, ",`card%d`", j);
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `account_id`='%d' ORDER BY `nameid`", storage_db, account_id);
+
+	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+		Sql_ShowDebug(sql_handle);
+
+	StringBuf_Destroy(&buf);
+
+	for( i = 0; i < MAX_STORAGE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	{
+		item = &p->items[i];
+		Sql_GetData(sql_handle, 0, &data, NULL); item->id = atoi(data);
+		Sql_GetData(sql_handle, 1, &data, NULL); item->nameid = atoi(data);
+		Sql_GetData(sql_handle, 2, &data, NULL); item->amount = atoi(data);
+		Sql_GetData(sql_handle, 3, &data, NULL); item->equip = atoi(data);
+		Sql_GetData(sql_handle, 4, &data, NULL); item->identify = atoi(data);
+		Sql_GetData(sql_handle, 5, &data, NULL); item->refine = atoi(data);
+		Sql_GetData(sql_handle, 6, &data, NULL); item->attribute = atoi(data);
+		Sql_GetData(sql_handle, 7, &data, NULL); item->expire_time = (unsigned int)atoi(data);
+		for( j = 0; j < MAX_SLOTS; ++j )
+		{
+			Sql_GetData(sql_handle, 8+j, &data, NULL); item->card[j] = atoi(data);
+		}
+	}
+	p->storage_amount = i;
+	Sql_FreeResult(sql_handle);
+
+	ShowInfo("storage load complete from DB - id: %d (total: %d)\n", account_id, p->storage_amount);
+	return 1;
 }
 
 /// Save guild_storage data to sql
-int guild_storage_tosql(int guild_id, struct guild_storage *p)
+int guild_storage_tosql(int guild_id, struct guild_storage* p)
 {
-    memitemdata_to_sql(p->items, MAX_GUILD_STORAGE, guild_id, TABLE_GUILD_STORAGE);
-    ShowInfo("guild storage save to DB - guild: %d\n", guild_id);
-    return 0;
+	memitemdata_to_sql(p->items, MAX_GUILD_STORAGE, guild_id, TABLE_GUILD_STORAGE);
+	ShowInfo ("guild storage save to DB - guild: %d\n", guild_id);
+	return 0;
 }
 
 /// Load guild_storage data to mem
-int guild_storage_fromsql(int guild_id, struct guild_storage *p)
+int guild_storage_fromsql(int guild_id, struct guild_storage* p)
 {
-    StringBuf buf;
-    struct item *item;
-    char *data;
-    int i;
-    int j;
-
-    memset(p, 0, sizeof(struct guild_storage)); //clean up memory
-    p->storage_amount = 0;
-    p->guild_id = guild_id;
-
-    // storage {`guild_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`attribute`/`card0`/`card1`/`card2`/`card3`}
-    StringBuf_Init(&buf);
-    StringBuf_AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`");
-    for (j = 0; j < MAX_SLOTS; ++j)
-        StringBuf_Printf(&buf, ",`card%d`", j);
-    StringBuf_Printf(&buf, " FROM `%s` WHERE `guild_id`='%d' ORDER BY `nameid`", guild_storage_db, guild_id);
-
-    if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)))
-        Sql_ShowDebug(sql_handle);
-
-    StringBuf_Destroy(&buf);
-
-    for (i = 0; i < MAX_GUILD_STORAGE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i) {
-        item = &p->items[i];
-        Sql_GetData(sql_handle, 0, &data, NULL);
-        item->id = atoi(data);
-        Sql_GetData(sql_handle, 1, &data, NULL);
-        item->nameid = atoi(data);
-        Sql_GetData(sql_handle, 2, &data, NULL);
-        item->amount = atoi(data);
-        Sql_GetData(sql_handle, 3, &data, NULL);
-        item->equip = atoi(data);
-        Sql_GetData(sql_handle, 4, &data, NULL);
-        item->identify = atoi(data);
-        Sql_GetData(sql_handle, 5, &data, NULL);
-        item->refine = atoi(data);
-        Sql_GetData(sql_handle, 6, &data, NULL);
-        item->attribute = atoi(data);
-        item->expire_time = 0;
-        for (j = 0; j < MAX_SLOTS; ++j) {
-            Sql_GetData(sql_handle, 7+j, &data, NULL);
-            item->card[j] = atoi(data);
-        }
-    }
-    p->storage_amount = i;
-    Sql_FreeResult(sql_handle);
-
-    ShowInfo("guild storage load complete from DB - id: %d (total: %d)\n", guild_id, p->storage_amount);
-    return 0;
+	StringBuf buf;
+	struct item* item;
+	char* data;
+	int i;
+	int j;
+
+	memset(p, 0, sizeof(struct guild_storage)); //clean up memory
+	p->storage_amount = 0;
+	p->guild_id = guild_id;
+
+	// storage {`guild_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`attribute`/`card0`/`card1`/`card2`/`card3`}
+	StringBuf_Init(&buf);
+	StringBuf_AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`");
+	for( j = 0; j < MAX_SLOTS; ++j )
+		StringBuf_Printf(&buf, ",`card%d`", j);
+	StringBuf_Printf(&buf, " FROM `%s` WHERE `guild_id`='%d' ORDER BY `nameid`", guild_storage_db, guild_id);
+
+	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+		Sql_ShowDebug(sql_handle);
+
+	StringBuf_Destroy(&buf);
+
+	for( i = 0; i < MAX_GUILD_STORAGE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	{
+		item = &p->items[i];
+		Sql_GetData(sql_handle, 0, &data, NULL); item->id = atoi(data);
+		Sql_GetData(sql_handle, 1, &data, NULL); item->nameid = atoi(data);
+		Sql_GetData(sql_handle, 2, &data, NULL); item->amount = atoi(data);
+		Sql_GetData(sql_handle, 3, &data, NULL); item->equip = atoi(data);
+		Sql_GetData(sql_handle, 4, &data, NULL); item->identify = atoi(data);
+		Sql_GetData(sql_handle, 5, &data, NULL); item->refine = atoi(data);
+		Sql_GetData(sql_handle, 6, &data, NULL); item->attribute = atoi(data);
+		item->expire_time = 0;
+		for( j = 0; j < MAX_SLOTS; ++j )
+		{
+			Sql_GetData(sql_handle, 7+j, &data, NULL); item->card[j] = atoi(data);
+		}
+	}
+	p->storage_amount = i;
+	Sql_FreeResult(sql_handle);
+
+	ShowInfo("guild storage load complete from DB - id: %d (total: %d)\n", guild_id, p->storage_amount);
+	return 0;
 }
 
 //---------------------------------------------------------
 // storage data initialize
 int inter_storage_sql_init(void)
 {
-    return 1;
+	return 1;
 }
 // storage data finalize
 void inter_storage_sql_final(void)
 {
-    return;
+	return;
 }
 
 // q?f[^?
 int inter_storage_delete(int account_id)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id`='%d'", storage_db, account_id))
-        Sql_ShowDebug(sql_handle);
-    return 0;
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `account_id`='%d'", storage_db, account_id) )
+		Sql_ShowDebug(sql_handle);
+	return 0;
 }
 int inter_guild_storage_delete(int guild_id)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id`='%d'", guild_storage_db, guild_id))
-        Sql_ShowDebug(sql_handle);
-    return 0;
+	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `guild_id`='%d'", guild_storage_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
+	return 0;
 }
 
 //---------------------------------------------------------
@@ -171,38 +158,38 @@ int inter_guild_storage_delete(int guild_id)
 
 int mapif_load_guild_storage(int fd,int account_id,int guild_id)
 {
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `guild_id`='%d'", guild_db, guild_id))
-        Sql_ShowDebug(sql_handle);
-    else if (Sql_NumRows(sql_handle) > 0) {
-        // guild exists
-        WFIFOHEAD(fd, sizeof(struct guild_storage)+12);
-        WFIFOW(fd,0) = 0x3818;
-        WFIFOW(fd,2) = sizeof(struct guild_storage)+12;
-        WFIFOL(fd,4) = account_id;
-        WFIFOL(fd,8) = guild_id;
-        guild_storage_fromsql(guild_id, (struct guild_storage *)WFIFOP(fd,12));
-        WFIFOSET(fd, WFIFOW(fd,2));
-        return 0;
-    }
-    // guild does not exist
-    Sql_FreeResult(sql_handle);
-    WFIFOHEAD(fd, 12);
-    WFIFOW(fd,0) = 0x3818;
-    WFIFOW(fd,2) = 12;
-    WFIFOL(fd,4) = account_id;
-    WFIFOL(fd,8) = 0;
-    WFIFOSET(fd, 12);
-    return 0;
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `guild_id`='%d'", guild_db, guild_id) )
+		Sql_ShowDebug(sql_handle);
+	else if( Sql_NumRows(sql_handle) > 0 )
+	{// guild exists
+		WFIFOHEAD(fd, sizeof(struct guild_storage)+12);
+		WFIFOW(fd,0) = 0x3818;
+		WFIFOW(fd,2) = sizeof(struct guild_storage)+12;
+		WFIFOL(fd,4) = account_id;
+		WFIFOL(fd,8) = guild_id;
+		guild_storage_fromsql(guild_id, (struct guild_storage*)WFIFOP(fd,12));
+		WFIFOSET(fd, WFIFOW(fd,2));
+		return 0;
+	}
+	// guild does not exist
+	Sql_FreeResult(sql_handle);
+	WFIFOHEAD(fd, 12);
+	WFIFOW(fd,0) = 0x3818;
+	WFIFOW(fd,2) = 12;
+	WFIFOL(fd,4) = account_id;
+	WFIFOL(fd,8) = 0;
+	WFIFOSET(fd, 12);
+	return 0;
 }
 int mapif_save_guild_storage_ack(int fd,int account_id,int guild_id,int fail)
 {
-    WFIFOHEAD(fd,11);
-    WFIFOW(fd,0)=0x3819;
-    WFIFOL(fd,2)=account_id;
-    WFIFOL(fd,6)=guild_id;
-    WFIFOB(fd,10)=fail;
-    WFIFOSET(fd,11);
-    return 0;
+	WFIFOHEAD(fd,11);
+	WFIFOW(fd,0)=0x3819;
+	WFIFOL(fd,2)=account_id;
+	WFIFOL(fd,6)=guild_id;
+	WFIFOB(fd,10)=fail;
+	WFIFOSET(fd,11);
+	return 0;
 }
 
 //---------------------------------------------------------
@@ -210,51 +197,50 @@ int mapif_save_guild_storage_ack(int fd,int account_id,int guild_id,int fail)
 
 int mapif_parse_LoadGuildStorage(int fd)
 {
-    RFIFOHEAD(fd);
-    mapif_load_guild_storage(fd,RFIFOL(fd,2),RFIFOL(fd,6));
-    return 0;
+	RFIFOHEAD(fd);
+	mapif_load_guild_storage(fd,RFIFOL(fd,2),RFIFOL(fd,6));
+	return 0;
 }
 
 int mapif_parse_SaveGuildStorage(int fd)
 {
-    int guild_id;
-    int len;
-
-    RFIFOHEAD(fd);
-    guild_id = RFIFOL(fd,8);
-    len = RFIFOW(fd,2);
-
-    if (sizeof(struct guild_storage) != len - 12) {
-        ShowError("inter storage: data size error %d != %d\n", sizeof(struct guild_storage), len - 12);
-    } else {
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `guild_id`='%d'", guild_db, guild_id))
-            Sql_ShowDebug(sql_handle);
-        else if (Sql_NumRows(sql_handle) > 0) {
-            // guild exists
-            Sql_FreeResult(sql_handle);
-            guild_storage_tosql(guild_id, (struct guild_storage *)RFIFOP(fd,12));
-            mapif_save_guild_storage_ack(fd, RFIFOL(fd,4), guild_id, 0);
-            return 0;
-        }
-        Sql_FreeResult(sql_handle);
-    }
-    mapif_save_guild_storage_ack(fd, RFIFOL(fd,4), guild_id, 1);
-    return 0;
+	int guild_id;
+	int len;
+
+	RFIFOHEAD(fd);
+	guild_id = RFIFOL(fd,8);
+	len = RFIFOW(fd,2);
+
+	if( sizeof(struct guild_storage) != len - 12 )
+	{
+		ShowError("inter storage: data size error %d != %d\n", sizeof(struct guild_storage), len - 12);
+	}
+	else
+	{
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `guild_id`='%d'", guild_db, guild_id) )
+			Sql_ShowDebug(sql_handle);
+		else if( Sql_NumRows(sql_handle) > 0 )
+		{// guild exists
+			Sql_FreeResult(sql_handle);
+			guild_storage_tosql(guild_id, (struct guild_storage*)RFIFOP(fd,12));
+			mapif_save_guild_storage_ack(fd, RFIFOL(fd,4), guild_id, 0);
+			return 0;
+		}
+		Sql_FreeResult(sql_handle);
+	}
+	mapif_save_guild_storage_ack(fd, RFIFOL(fd,4), guild_id, 1);
+	return 0;
 }
 
 
 int inter_storage_parse_frommap(int fd)
 {
-    RFIFOHEAD(fd);
-    switch (RFIFOW(fd,0)) {
-        case 0x3018:
-            mapif_parse_LoadGuildStorage(fd);
-            break;
-        case 0x3019:
-            mapif_parse_SaveGuildStorage(fd);
-            break;
-        default:
-            return 0;
-    }
-    return 1;
+	RFIFOHEAD(fd);
+	switch(RFIFOW(fd,0)){
+	case 0x3018: mapif_parse_LoadGuildStorage(fd); break;
+	case 0x3019: mapif_parse_SaveGuildStorage(fd); break;
+	default:
+		return 0;
+	}
+	return 1;
 }
diff --git a/src/char/int_storage.h b/src/char/int_storage.h
index 6285a8d21..811608f82 100644
--- a/src/char/int_storage.h
+++ b/src/char/int_storage.h
@@ -15,7 +15,7 @@ int inter_guild_storage_delete(int guild_id);
 int inter_storage_parse_frommap(int fd);
 
 //Exported for use in the TXT-SQL converter.
-int storage_fromsql(int account_id, struct storage_data *p);
+int storage_fromsql(int account_id, struct storage_data* p);
 int storage_tosql(int account_id,struct storage_data *p);
 int guild_storage_tosql(int guild_id, struct guild_storage *p);
 
diff --git a/src/char/inter.c b/src/char/inter.c
index 9b33d271e..8863b41d8 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -28,11 +28,11 @@
 #include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
 
 
-#define WISDATA_TTL (60*1000)   //Wis data Time To Live (60 seconds)
-#define WISDELLIST_MAX 256      // Number of elements in the list Delete data Wis
+#define WISDATA_TTL (60*1000)	//Wis data Time To Live (60 seconds)
+#define WISDELLIST_MAX 256		// Number of elements in the list Delete data Wis
 
 
-Sql *sql_handle = NULL;
+Sql* sql_handle = NULL;
 
 int char_server_port = 3306;
 char char_server_ip[32] = "127.0.0.1";
@@ -47,800 +47,778 @@ char main_chat_nick[16] = "Main";
 
 // recv. packet list
 int inter_recv_packet_length[] = {
-    -1,-1, 7,-1, -1,13,36, (2 + 4 + 4 + 4 + NAME_LENGTH),  0, 0, 0, 0,  0, 0,  0, 0,    // 3000-
-    6,-1, 0, 0,  0, 0, 0, 0, 10,-1, 0, 0,  0, 0,  0, 0,    // 3010-
-    -1,10,-1,14, 14,19, 6,-1, 14,14, 0, 0,  0, 0,  0, 0,    // 3020- Party
-    -1, 6,-1,-1, 55,19, 6,-1, 14,-1,-1,-1, 18,19,186,-1,    // 3030-
-    -1, 9, 0, 0,  0, 0, 0, 0,  7, 6,10,10, 10,-1,  0, 0,    // 3040-
-    -1,-1,10,10,  0,-1, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,    // 3050-  Auction System [Zephyrus]
-    6,-1, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,    // 3060-  Quest system [Kevin] [Inkfish]
-    -1,10, 6,-1,  0, 0, 0, 0,  0, 0, 0, 0, -1,10,  6,-1,    // 3070-  Mercenary packets [Zephyrus], Elemental packets [pakpil]
-    48,14,-1, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,    // 3080-
-    -1,10,-1, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,    // 3090-  Homunculus packets [albator]
+	-1,-1, 7,-1, -1,13,36, (2 + 4 + 4 + 4 + NAME_LENGTH),  0, 0, 0, 0,  0, 0,  0, 0,	// 3000-
+	 6,-1, 0, 0,  0, 0, 0, 0, 10,-1, 0, 0,  0, 0,  0, 0,	// 3010-
+	-1,10,-1,14, 14,19, 6,-1, 14,14, 0, 0,  0, 0,  0, 0,	// 3020- Party
+	-1, 6,-1,-1, 55,19, 6,-1, 14,-1,-1,-1, 18,19,186,-1,	// 3030-
+	-1, 9, 0, 0,  0, 0, 0, 0,  7, 6,10,10, 10,-1,  0, 0,	// 3040-
+	-1,-1,10,10,  0,-1, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,	// 3050-  Auction System [Zephyrus]
+	 6,-1, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,	// 3060-  Quest system [Kevin] [Inkfish]
+	-1,10, 6,-1,  0, 0, 0, 0,  0, 0, 0, 0, -1,10,  6,-1,	// 3070-  Mercenary packets [Zephyrus], Elemental packets [pakpil]
+	48,14,-1, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,	// 3080-
+	-1,10,-1, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,	// 3090-  Homunculus packets [albator]
 };
 
 struct WisData {
-    int id, fd, count, len;
-    unsigned long tick;
-    unsigned char src[24], dst[24], msg[512];
+	int id, fd, count, len;
+	unsigned long tick;
+	unsigned char src[24], dst[24], msg[512];
 };
-static DBMap *wis_db = NULL; // int wis_id -> struct WisData*
+static DBMap* wis_db = NULL; // int wis_id -> struct WisData*
 static int wis_dellist[WISDELLIST_MAX], wis_delnum;
 
 #define MAX_JOB_NAMES 106
-static char *msg_table[MAX_JOB_NAMES]; //  messages 550 ~ 655 are job names
+static char* msg_table[MAX_JOB_NAMES]; //  messages 550 ~ 655 are job names
 
-const char *msg_txt(int msg_number)
-{
-    msg_number -= 550;
-    if (msg_number >= 0 && msg_number < MAX_JOB_NAMES &&
-        msg_table[msg_number] != NULL && msg_table[msg_number][0] != '\0')
-        return msg_table[msg_number];
+const char* msg_txt(int msg_number) {
+	msg_number -= 550;
+	if (msg_number >= 0 && msg_number < MAX_JOB_NAMES &&
+	    msg_table[msg_number] != NULL && msg_table[msg_number][0] != '\0')
+		return msg_table[msg_number];
 
-    return "Unknown";
+	return "Unknown";
 }
 
 /*==========================================
  * Read Message Data -- at char server we only keep job names.
  *------------------------------------------*/
-int msg_config_read(const char *cfgName)
-{
-    int msg_number;
-    char line[1024], w1[1024], w2[1024];
-    FILE *fp;
-    static int called = 1;
-
-    if ((fp = fopen(cfgName, "r")) == NULL) {
-        ShowError("Messages file not found: %s\n", cfgName);
-        return 1;
-    }
-
-    if ((--called) == 0)
-        memset(msg_table, 0, sizeof(msg_table[0]) * MAX_JOB_NAMES);
-
-    while (fgets(line, sizeof(line), fp)) {
-        if (line[0] == '/' && line[1] == '/')
-            continue;
-        if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
-            continue;
-
-        if (strcmpi(w1, "import") == 0)
-            msg_config_read(w2);
-        else {
-            msg_number = atoi(w1);
-            if (msg_number < 550 || msg_number > (550+MAX_JOB_NAMES))
-                continue;
-            msg_number -= 550;
-            if (msg_number >= 0 && msg_number < MAX_JOB_NAMES) {
-                if (msg_table[msg_number] != NULL)
-                    aFree(msg_table[msg_number]);
-                msg_table[msg_number] = (char *)aMalloc((strlen(w2) + 1)*sizeof(char));
-                strcpy(msg_table[msg_number],w2);
-            }
-        }
-    }
-
-    fclose(fp);
-
-    return 0;
+int msg_config_read(const char* cfgName) {
+	int msg_number;
+	char line[1024], w1[1024], w2[1024];
+	FILE *fp;
+	static int called = 1;
+
+	if ((fp = fopen(cfgName, "r")) == NULL) {
+		ShowError("Messages file not found: %s\n", cfgName);
+		return 1;
+	}
+
+	if ((--called) == 0)
+		memset(msg_table, 0, sizeof(msg_table[0]) * MAX_JOB_NAMES);
+
+	while(fgets(line, sizeof(line), fp) ) {
+		if (line[0] == '/' && line[1] == '/')
+			continue;
+		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
+			continue;
+
+		if (strcmpi(w1, "import") == 0)
+			msg_config_read(w2);
+		else {
+			msg_number = atoi(w1);
+			if( msg_number < 550 || msg_number > (550+MAX_JOB_NAMES) )
+				continue;
+			msg_number -= 550;
+			if (msg_number >= 0 && msg_number < MAX_JOB_NAMES) {
+				if (msg_table[msg_number] != NULL)
+					aFree(msg_table[msg_number]);
+				msg_table[msg_number] = (char *)aMalloc((strlen(w2) + 1)*sizeof (char));
+				strcpy(msg_table[msg_number],w2);
+			}
+		}
+	}
+
+	fclose(fp);
+
+	return 0;
 }
 
 /*==========================================
  * Cleanup Message Data
  *------------------------------------------*/
-void do_final_msg(void)
-{
-    int i;
-    for (i = 0; i < MAX_JOB_NAMES; i++)
-        aFree(msg_table[i]);
+void do_final_msg(void) {
+	int i;
+	for (i = 0; i < MAX_JOB_NAMES; i++)
+		aFree(msg_table[i]);
 }
 /* from pc.c due to @accinfo. any ideas to replace this crap are more than welcome. */
-const char *job_name(int class_)
-{
-    switch (class_) {
-        case JOB_NOVICE:
-        case JOB_SWORDMAN:
-        case JOB_MAGE:
-        case JOB_ARCHER:
-        case JOB_ACOLYTE:
-        case JOB_MERCHANT:
-        case JOB_THIEF:
-            return msg_txt(550 - JOB_NOVICE+class_);
-
-        case JOB_KNIGHT:
-        case JOB_PRIEST:
-        case JOB_WIZARD:
-        case JOB_BLACKSMITH:
-        case JOB_HUNTER:
-        case JOB_ASSASSIN:
-            return msg_txt(557 - JOB_KNIGHT+class_);
-
-        case JOB_KNIGHT2:
-            return msg_txt(557);
-
-        case JOB_CRUSADER:
-        case JOB_MONK:
-        case JOB_SAGE:
-        case JOB_ROGUE:
-        case JOB_ALCHEMIST:
-        case JOB_BARD:
-        case JOB_DANCER:
-            return msg_txt(563 - JOB_CRUSADER+class_);
-
-        case JOB_CRUSADER2:
-            return msg_txt(563);
-
-        case JOB_WEDDING:
-        case JOB_SUPER_NOVICE:
-        case JOB_GUNSLINGER:
-        case JOB_NINJA:
-        case JOB_XMAS:
-            return msg_txt(570 - JOB_WEDDING+class_);
-
-        case JOB_SUMMER:
-            return msg_txt(621);
-
-        case JOB_NOVICE_HIGH:
-        case JOB_SWORDMAN_HIGH:
-        case JOB_MAGE_HIGH:
-        case JOB_ARCHER_HIGH:
-        case JOB_ACOLYTE_HIGH:
-        case JOB_MERCHANT_HIGH:
-        case JOB_THIEF_HIGH:
-            return msg_txt(575 - JOB_NOVICE_HIGH+class_);
-
-        case JOB_LORD_KNIGHT:
-        case JOB_HIGH_PRIEST:
-        case JOB_HIGH_WIZARD:
-        case JOB_WHITESMITH:
-        case JOB_SNIPER:
-        case JOB_ASSASSIN_CROSS:
-            return msg_txt(582 - JOB_LORD_KNIGHT+class_);
-
-        case JOB_LORD_KNIGHT2:
-            return msg_txt(582);
-
-        case JOB_PALADIN:
-        case JOB_CHAMPION:
-        case JOB_PROFESSOR:
-        case JOB_STALKER:
-        case JOB_CREATOR:
-        case JOB_CLOWN:
-        case JOB_GYPSY:
-            return msg_txt(588 - JOB_PALADIN + class_);
-
-        case JOB_PALADIN2:
-            return msg_txt(588);
-
-        case JOB_BABY:
-        case JOB_BABY_SWORDMAN:
-        case JOB_BABY_MAGE:
-        case JOB_BABY_ARCHER:
-        case JOB_BABY_ACOLYTE:
-        case JOB_BABY_MERCHANT:
-        case JOB_BABY_THIEF:
-            return msg_txt(595 - JOB_BABY + class_);
-
-        case JOB_BABY_KNIGHT:
-        case JOB_BABY_PRIEST:
-        case JOB_BABY_WIZARD:
-        case JOB_BABY_BLACKSMITH:
-        case JOB_BABY_HUNTER:
-        case JOB_BABY_ASSASSIN:
-            return msg_txt(602 - JOB_BABY_KNIGHT + class_);
-
-        case JOB_BABY_KNIGHT2:
-            return msg_txt(602);
-
-        case JOB_BABY_CRUSADER:
-        case JOB_BABY_MONK:
-        case JOB_BABY_SAGE:
-        case JOB_BABY_ROGUE:
-        case JOB_BABY_ALCHEMIST:
-        case JOB_BABY_BARD:
-        case JOB_BABY_DANCER:
-            return msg_txt(608 - JOB_BABY_CRUSADER + class_);
-
-        case JOB_BABY_CRUSADER2:
-            return msg_txt(608);
-
-        case JOB_SUPER_BABY:
-            return msg_txt(615);
-
-        case JOB_TAEKWON:
-            return msg_txt(616);
-        case JOB_STAR_GLADIATOR:
-        case JOB_STAR_GLADIATOR2:
-            return msg_txt(617);
-        case JOB_SOUL_LINKER:
-            return msg_txt(618);
-
-        case JOB_GANGSI:
-        case JOB_DEATH_KNIGHT:
-        case JOB_DARK_COLLECTOR:
-            return msg_txt(622 - JOB_GANGSI+class_);
-
-        case JOB_RUNE_KNIGHT:
-        case JOB_WARLOCK:
-        case JOB_RANGER:
-        case JOB_ARCH_BISHOP:
-        case JOB_MECHANIC:
-        case JOB_GUILLOTINE_CROSS:
-            return msg_txt(625 - JOB_RUNE_KNIGHT+class_);
-
-        case JOB_RUNE_KNIGHT_T:
-        case JOB_WARLOCK_T:
-        case JOB_RANGER_T:
-        case JOB_ARCH_BISHOP_T:
-        case JOB_MECHANIC_T:
-        case JOB_GUILLOTINE_CROSS_T:
-            return msg_txt(625 - JOB_RUNE_KNIGHT_T+class_);
-
-        case JOB_ROYAL_GUARD:
-        case JOB_SORCERER:
-        case JOB_MINSTREL:
-        case JOB_WANDERER:
-        case JOB_SURA:
-        case JOB_GENETIC:
-        case JOB_SHADOW_CHASER:
-            return msg_txt(631 - JOB_ROYAL_GUARD+class_);
-
-        case JOB_ROYAL_GUARD_T:
-        case JOB_SORCERER_T:
-        case JOB_MINSTREL_T:
-        case JOB_WANDERER_T:
-        case JOB_SURA_T:
-        case JOB_GENETIC_T:
-        case JOB_SHADOW_CHASER_T:
-            return msg_txt(631 - JOB_ROYAL_GUARD_T+class_);
-
-        case JOB_RUNE_KNIGHT2:
-        case JOB_RUNE_KNIGHT_T2:
-            return msg_txt(625);
-
-        case JOB_ROYAL_GUARD2:
-        case JOB_ROYAL_GUARD_T2:
-            return msg_txt(631);
-
-        case JOB_RANGER2:
-        case JOB_RANGER_T2:
-            return msg_txt(627);
-
-        case JOB_MECHANIC2:
-        case JOB_MECHANIC_T2:
-            return msg_txt(629);
-
-        case JOB_BABY_RUNE:
-        case JOB_BABY_WARLOCK:
-        case JOB_BABY_RANGER:
-        case JOB_BABY_BISHOP:
-        case JOB_BABY_MECHANIC:
-        case JOB_BABY_CROSS:
-        case JOB_BABY_GUARD:
-        case JOB_BABY_SORCERER:
-        case JOB_BABY_MINSTREL:
-        case JOB_BABY_WANDERER:
-        case JOB_BABY_SURA:
-        case JOB_BABY_GENETIC:
-        case JOB_BABY_CHASER:
-            return msg_txt(638 - JOB_BABY_RUNE+class_);
-
-        case JOB_BABY_RUNE2:
-            return msg_txt(638);
-
-        case JOB_BABY_GUARD2:
-            return msg_txt(644);
-
-        case JOB_BABY_RANGER2:
-            return msg_txt(640);
-
-        case JOB_BABY_MECHANIC2:
-            return msg_txt(642);
-
-        case JOB_SUPER_NOVICE_E:
-        case JOB_SUPER_BABY_E:
-            return msg_txt(651 - JOB_SUPER_NOVICE_E+class_);
-
-        case JOB_KAGEROU:
-        case JOB_OBORO:
-            return msg_txt(653 - JOB_KAGEROU+class_);
-
-        default:
-            return msg_txt(655);
-    }
+const char* job_name(int class_) {
+	switch (class_) {
+		case JOB_NOVICE:
+		case JOB_SWORDMAN:
+		case JOB_MAGE:
+		case JOB_ARCHER:
+		case JOB_ACOLYTE:
+		case JOB_MERCHANT:
+		case JOB_THIEF:
+			return msg_txt(550 - JOB_NOVICE+class_);
+
+		case JOB_KNIGHT:
+		case JOB_PRIEST:
+		case JOB_WIZARD:
+		case JOB_BLACKSMITH:
+		case JOB_HUNTER:
+		case JOB_ASSASSIN:
+			return msg_txt(557 - JOB_KNIGHT+class_);
+
+		case JOB_KNIGHT2:
+			return msg_txt(557);
+
+		case JOB_CRUSADER:
+		case JOB_MONK:
+		case JOB_SAGE:
+		case JOB_ROGUE:
+		case JOB_ALCHEMIST:
+		case JOB_BARD:
+		case JOB_DANCER:
+			return msg_txt(563 - JOB_CRUSADER+class_);
+
+		case JOB_CRUSADER2:
+			return msg_txt(563);
+
+		case JOB_WEDDING:
+		case JOB_SUPER_NOVICE:
+		case JOB_GUNSLINGER:
+		case JOB_NINJA:
+		case JOB_XMAS:
+			return msg_txt(570 - JOB_WEDDING+class_);
+
+		case JOB_SUMMER:
+			return msg_txt(621);
+
+		case JOB_NOVICE_HIGH:
+		case JOB_SWORDMAN_HIGH:
+		case JOB_MAGE_HIGH:
+		case JOB_ARCHER_HIGH:
+		case JOB_ACOLYTE_HIGH:
+		case JOB_MERCHANT_HIGH:
+		case JOB_THIEF_HIGH:
+			return msg_txt(575 - JOB_NOVICE_HIGH+class_);
+
+		case JOB_LORD_KNIGHT:
+		case JOB_HIGH_PRIEST:
+		case JOB_HIGH_WIZARD:
+		case JOB_WHITESMITH:
+		case JOB_SNIPER:
+		case JOB_ASSASSIN_CROSS:
+			return msg_txt(582 - JOB_LORD_KNIGHT+class_);
+
+		case JOB_LORD_KNIGHT2:
+			return msg_txt(582);
+
+		case JOB_PALADIN:
+		case JOB_CHAMPION:
+		case JOB_PROFESSOR:
+		case JOB_STALKER:
+		case JOB_CREATOR:
+		case JOB_CLOWN:
+		case JOB_GYPSY:
+			return msg_txt(588 - JOB_PALADIN + class_);
+
+		case JOB_PALADIN2:
+			return msg_txt(588);
+
+		case JOB_BABY:
+		case JOB_BABY_SWORDMAN:
+		case JOB_BABY_MAGE:
+		case JOB_BABY_ARCHER:
+		case JOB_BABY_ACOLYTE:
+		case JOB_BABY_MERCHANT:
+		case JOB_BABY_THIEF:
+			return msg_txt(595 - JOB_BABY + class_);
+
+		case JOB_BABY_KNIGHT:
+		case JOB_BABY_PRIEST:
+		case JOB_BABY_WIZARD:
+		case JOB_BABY_BLACKSMITH:
+		case JOB_BABY_HUNTER:
+		case JOB_BABY_ASSASSIN:
+			return msg_txt(602 - JOB_BABY_KNIGHT + class_);
+
+		case JOB_BABY_KNIGHT2:
+			return msg_txt(602);
+
+		case JOB_BABY_CRUSADER:
+		case JOB_BABY_MONK:
+		case JOB_BABY_SAGE:
+		case JOB_BABY_ROGUE:
+		case JOB_BABY_ALCHEMIST:
+		case JOB_BABY_BARD:
+		case JOB_BABY_DANCER:
+			return msg_txt(608 - JOB_BABY_CRUSADER + class_);
+
+		case JOB_BABY_CRUSADER2:
+			return msg_txt(608);
+
+		case JOB_SUPER_BABY:
+			return msg_txt(615);
+
+		case JOB_TAEKWON:
+			return msg_txt(616);
+		case JOB_STAR_GLADIATOR:
+		case JOB_STAR_GLADIATOR2:
+			return msg_txt(617);
+		case JOB_SOUL_LINKER:
+			return msg_txt(618);
+
+		case JOB_GANGSI:
+		case JOB_DEATH_KNIGHT:
+		case JOB_DARK_COLLECTOR:
+			return msg_txt(622 - JOB_GANGSI+class_);
+
+		case JOB_RUNE_KNIGHT:
+		case JOB_WARLOCK:
+		case JOB_RANGER:
+		case JOB_ARCH_BISHOP:
+		case JOB_MECHANIC:
+		case JOB_GUILLOTINE_CROSS:
+			return msg_txt(625 - JOB_RUNE_KNIGHT+class_);
+
+		case JOB_RUNE_KNIGHT_T:
+		case JOB_WARLOCK_T:
+		case JOB_RANGER_T:
+		case JOB_ARCH_BISHOP_T:
+		case JOB_MECHANIC_T:
+		case JOB_GUILLOTINE_CROSS_T:
+			return msg_txt(625 - JOB_RUNE_KNIGHT_T+class_);
+
+		case JOB_ROYAL_GUARD:
+		case JOB_SORCERER:
+		case JOB_MINSTREL:
+		case JOB_WANDERER:
+		case JOB_SURA:
+		case JOB_GENETIC:
+		case JOB_SHADOW_CHASER:
+			return msg_txt(631 - JOB_ROYAL_GUARD+class_);
+
+		case JOB_ROYAL_GUARD_T:
+		case JOB_SORCERER_T:
+		case JOB_MINSTREL_T:
+		case JOB_WANDERER_T:
+		case JOB_SURA_T:
+		case JOB_GENETIC_T:
+		case JOB_SHADOW_CHASER_T:
+			return msg_txt(631 - JOB_ROYAL_GUARD_T+class_);
+
+		case JOB_RUNE_KNIGHT2:
+		case JOB_RUNE_KNIGHT_T2:
+			return msg_txt(625);
+
+		case JOB_ROYAL_GUARD2:
+		case JOB_ROYAL_GUARD_T2:
+			return msg_txt(631);
+
+		case JOB_RANGER2:
+		case JOB_RANGER_T2:
+			return msg_txt(627);
+
+		case JOB_MECHANIC2:
+		case JOB_MECHANIC_T2:
+			return msg_txt(629);
+
+		case JOB_BABY_RUNE:
+		case JOB_BABY_WARLOCK:
+		case JOB_BABY_RANGER:
+		case JOB_BABY_BISHOP:
+		case JOB_BABY_MECHANIC:
+		case JOB_BABY_CROSS:
+		case JOB_BABY_GUARD:
+		case JOB_BABY_SORCERER:
+		case JOB_BABY_MINSTREL:
+		case JOB_BABY_WANDERER:
+		case JOB_BABY_SURA:
+		case JOB_BABY_GENETIC:
+		case JOB_BABY_CHASER:
+			return msg_txt(638 - JOB_BABY_RUNE+class_);
+
+		case JOB_BABY_RUNE2:
+			return msg_txt(638);
+
+		case JOB_BABY_GUARD2:
+			return msg_txt(644);
+
+		case JOB_BABY_RANGER2:
+			return msg_txt(640);
+
+		case JOB_BABY_MECHANIC2:
+			return msg_txt(642);
+
+		case JOB_SUPER_NOVICE_E:
+		case JOB_SUPER_BABY_E:
+			return msg_txt(651 - JOB_SUPER_NOVICE_E+class_);
+
+		case JOB_KAGEROU:
+		case JOB_OBORO:
+			return msg_txt(653 - JOB_KAGEROU+class_);
+
+		default:
+			return msg_txt(655);
+	}
 }
 
 /**
   * [Dekamaster/Nightroad]
   **/
-const char *geoip_countryname[253] = {"Unknown","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Netherlands Antilles",
-                                      "Angola","Antarctica","Argentina","American Samoa","Austria","Australia","Aruba","Azerbaijan","Bosnia and Herzegovina","Barbados",
-                                      "Bangladesh","Belgium","Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda","Brunei Darussalam","Bolivia",
-                                      "Brazil","Bahamas","Bhutan","Bouvet Island","Botswana","Belarus","Belize","Canada","Cocos (Keeling) Islands","Congo, The Democratic Republic of the",
-                                      "Central African Republic","Congo","Switzerland","Cote D'Ivoire","Cook Islands","Chile","Cameroon","China","Colombia","Costa Rica",
-                                      "Cuba","Cape Verde","Christmas Island","Cyprus","Czech Republic","Germany","Djibouti","Denmark","Dominica","Dominican Republic",
-                                      "Algeria","Ecuador","Estonia","Egypt","Western Sahara","Eritrea","Spain","Ethiopia","Finland","Fiji",
-                                      "Falkland Islands (Malvinas)","Micronesia, Federated States of","Faroe Islands","France","France, Metropolitan","Gabon","United Kingdom","Grenada","Georgia","French Guiana",
-                                      "Ghana","Gibraltar","Greenland","Gambia","Guinea","Guadeloupe","Equatorial Guinea","Greece","South Georgia and the South Sandwich Islands","Guatemala",
-                                      "Guam","Guinea-Bissau","Guyana","Hong Kong","Heard Island and McDonald Islands","Honduras","Croatia","Haiti","Hungary","Indonesia",
-                                      "Ireland","Israel","India","British Indian Ocean Territory","Iraq","Iran, Islamic Republic of","Iceland","Italy","Jamaica","Jordan",
-                                      "Japan","Kenya","Kyrgyzstan","Cambodia","Kiribati","Comoros","Saint Kitts and Nevis","Korea, Democratic People's Republic of","Korea, Republic of","Kuwait",
-                                      "Cayman Islands","Kazakhstan","Lao People's Democratic Republic","Lebanon","Saint Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho","Lithuania",
-                                      "Luxembourg","Latvia","Libyan Arab Jamahiriya","Morocco","Monaco","Moldova, Republic of","Madagascar","Marshall Islands","Macedonia","Mali",
-                                      "Myanmar","Mongolia","Macau","Northern Mariana Islands","Martinique","Mauritania","Montserrat","Malta","Mauritius","Maldives",
-                                      "Malawi","Mexico","Malaysia","Mozambique","Namibia","New Caledonia","Niger","Norfolk Island","Nigeria","Nicaragua",
-                                      "Netherlands","Norway","Nepal","Nauru","Niue","New Zealand","Oman","Panama","Peru","French Polynesia",
-                                      "Papua New Guinea","Philippines","Pakistan","Poland","Saint Pierre and Miquelon","Pitcairn Islands","Puerto Rico","Palestinian Territory","Portugal","Palau",
-                                      "Paraguay","Qatar","Reunion","Romania","Russian Federation","Rwanda","Saudi Arabia","Solomon Islands","Seychelles","Sudan",
-                                      "Sweden","Singapore","Saint Helena","Slovenia","Svalbard and Jan Mayen","Slovakia","Sierra Leone","San Marino","Senegal","Somalia","Suriname",
-                                      "Sao Tome and Principe","El Salvador","Syrian Arab Republic","Swaziland","Turks and Caicos Islands","Chad","French Southern Territories","Togo","Thailand",
-                                      "Tajikistan","Tokelau","Turkmenistan","Tunisia","Tonga","Timor-Leste","Turkey","Trinidad and Tobago","Tuvalu","Taiwan",
-                                      "Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint Vincent and the Grenadines","Venezuela",
-                                      "Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu","Wallis and Futuna","Samoa","Yemen","Mayotte","Serbia","South Africa",
-                                      "Zambia","Montenegro","Zimbabwe","Anonymous Proxy","Satellite Provider","Other","Aland Islands","Guernsey","Isle of Man","Jersey",
-                                      "Saint Barthelemy","Saint Martin"
-                                     };
+const char * geoip_countryname[253] = {"Unknown","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Netherlands Antilles",
+		"Angola","Antarctica","Argentina","American Samoa","Austria","Australia","Aruba","Azerbaijan","Bosnia and Herzegovina","Barbados",
+		"Bangladesh","Belgium","Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda","Brunei Darussalam","Bolivia",
+		"Brazil","Bahamas","Bhutan","Bouvet Island","Botswana","Belarus","Belize","Canada","Cocos (Keeling) Islands","Congo, The Democratic Republic of the",
+		"Central African Republic","Congo","Switzerland","Cote D'Ivoire","Cook Islands","Chile","Cameroon","China","Colombia","Costa Rica",
+		"Cuba","Cape Verde","Christmas Island","Cyprus","Czech Republic","Germany","Djibouti","Denmark","Dominica","Dominican Republic",
+		"Algeria","Ecuador","Estonia","Egypt","Western Sahara","Eritrea","Spain","Ethiopia","Finland","Fiji",
+		"Falkland Islands (Malvinas)","Micronesia, Federated States of","Faroe Islands","France","France, Metropolitan","Gabon","United Kingdom","Grenada","Georgia","French Guiana",
+		"Ghana","Gibraltar","Greenland","Gambia","Guinea","Guadeloupe","Equatorial Guinea","Greece","South Georgia and the South Sandwich Islands","Guatemala",
+		"Guam","Guinea-Bissau","Guyana","Hong Kong","Heard Island and McDonald Islands","Honduras","Croatia","Haiti","Hungary","Indonesia",
+		"Ireland","Israel","India","British Indian Ocean Territory","Iraq","Iran, Islamic Republic of","Iceland","Italy","Jamaica","Jordan",
+		"Japan","Kenya","Kyrgyzstan","Cambodia","Kiribati","Comoros","Saint Kitts and Nevis","Korea, Democratic People's Republic of","Korea, Republic of","Kuwait",
+		"Cayman Islands","Kazakhstan","Lao People's Democratic Republic","Lebanon","Saint Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho","Lithuania",
+		"Luxembourg","Latvia","Libyan Arab Jamahiriya","Morocco","Monaco","Moldova, Republic of","Madagascar","Marshall Islands","Macedonia","Mali",
+		"Myanmar","Mongolia","Macau","Northern Mariana Islands","Martinique","Mauritania","Montserrat","Malta","Mauritius","Maldives",
+		"Malawi","Mexico","Malaysia","Mozambique","Namibia","New Caledonia","Niger","Norfolk Island","Nigeria","Nicaragua",
+		"Netherlands","Norway","Nepal","Nauru","Niue","New Zealand","Oman","Panama","Peru","French Polynesia",
+		"Papua New Guinea","Philippines","Pakistan","Poland","Saint Pierre and Miquelon","Pitcairn Islands","Puerto Rico","Palestinian Territory","Portugal","Palau",
+		"Paraguay","Qatar","Reunion","Romania","Russian Federation","Rwanda","Saudi Arabia","Solomon Islands","Seychelles","Sudan",
+		"Sweden","Singapore","Saint Helena","Slovenia","Svalbard and Jan Mayen","Slovakia","Sierra Leone","San Marino","Senegal","Somalia","Suriname",
+		"Sao Tome and Principe","El Salvador","Syrian Arab Republic","Swaziland","Turks and Caicos Islands","Chad","French Southern Territories","Togo","Thailand",
+		"Tajikistan","Tokelau","Turkmenistan","Tunisia","Tonga","Timor-Leste","Turkey","Trinidad and Tobago","Tuvalu","Taiwan",
+		"Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint Vincent and the Grenadines","Venezuela",
+		"Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu","Wallis and Futuna","Samoa","Yemen","Mayotte","Serbia","South Africa",
+		"Zambia","Montenegro","Zimbabwe","Anonymous Proxy","Satellite Provider","Other","Aland Islands","Guernsey","Isle of Man","Jersey",
+		"Saint Barthelemy","Saint Martin"};
 unsigned char *geoip_cache;
-void geoip_readdb(void)
-{
-    struct stat bufa;
-    FILE *db=fopen("./db/GeoIP.dat","rb");
-    fstat(fileno(db), &bufa);
-    geoip_cache = (unsigned char *) malloc(sizeof(unsigned char) * bufa.st_size);
-    if (fread(geoip_cache, sizeof(unsigned char), bufa.st_size, db) != bufa.st_size) {
-        ShowError("geoip_cache reading didn't read all elements \n");
-    }
-    fclose(db);
-    ShowStatus("Finished Reading "CL_GREEN"GeoIP"CL_RESET" Database.\n");
+void geoip_readdb(void){
+	struct stat bufa;
+	FILE *db=fopen("./db/GeoIP.dat","rb");
+	fstat(fileno(db), &bufa);
+	geoip_cache = (unsigned char *) malloc(sizeof(unsigned char) * bufa.st_size);
+	if(fread(geoip_cache, sizeof(unsigned char), bufa.st_size, db) != bufa.st_size) { ShowError("geoip_cache reading didn't read all elements \n"); }
+	fclose(db);
+	ShowStatus("Finished Reading "CL_GREEN"GeoIP"CL_RESET" Database.\n");
 }
 /* [Dekamaster/Nightroad] */
 /* WHY NOT A DBMAP: There are millions of entries in GeoIP and it has its own algorithm to go quickly through them, a DBMap wouldn't be efficient */
-const char *geoip_getcountry(uint32 ipnum)
-{
-    int depth;
-    unsigned int x;
-    const unsigned char *buf;
-    unsigned int offset = 0;
-
-    for (depth = 31; depth >= 0; depth--) {
-        buf = geoip_cache + (long)6 *offset;
-        if (ipnum & (1 << depth)) {
-            /* Take the right-hand branch */
-            x = (buf[3*1 + 0] << (0*8))
-                + (buf[3*1 + 1] << (1*8))
-                + (buf[3*1 + 2] << (2*8));
-        } else {
-            /* Take the left-hand branch */
-            x = (buf[3*0 + 0] << (0*8))
-                + (buf[3*0 + 1] << (1*8))
-                + (buf[3*0 + 2] << (2*8));
-        }
-        if (x >= 16776960) {
-            x=x-16776960;
-            return geoip_countryname[x];
-        }
-        offset = x;
-    }
-    return geoip_countryname[0];
+const char* geoip_getcountry(uint32 ipnum){
+	int depth;
+	unsigned int x;
+	const unsigned char *buf;
+	unsigned int offset = 0;
+
+	for (depth = 31; depth >= 0; depth--) {
+		buf = geoip_cache + (long)6 *offset;
+		if (ipnum & (1 << depth)) {
+			/* Take the right-hand branch */
+			x =   (buf[3*1 + 0] << (0*8))
+				+ (buf[3*1 + 1] << (1*8))
+				+ (buf[3*1 + 2] << (2*8));
+		} else {
+			/* Take the left-hand branch */
+			x =   (buf[3*0 + 0] << (0*8))
+				+ (buf[3*0 + 1] << (1*8))
+				+ (buf[3*0 + 2] << (2*8));
+		}
+		if (x >= 16776960) {
+			x=x-16776960;
+			return geoip_countryname[x];
+		}
+		offset = x;
+	}
+	return geoip_countryname[0];
 }
 /* sends a mesasge to map server (fd) to a user (u_fd) although we use fd we keep aid for safe-check */
 /* extremely handy I believe it will serve other uses in the near future */
-void inter_to_fd(int fd, int u_fd, int aid, char *msg, ...)
-{
-    char msg_out[512];
-    va_list ap;
-    int len = 1;/* yes we start at 1 */
+void inter_to_fd(int fd, int u_fd, int aid, char* msg, ...) {
+	char msg_out[512];
+	va_list ap;
+	int len = 1;/* yes we start at 1 */
 
-    va_start(ap,msg);
-    len += vsnprintf(msg_out, 512, msg, ap);
-    va_end(ap);
+	va_start(ap,msg);
+		len += vsnprintf(msg_out, 512, msg, ap);
+	va_end(ap);
 
-    WFIFOHEAD(fd,12 + len);
+	WFIFOHEAD(fd,12 + len);
 
-    WFIFOW(fd,0) = 0x3807;
-    WFIFOW(fd,2) = 12 + (unsigned short)len;
-    WFIFOL(fd,4) = u_fd;
-    WFIFOL(fd,8) = aid;
-    safestrncpy((char *)WFIFOP(fd,12), msg_out, len);
+	WFIFOW(fd,0) = 0x3807;
+	WFIFOW(fd,2) = 12 + (unsigned short)len;
+	WFIFOL(fd,4) = u_fd;
+	WFIFOL(fd,8) = aid;
+	safestrncpy((char*)WFIFOP(fd,12), msg_out, len);
 
-    WFIFOSET(fd,12 + len);
+	WFIFOSET(fd,12 + len);
 
-    return;
+	return;
 }
 /* [Dekamaster/Nightroad] */
-void mapif_parse_accinfo(int fd)
-{
-    int u_fd = RFIFOL(fd,2), aid = RFIFOL(fd,6), castergroup = RFIFOL(fd,10);
-    char query[NAME_LENGTH], query_esq[NAME_LENGTH*2+1];
-    int account_id;
-    char *data;
-
-    safestrncpy(query, (char *) RFIFOP(fd,14), NAME_LENGTH);
-
-    Sql_EscapeString(sql_handle, query_esq, query);
-
-    account_id = atoi(query);
-
-    if (account_id < START_ACCOUNT_NUM) {   // is string
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`name`,`class`,`base_level`,`job_level`,`online` FROM `char` WHERE `name` LIKE '%s' LIMIT 10", query_esq)
-            || Sql_NumRows(sql_handle) == 0) {
-            if (Sql_NumRows(sql_handle) == 0) {
-                inter_to_fd(fd, u_fd, aid, "No matches were found for your criteria, '%s'",query);
-            } else {
-                Sql_ShowDebug(sql_handle);
-                inter_to_fd(fd, u_fd, aid, "An error occured, bother your admin about it.");
-            }
-            Sql_FreeResult(sql_handle);
-            return;
-        } else {
-            if (Sql_NumRows(sql_handle) == 1) { //we found a perfect match
-                Sql_NextRow(sql_handle);
-                Sql_GetData(sql_handle, 0, &data, NULL);
-                account_id = atoi(data);
-                Sql_FreeResult(sql_handle);
-            } else {// more than one, listing... [Dekamaster/Nightroad]
-                inter_to_fd(fd, u_fd, aid, "Your query returned the following %d results, please be more specific...",(int)Sql_NumRows(sql_handle));
-                while (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-                    int class_;
-                    short base_level, job_level, online;
-                    char name[NAME_LENGTH];
-
-                    Sql_GetData(sql_handle, 0, &data, NULL);
-                    account_id = atoi(data);
-                    Sql_GetData(sql_handle, 1, &data, NULL);
-                    safestrncpy(name, data, sizeof(name));
-                    Sql_GetData(sql_handle, 2, &data, NULL);
-                    class_ = atoi(data);
-                    Sql_GetData(sql_handle, 3, &data, NULL);
-                    base_level = atoi(data);
-                    Sql_GetData(sql_handle, 4, &data, NULL);
-                    job_level = atoi(data);
-                    Sql_GetData(sql_handle, 5, &data, NULL);
-                    online = atoi(data);
-
-                    inter_to_fd(fd, u_fd, aid, "[AID: %d] %s | %s | Level: %d/%d | %s", account_id, name, job_name(class_), base_level, job_level, online?"Online":"Offline");
-                }
-                Sql_FreeResult(sql_handle);
-                return;
-            }
-        }
-    }
-
-    /* it will only get here if we have a single match */
-    if (account_id) {
-        char userid[NAME_LENGTH], user_pass[NAME_LENGTH], email[40], last_ip[20], lastlogin[30];
-        short level = -1;
-        int logincount = 0,state = 0;
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `userid`, `user_pass`, `email`, `last_ip`, `group_id`, `lastlogin`, `logincount`, `state` FROM `login` WHERE `account_id` = '%d' LIMIT 1", account_id)
-            || Sql_NumRows(sql_handle) == 0) {
-            if (Sql_NumRows(sql_handle) == 0) {
-                inter_to_fd(fd, u_fd, aid,  "No account with ID '%d' was found.", account_id);
-            } else {
-                inter_to_fd(fd, u_fd, aid, "An error occured, bother your admin about it.");
-                Sql_ShowDebug(sql_handle);
-            }
-        } else {
-            Sql_NextRow(sql_handle);
-            Sql_GetData(sql_handle, 0, &data, NULL);
-            safestrncpy(userid, data, sizeof(userid));
-            Sql_GetData(sql_handle, 1, &data, NULL);
-            safestrncpy(user_pass, data, sizeof(user_pass));
-            Sql_GetData(sql_handle, 2, &data, NULL);
-            safestrncpy(email, data, sizeof(email));
-            Sql_GetData(sql_handle, 3, &data, NULL);
-            safestrncpy(last_ip, data, sizeof(last_ip));
-            Sql_GetData(sql_handle, 4, &data, NULL);
-            level = atoi(data);
-            Sql_GetData(sql_handle, 5, &data, NULL);
-            safestrncpy(lastlogin, data, sizeof(lastlogin));
-            Sql_GetData(sql_handle, 6, &data, NULL);
-            logincount = atoi(data);
-            Sql_GetData(sql_handle, 7, &data, NULL);
-            state = atoi(data);
-        }
-
-        Sql_FreeResult(sql_handle);
-
-        if (level == -1)
-            return;
-
-        inter_to_fd(fd, u_fd, aid, "-- Account %d --", account_id);
-        inter_to_fd(fd, u_fd, aid, "User: %s | GM Group: %d | State: %d", userid, level, state);
-
-        if (level < castergroup) /* only show pass if your gm level is greater than the one you're searching for */
-            inter_to_fd(fd, u_fd, aid, "Password: %s", user_pass);
-
-        inter_to_fd(fd, u_fd, aid, "Account e-mail: %s", email);
-        inter_to_fd(fd, u_fd, aid, "Last IP: %s (%s)", last_ip, geoip_getcountry(str2ip(last_ip)));
-        inter_to_fd(fd, u_fd, aid, "This user has logged %d times, the last time were at %s", logincount, lastlogin);
-        inter_to_fd(fd, u_fd, aid, "-- Character Details --");
-
-
-        if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `char_id`, `name`, `char_num`, `class`, `base_level`, `job_level`, `online` FROM `char` WHERE `account_id` = '%d' ORDER BY `char_num` LIMIT %d", account_id, MAX_CHARS)
-            || Sql_NumRows(sql_handle) == 0) {
-
-            if (Sql_NumRows(sql_handle) == 0)
-                inter_to_fd(fd, u_fd, aid,"This account doesn't have characters.");
-            else {
-                inter_to_fd(fd, u_fd, aid,"An error occured, bother your admin about it.");
-                Sql_ShowDebug(sql_handle);
-            }
-
-        } else {
-            while (SQL_SUCCESS == Sql_NextRow(sql_handle)) {
-                int char_id, class_;
-                short char_num, base_level, job_level, online;
-                char name[NAME_LENGTH];
-
-                Sql_GetData(sql_handle, 0, &data, NULL);
-                char_id = atoi(data);
-                Sql_GetData(sql_handle, 1, &data, NULL);
-                safestrncpy(name, data, sizeof(name));
-                Sql_GetData(sql_handle, 2, &data, NULL);
-                char_num = atoi(data);
-                Sql_GetData(sql_handle, 3, &data, NULL);
-                class_ = atoi(data);
-                Sql_GetData(sql_handle, 4, &data, NULL);
-                base_level = atoi(data);
-                Sql_GetData(sql_handle, 5, &data, NULL);
-                job_level = atoi(data);
-                Sql_GetData(sql_handle, 6, &data, NULL);
-                online = atoi(data);
-
-                inter_to_fd(fd, u_fd, aid, "[Slot/CID: %d/%d] %s | %s | Level: %d/%d | %s", char_num, char_id, name, job_name(class_), base_level, job_level, online?"On":"Off");
-            }
-        }
-        Sql_FreeResult(sql_handle);
-    }
-
-    return;
+void mapif_parse_accinfo(int fd) {
+	int u_fd = RFIFOL(fd,2), aid = RFIFOL(fd,6), castergroup = RFIFOL(fd,10);
+	char query[NAME_LENGTH], query_esq[NAME_LENGTH*2+1];
+	int account_id;
+	char *data;
+
+	safestrncpy(query, (char*) RFIFOP(fd,14), NAME_LENGTH);
+
+	Sql_EscapeString(sql_handle, query_esq, query);
+
+	account_id = atoi(query);
+
+	if (account_id < START_ACCOUNT_NUM) {	// is string
+		if ( SQL_ERROR == Sql_Query(sql_handle, "SELECT `account_id`,`name`,`class`,`base_level`,`job_level`,`online` FROM `char` WHERE `name` LIKE '%s' LIMIT 10", query_esq)
+				|| Sql_NumRows(sql_handle) == 0 ) {
+			if( Sql_NumRows(sql_handle) == 0 ) {
+				inter_to_fd(fd, u_fd, aid, "No matches were found for your criteria, '%s'",query);
+			} else {
+				Sql_ShowDebug(sql_handle);
+				inter_to_fd(fd, u_fd, aid, "An error occured, bother your admin about it.");
+			}
+			Sql_FreeResult(sql_handle);
+			return;
+		} else {
+			if( Sql_NumRows(sql_handle) == 1 ) {//we found a perfect match
+				Sql_NextRow(sql_handle);
+				Sql_GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
+				Sql_FreeResult(sql_handle);
+			} else {// more than one, listing... [Dekamaster/Nightroad]
+				inter_to_fd(fd, u_fd, aid, "Your query returned the following %d results, please be more specific...",(int)Sql_NumRows(sql_handle));
+				while ( SQL_SUCCESS == Sql_NextRow(sql_handle) ) {
+					int class_;
+					short base_level, job_level, online;
+					char name[NAME_LENGTH];
+
+					Sql_GetData(sql_handle, 0, &data, NULL); account_id = atoi(data);
+					Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(name, data, sizeof(name));
+					Sql_GetData(sql_handle, 2, &data, NULL); class_ = atoi(data);
+					Sql_GetData(sql_handle, 3, &data, NULL); base_level = atoi(data);
+					Sql_GetData(sql_handle, 4, &data, NULL); job_level = atoi(data);
+					Sql_GetData(sql_handle, 5, &data, NULL); online = atoi(data);
+
+					inter_to_fd(fd, u_fd, aid, "[AID: %d] %s | %s | Level: %d/%d | %s", account_id, name, job_name(class_), base_level, job_level, online?"Online":"Offline");
+				}
+				Sql_FreeResult(sql_handle);
+				return;
+			}
+		}
+	}
+
+	/* it will only get here if we have a single match */
+	if( account_id ) {
+		char userid[NAME_LENGTH], user_pass[NAME_LENGTH], email[40], last_ip[20], lastlogin[30];
+		short level = -1;
+		int logincount = 0,state = 0;
+		if ( SQL_ERROR == Sql_Query(sql_handle, "SELECT `userid`, `user_pass`, `email`, `last_ip`, `group_id`, `lastlogin`, `logincount`, `state` FROM `login` WHERE `account_id` = '%d' LIMIT 1", account_id)
+			|| Sql_NumRows(sql_handle) == 0 ) {
+			if( Sql_NumRows(sql_handle) == 0 ) {
+				inter_to_fd(fd, u_fd, aid,  "No account with ID '%d' was found.", account_id );
+			} else {
+				inter_to_fd(fd, u_fd, aid, "An error occured, bother your admin about it.");
+				Sql_ShowDebug(sql_handle);
+			}
+		} else {
+			Sql_NextRow(sql_handle);
+			Sql_GetData(sql_handle, 0, &data, NULL); safestrncpy(userid, data, sizeof(userid));
+			Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(user_pass, data, sizeof(user_pass));
+			Sql_GetData(sql_handle, 2, &data, NULL); safestrncpy(email, data, sizeof(email));
+			Sql_GetData(sql_handle, 3, &data, NULL); safestrncpy(last_ip, data, sizeof(last_ip));
+			Sql_GetData(sql_handle, 4, &data, NULL); level = atoi(data);
+			Sql_GetData(sql_handle, 5, &data, NULL); safestrncpy(lastlogin, data, sizeof(lastlogin));
+			Sql_GetData(sql_handle, 6, &data, NULL); logincount = atoi(data);
+			Sql_GetData(sql_handle, 7, &data, NULL); state = atoi(data);
+		}
+
+		Sql_FreeResult(sql_handle);
+
+		if (level == -1)
+			return;
+
+		inter_to_fd(fd, u_fd, aid, "-- Account %d --", account_id );
+		inter_to_fd(fd, u_fd, aid, "User: %s | GM Group: %d | State: %d", userid, level, state );
+
+		if (level < castergroup) /* only show pass if your gm level is greater than the one you're searching for */
+			inter_to_fd(fd, u_fd, aid, "Password: %s", user_pass );
+
+		inter_to_fd(fd, u_fd, aid, "Account e-mail: %s", email);
+		inter_to_fd(fd, u_fd, aid, "Last IP: %s (%s)", last_ip, geoip_getcountry(str2ip(last_ip)) );
+		inter_to_fd(fd, u_fd, aid, "This user has logged %d times, the last time were at %s", logincount, lastlogin );
+		inter_to_fd(fd, u_fd, aid, "-- Character Details --" );
+
+
+		if ( SQL_ERROR == Sql_Query(sql_handle, "SELECT `char_id`, `name`, `char_num`, `class`, `base_level`, `job_level`, `online` FROM `char` WHERE `account_id` = '%d' ORDER BY `char_num` LIMIT %d", account_id, MAX_CHARS)
+				|| Sql_NumRows(sql_handle) == 0 ) {
+
+				if( Sql_NumRows(sql_handle) == 0 )
+					inter_to_fd(fd, u_fd, aid,"This account doesn't have characters.");
+				else {
+					inter_to_fd(fd, u_fd, aid,"An error occured, bother your admin about it.");
+					Sql_ShowDebug(sql_handle);
+				}
+
+		} else {
+			while ( SQL_SUCCESS == Sql_NextRow(sql_handle) ) {
+				int char_id, class_;
+				short char_num, base_level, job_level, online;
+				char name[NAME_LENGTH];
+
+				Sql_GetData(sql_handle, 0, &data, NULL); char_id = atoi(data);
+				Sql_GetData(sql_handle, 1, &data, NULL); safestrncpy(name, data, sizeof(name));
+				Sql_GetData(sql_handle, 2, &data, NULL); char_num = atoi(data);
+				Sql_GetData(sql_handle, 3, &data, NULL); class_ = atoi(data);
+				Sql_GetData(sql_handle, 4, &data, NULL); base_level = atoi(data);
+				Sql_GetData(sql_handle, 5, &data, NULL); job_level = atoi(data);
+				Sql_GetData(sql_handle, 6, &data, NULL); online = atoi(data);
+
+				inter_to_fd(fd, u_fd, aid, "[Slot/CID: %d/%d] %s | %s | Level: %d/%d | %s", char_num, char_id, name, job_name(class_), base_level, job_level, online?"On":"Off");
+			}
+		}
+		Sql_FreeResult(sql_handle);
+	}
+
+	return;
 }
 //--------------------------------------------------------
 // Save registry to sql
-int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type)
+int inter_accreg_tosql(int account_id, int char_id, struct accreg* reg, int type)
 {
-    struct global_reg *r;
-    StringBuf buf;
-    int i;
-
-    if (account_id <= 0)
-        return 0;
-    reg->account_id = account_id;
-    reg->char_id = char_id;
-
-    //`global_reg_value` (`type`, `account_id`, `char_id`, `str`, `value`)
-    switch (type) {
-        case 3: //Char Reg
-            if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`=3 AND `char_id`='%d'", reg_db, char_id))
-                Sql_ShowDebug(sql_handle);
-            account_id = 0;
-            break;
-        case 2: //Account Reg
-            if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`=2 AND `account_id`='%d'", reg_db, account_id))
-                Sql_ShowDebug(sql_handle);
-            char_id = 0;
-            break;
-        case 1: //Account2 Reg
-            ShowError("inter_accreg_tosql: Char server shouldn't handle type 1 registry values (##). That is the login server's work!\n");
-            return 0;
-        default:
-            ShowError("inter_accreg_tosql: Invalid type %d\n", type);
-            return 0;
-    }
-
-    if (reg->reg_num <= 0)
-        return 0;
-
-    StringBuf_Init(&buf);
-    StringBuf_Printf(&buf, "INSERT INTO `%s` (`type`,`account_id`,`char_id`,`str`,`value`) VALUES ", reg_db);
-
-    for (i = 0; i < reg->reg_num; ++i) {
-        r = &reg->reg[i];
-        if (r->str[0] != '\0' && r->value[0] != '\0') {
-            char str[32];
-            char val[256];
-
-            if (i > 0)
-                StringBuf_AppendStr(&buf, ",");
-
-            Sql_EscapeString(sql_handle, str, r->str);
-            Sql_EscapeString(sql_handle, val, r->value);
-
-            StringBuf_Printf(&buf, "('%d','%d','%d','%s','%s')", type, account_id, char_id, str, val);
-        }
-    }
-
-    if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
-        Sql_ShowDebug(sql_handle);
-    }
-
-    StringBuf_Destroy(&buf);
-
-    return 1;
+	struct global_reg* r;
+	StringBuf buf;
+	int i;
+
+	if( account_id <= 0 )
+		return 0;
+	reg->account_id = account_id;
+	reg->char_id = char_id;
+
+	//`global_reg_value` (`type`, `account_id`, `char_id`, `str`, `value`)
+	switch( type )
+	{
+	case 3: //Char Reg
+		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`=3 AND `char_id`='%d'", reg_db, char_id) )
+			Sql_ShowDebug(sql_handle);
+		account_id = 0;
+		break;
+	case 2: //Account Reg
+		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `type`=2 AND `account_id`='%d'", reg_db, account_id) )
+			Sql_ShowDebug(sql_handle);
+		char_id = 0;
+		break;
+	case 1: //Account2 Reg
+		ShowError("inter_accreg_tosql: Char server shouldn't handle type 1 registry values (##). That is the login server's work!\n");
+		return 0;
+	default:
+		ShowError("inter_accreg_tosql: Invalid type %d\n", type);
+		return 0;
+	}
+
+	if( reg->reg_num <= 0 )
+		return 0;
+
+	StringBuf_Init(&buf);
+	StringBuf_Printf(&buf, "INSERT INTO `%s` (`type`,`account_id`,`char_id`,`str`,`value`) VALUES ", reg_db);
+
+	for( i = 0; i < reg->reg_num; ++i ) {
+		r = &reg->reg[i];
+		if( r->str[0] != '\0' && r->value[0] != '\0' ) {
+			char str[32];
+			char val[256];
+
+			if( i > 0 )
+				StringBuf_AppendStr(&buf, ",");
+
+			Sql_EscapeString(sql_handle, str, r->str);
+			Sql_EscapeString(sql_handle, val, r->value);
+
+			StringBuf_Printf(&buf, "('%d','%d','%d','%s','%s')", type, account_id, char_id, str, val);
+		}
+	}
+
+	if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) ) {
+		Sql_ShowDebug(sql_handle);
+	}
+
+	StringBuf_Destroy(&buf);
+
+	return 1;
 }
 
 // Load account_reg from sql (type=2)
 int inter_accreg_fromsql(int account_id,int char_id, struct accreg *reg, int type)
 {
-    struct global_reg *r;
-    char *data;
-    size_t len;
-    int i;
-
-    if (reg == NULL)
-        return 0;
-
-    memset(reg, 0, sizeof(struct accreg));
-    reg->account_id = account_id;
-    reg->char_id = char_id;
-
-    //`global_reg_value` (`type`, `account_id`, `char_id`, `str`, `value`)
-    switch (type) {
-        case 3: //char reg
-            if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `str`, `value` FROM `%s` WHERE `type`=3 AND `char_id`='%d'", reg_db, char_id))
-                Sql_ShowDebug(sql_handle);
-            break;
-        case 2: //account reg
-            if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `str`, `value` FROM `%s` WHERE `type`=2 AND `account_id`='%d'", reg_db, account_id))
-                Sql_ShowDebug(sql_handle);
-            break;
-        case 1: //account2 reg
-            ShowError("inter_accreg_fromsql: Char server shouldn't handle type 1 registry values (##). That is the login server's work!\n");
-            return 0;
-        default:
-            ShowError("inter_accreg_fromsql: Invalid type %d\n", type);
-            return 0;
-    }
-    for (i = 0; i < MAX_REG_NUM && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i) {
-        r = &reg->reg[i];
-        // str
-        Sql_GetData(sql_handle, 0, &data, &len);
-        memcpy(r->str, data, min(len, sizeof(r->str)));
-        // value
-        Sql_GetData(sql_handle, 1, &data, &len);
-        memcpy(r->value, data, min(len, sizeof(r->value)));
-    }
-    reg->reg_num = i;
-    Sql_FreeResult(sql_handle);
-    return 1;
+	struct global_reg* r;
+	char* data;
+	size_t len;
+	int i;
+
+	if( reg == NULL)
+		return 0;
+
+	memset(reg, 0, sizeof(struct accreg));
+	reg->account_id = account_id;
+	reg->char_id = char_id;
+
+	//`global_reg_value` (`type`, `account_id`, `char_id`, `str`, `value`)
+	switch( type )
+	{
+	case 3: //char reg
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `str`, `value` FROM `%s` WHERE `type`=3 AND `char_id`='%d'", reg_db, char_id) )
+			Sql_ShowDebug(sql_handle);
+		break;
+	case 2: //account reg
+		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `str`, `value` FROM `%s` WHERE `type`=2 AND `account_id`='%d'", reg_db, account_id) )
+			Sql_ShowDebug(sql_handle);
+		break;
+	case 1: //account2 reg
+		ShowError("inter_accreg_fromsql: Char server shouldn't handle type 1 registry values (##). That is the login server's work!\n");
+		return 0;
+	default:
+		ShowError("inter_accreg_fromsql: Invalid type %d\n", type);
+		return 0;
+	}
+	for( i = 0; i < MAX_REG_NUM && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	{
+		r = &reg->reg[i];
+		// str
+		Sql_GetData(sql_handle, 0, &data, &len);
+		memcpy(r->str, data, min(len, sizeof(r->str)));
+		// value
+		Sql_GetData(sql_handle, 1, &data, &len);
+		memcpy(r->value, data, min(len, sizeof(r->value)));
+	}
+	reg->reg_num = i;
+	Sql_FreeResult(sql_handle);
+	return 1;
 }
 
 // Initialize
 int inter_accreg_sql_init(void)
 {
-    CREATE(accreg_pt, struct accreg, 1);
-    return 0;
+	CREATE(accreg_pt, struct accreg, 1);
+	return 0;
 
 }
 
 /*==========================================
  * read config file
  *------------------------------------------*/
-static int inter_config_read(const char *cfgName)
+static int inter_config_read(const char* cfgName)
 {
-    int i;
-    char line[1024], w1[1024], w2[1024];
-    FILE *fp;
-
-    fp = fopen(cfgName, "r");
-    if (fp == NULL) {
-        ShowError("File not found: %s\n", cfgName);
-        return 1;
-    }
-
-    while (fgets(line, sizeof(line), fp)) {
-        i = sscanf(line, "%[^:]: %[^\r\n]", w1, w2);
-        if (i != 2)
-            continue;
-
-        if (!strcmpi(w1,"char_server_ip")) {
-            strcpy(char_server_ip,w2);
-        } else if (!strcmpi(w1,"char_server_port")) {
-            char_server_port = atoi(w2);
-        } else if (!strcmpi(w1,"char_server_id")) {
-            strcpy(char_server_id,w2);
-        } else if (!strcmpi(w1,"char_server_pw")) {
-            strcpy(char_server_pw,w2);
-        } else if (!strcmpi(w1,"char_server_db")) {
-            strcpy(char_server_db,w2);
-        } else if (!strcmpi(w1,"default_codepage")) {
-            strcpy(default_codepage,w2);
-        } else if (!strcmpi(w1,"party_share_level"))
-            party_share_level = atoi(w2);
-        else if (!strcmpi(w1,"log_inter"))
-            log_inter = atoi(w2);
-        else if (!strcmpi(w1,"main_chat_nick"))
-            safestrncpy(main_chat_nick, w2, sizeof(main_chat_nick));
-        else if (!strcmpi(w1,"import"))
-            inter_config_read(w2);
-    }
-    fclose(fp);
-
-    ShowInfo("Done reading %s.\n", cfgName);
-
-    return 0;
+	int i;
+	char line[1024], w1[1024], w2[1024];
+	FILE* fp;
+
+	fp = fopen(cfgName, "r");
+	if(fp == NULL) {
+		ShowError("File not found: %s\n", cfgName);
+		return 1;
+	}
+
+	while(fgets(line, sizeof(line), fp))
+	{
+		i = sscanf(line, "%[^:]: %[^\r\n]", w1, w2);
+		if(i != 2)
+			continue;
+
+		if(!strcmpi(w1,"char_server_ip")) {
+			strcpy(char_server_ip,w2);
+		} else
+		if(!strcmpi(w1,"char_server_port")) {
+			char_server_port = atoi(w2);
+		} else
+		if(!strcmpi(w1,"char_server_id")) {
+			strcpy(char_server_id,w2);
+		} else
+		if(!strcmpi(w1,"char_server_pw")) {
+			strcpy(char_server_pw,w2);
+		} else
+		if(!strcmpi(w1,"char_server_db")) {
+			strcpy(char_server_db,w2);
+		} else
+		if(!strcmpi(w1,"default_codepage")) {
+			strcpy(default_codepage,w2);
+		}
+		else if(!strcmpi(w1,"party_share_level"))
+			party_share_level = atoi(w2);
+		else if(!strcmpi(w1,"log_inter"))
+			log_inter = atoi(w2);
+		else if(!strcmpi(w1,"main_chat_nick"))
+			safestrncpy(main_chat_nick, w2, sizeof(main_chat_nick));
+		else if(!strcmpi(w1,"import"))
+			inter_config_read(w2);
+	}
+	fclose(fp);
+
+	ShowInfo ("Done reading %s.\n", cfgName);
+
+	return 0;
 }
 
 // Save interlog into sql
-int inter_log(char *fmt, ...)
+int inter_log(char* fmt, ...)
 {
-    char str[255];
-    char esc_str[sizeof(str)*2+1];// escaped str
-    va_list ap;
+	char str[255];
+	char esc_str[sizeof(str)*2+1];// escaped str
+	va_list ap;
 
-    va_start(ap,fmt);
-    vsnprintf(str, sizeof(str), fmt, ap);
-    va_end(ap);
+	va_start(ap,fmt);
+	vsnprintf(str, sizeof(str), fmt, ap);
+	va_end(ap);
 
-    Sql_EscapeStringLen(sql_handle, esc_str, str, strnlen(str, sizeof(str)));
-    if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`time`, `log`) VALUES (NOW(),  '%s')", interlog_db, esc_str))
-        Sql_ShowDebug(sql_handle);
+	Sql_EscapeStringLen(sql_handle, esc_str, str, strnlen(str, sizeof(str)));
+	if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`time`, `log`) VALUES (NOW(),  '%s')", interlog_db, esc_str) )
+		Sql_ShowDebug(sql_handle);
 
-    return 0;
+	return 0;
 }
 
 // initialize
 int inter_init_sql(const char *file)
 {
-    //int i;
-
-    inter_config_read(file);
-
-    //DB connection initialized
-    sql_handle = Sql_Malloc();
-    ShowInfo("Connect Character DB server.... (Character Server)\n");
-    if (SQL_ERROR == Sql_Connect(sql_handle, char_server_id, char_server_pw, char_server_ip, (uint16)char_server_port, char_server_db)) {
-        Sql_ShowDebug(sql_handle);
-        Sql_Free(sql_handle);
-        exit(EXIT_FAILURE);
-    }
-
-    if (*default_codepage) {
-        if (SQL_ERROR == Sql_SetEncoding(sql_handle, default_codepage))
-            Sql_ShowDebug(sql_handle);
-    }
-
-    wis_db = idb_alloc(DB_OPT_RELEASE_DATA);
-    inter_guild_sql_init();
-    inter_storage_sql_init();
-    inter_party_sql_init();
-    inter_pet_sql_init();
-    inter_homunculus_sql_init();
-    inter_mercenary_sql_init();
-    inter_elemental_sql_init();
-    inter_accreg_sql_init();
-    inter_mail_sql_init();
-    inter_auction_sql_init();
-
-    geoip_readdb();
-    msg_config_read("conf/msg_athena.conf");
-    return 0;
+	//int i;
+
+	inter_config_read(file);
+
+	//DB connection initialized
+	sql_handle = Sql_Malloc();
+	ShowInfo("Connect Character DB server.... (Character Server)\n");
+	if( SQL_ERROR == Sql_Connect(sql_handle, char_server_id, char_server_pw, char_server_ip, (uint16)char_server_port, char_server_db) )
+	{
+		Sql_ShowDebug(sql_handle);
+		Sql_Free(sql_handle);
+		exit(EXIT_FAILURE);
+	}
+
+	if( *default_codepage ) {
+		if( SQL_ERROR == Sql_SetEncoding(sql_handle, default_codepage) )
+			Sql_ShowDebug(sql_handle);
+	}
+
+	wis_db = idb_alloc(DB_OPT_RELEASE_DATA);
+	inter_guild_sql_init();
+	inter_storage_sql_init();
+	inter_party_sql_init();
+	inter_pet_sql_init();
+	inter_homunculus_sql_init();
+	inter_mercenary_sql_init();
+	inter_elemental_sql_init();
+	inter_accreg_sql_init();
+	inter_mail_sql_init();
+	inter_auction_sql_init();
+
+	geoip_readdb();
+	msg_config_read("conf/msg_athena.conf");
+	return 0;
 }
 
 // finalize
 void inter_final(void)
 {
-    wis_db->destroy(wis_db, NULL);
-
-    inter_guild_sql_final();
-    inter_storage_sql_final();
-    inter_party_sql_final();
-    inter_pet_sql_final();
-    inter_homunculus_sql_final();
-    inter_mercenary_sql_final();
-    inter_elemental_sql_final();
-    inter_mail_sql_final();
-    inter_auction_sql_final();
-
-    if (accreg_pt) aFree(accreg_pt);
-
-    do_final_msg();
-    return;
+	wis_db->destroy(wis_db, NULL);
+
+	inter_guild_sql_final();
+	inter_storage_sql_final();
+	inter_party_sql_final();
+	inter_pet_sql_final();
+	inter_homunculus_sql_final();
+	inter_mercenary_sql_final();
+	inter_elemental_sql_final();
+	inter_mail_sql_final();
+	inter_auction_sql_final();
+
+	if (accreg_pt) aFree(accreg_pt);
+
+	do_final_msg();
+	return;
 }
 
 int inter_mapif_init(int fd)
 {
-    return 0;
+	return 0;
 }
 
 
@@ -849,98 +827,99 @@ int inter_mapif_init(int fd)
 // broadcast sending
 int mapif_broadcast(unsigned char *mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd)
 {
-    unsigned char *buf = (unsigned char *)aMalloc((len)*sizeof(unsigned char));
-
-    WBUFW(buf,0) = 0x3800;
-    WBUFW(buf,2) = len;
-    WBUFL(buf,4) = fontColor;
-    WBUFW(buf,8) = fontType;
-    WBUFW(buf,10) = fontSize;
-    WBUFW(buf,12) = fontAlign;
-    WBUFW(buf,14) = fontY;
-    memcpy(WBUFP(buf,16), mes, len - 16);
-    mapif_sendallwos(sfd, buf, len);
-
-    if (buf)
-        aFree(buf);
-    return 0;
+	unsigned char *buf = (unsigned char*)aMalloc((len)*sizeof(unsigned char));
+
+	WBUFW(buf,0) = 0x3800;
+	WBUFW(buf,2) = len;
+	WBUFL(buf,4) = fontColor;
+	WBUFW(buf,8) = fontType;
+	WBUFW(buf,10) = fontSize;
+	WBUFW(buf,12) = fontAlign;
+	WBUFW(buf,14) = fontY;
+	memcpy(WBUFP(buf,16), mes, len - 16);
+	mapif_sendallwos(sfd, buf, len);
+
+	if (buf)
+		aFree(buf);
+	return 0;
 }
 
 // Wis sending
 int mapif_wis_message(struct WisData *wd)
 {
-    unsigned char buf[2048];
-    if (wd->len > 2047-56) wd->len = 2047-56; //Force it to fit to avoid crashes. [Skotlex]
-
-    WBUFW(buf, 0) = 0x3801;
-    WBUFW(buf, 2) = 56 +wd->len;
-    WBUFL(buf, 4) = wd->id;
-    memcpy(WBUFP(buf, 8), wd->src, NAME_LENGTH);
-    memcpy(WBUFP(buf,32), wd->dst, NAME_LENGTH);
-    memcpy(WBUFP(buf,56), wd->msg, wd->len);
-    wd->count = mapif_sendall(buf,WBUFW(buf,2));
-
-    return 0;
+	unsigned char buf[2048];
+	if (wd->len > 2047-56) wd->len = 2047-56; //Force it to fit to avoid crashes. [Skotlex]
+
+	WBUFW(buf, 0) = 0x3801;
+	WBUFW(buf, 2) = 56 +wd->len;
+	WBUFL(buf, 4) = wd->id;
+	memcpy(WBUFP(buf, 8), wd->src, NAME_LENGTH);
+	memcpy(WBUFP(buf,32), wd->dst, NAME_LENGTH);
+	memcpy(WBUFP(buf,56), wd->msg, wd->len);
+	wd->count = mapif_sendall(buf,WBUFW(buf,2));
+
+	return 0;
 }
 
 // Wis sending result
 int mapif_wis_end(struct WisData *wd, int flag)
 {
-    unsigned char buf[27];
+	unsigned char buf[27];
 
-    WBUFW(buf, 0)=0x3802;
-    memcpy(WBUFP(buf, 2),wd->src,24);
-    WBUFB(buf,26)=flag;
-    mapif_send(wd->fd,buf,27);
-    return 0;
+	WBUFW(buf, 0)=0x3802;
+	memcpy(WBUFP(buf, 2),wd->src,24);
+	WBUFB(buf,26)=flag;
+	mapif_send(wd->fd,buf,27);
+	return 0;
 }
 
 // Account registry transfer to map-server
 static void mapif_account_reg(int fd, unsigned char *src)
 {
-    WBUFW(src,0)=0x3804; //NOTE: writing to RFIFO
-    mapif_sendallwos(fd, src, WBUFW(src,2));
+	WBUFW(src,0)=0x3804; //NOTE: writing to RFIFO
+	mapif_sendallwos(fd, src, WBUFW(src,2));
 }
 
 // Send the requested account_reg
 int mapif_account_reg_reply(int fd,int account_id,int char_id, int type)
 {
-    struct accreg *reg=accreg_pt;
-    WFIFOHEAD(fd, 13 + 5000);
-    inter_accreg_fromsql(account_id,char_id,reg,type);
-
-    WFIFOW(fd,0)=0x3804;
-    WFIFOL(fd,4)=account_id;
-    WFIFOL(fd,8)=char_id;
-    WFIFOB(fd,12)=type;
-    if (reg->reg_num==0) {
-        WFIFOW(fd,2)=13;
-    } else {
-        int i,p;
-        for (p=13,i = 0; i < reg->reg_num && p < 5000; i++) {
-            p+= sprintf((char *)WFIFOP(fd,p), "%s", reg->reg[i].str)+1; //We add 1 to consider the '\0' in place.
-            p+= sprintf((char *)WFIFOP(fd,p), "%s", reg->reg[i].value)+1;
-        }
-        WFIFOW(fd,2)=p;
-        if (p>= 5000)
-            ShowWarning("Too many acc regs for %d:%d, not all values were loaded.\n", account_id, char_id);
-    }
-    WFIFOSET(fd,WFIFOW(fd,2));
-    return 0;
+	struct accreg *reg=accreg_pt;
+	WFIFOHEAD(fd, 13 + 5000);
+	inter_accreg_fromsql(account_id,char_id,reg,type);
+
+	WFIFOW(fd,0)=0x3804;
+	WFIFOL(fd,4)=account_id;
+	WFIFOL(fd,8)=char_id;
+	WFIFOB(fd,12)=type;
+	if(reg->reg_num==0){
+		WFIFOW(fd,2)=13;
+	}else{
+		int i,p;
+		for (p=13,i = 0; i < reg->reg_num && p < 5000; i++) {
+			p+= sprintf((char*)WFIFOP(fd,p), "%s", reg->reg[i].str)+1; //We add 1 to consider the '\0' in place.
+			p+= sprintf((char*)WFIFOP(fd,p), "%s", reg->reg[i].value)+1;
+		}
+		WFIFOW(fd,2)=p;
+		if (p>= 5000)
+			ShowWarning("Too many acc regs for %d:%d, not all values were loaded.\n", account_id, char_id);
+	}
+	WFIFOSET(fd,WFIFOW(fd,2));
+	return 0;
 }
 
 //Request to kick char from a certain map server. [Skotlex]
 int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason)
 {
-    if (fd >= 0) {
-        WFIFOHEAD(fd,7);
-        WFIFOW(fd,0) = 0x2b1f;
-        WFIFOL(fd,2) = account_id;
-        WFIFOB(fd,6) = reason;
-        WFIFOSET(fd,7);
-        return 0;
-    }
-    return -1;
+	if (fd >= 0)
+	{
+		WFIFOHEAD(fd,7);
+		WFIFOW(fd,0) = 0x2b1f;
+		WFIFOL(fd,2) = account_id;
+		WFIFOB(fd,6) = reason;
+		WFIFOSET(fd,7);
+		return 0;
+	}
+	return -1;
 }
 
 //--------------------------------------------------------
@@ -951,34 +930,34 @@ int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason)
  */
 int check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap)
 {
-    unsigned long tick;
-    struct WisData *wd = db_data2ptr(data);
-    tick = va_arg(ap, unsigned long);
+	unsigned long tick;
+	struct WisData *wd = db_data2ptr(data);
+	tick = va_arg(ap, unsigned long);
 
-    if (DIFF_TICK(tick, wd->tick) > WISDATA_TTL && wis_delnum < WISDELLIST_MAX)
-        wis_dellist[wis_delnum++] = wd->id;
+	if (DIFF_TICK(tick, wd->tick) > WISDATA_TTL && wis_delnum < WISDELLIST_MAX)
+		wis_dellist[wis_delnum++] = wd->id;
 
-    return 0;
+	return 0;
 }
 
 int check_ttl_wisdata(void)
 {
-    unsigned long tick = gettick();
-    int i;
-
-    do {
-        wis_delnum = 0;
-        wis_db->foreach(wis_db, check_ttl_wisdata_sub, tick);
-        for (i = 0; i < wis_delnum; i++) {
-            struct WisData *wd = (struct WisData *)idb_get(wis_db, wis_dellist[i]);
-            ShowWarning("inter: wis data id=%d time out : from %s to %s\n", wd->id, wd->src, wd->dst);
-            // removed. not send information after a timeout. Just no answer for the player
-            //mapif_wis_end(wd, 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
-            idb_remove(wis_db, wd->id);
-        }
-    } while (wis_delnum >= WISDELLIST_MAX);
-
-    return 0;
+	unsigned long tick = gettick();
+	int i;
+
+	do {
+		wis_delnum = 0;
+		wis_db->foreach(wis_db, check_ttl_wisdata_sub, tick);
+		for(i = 0; i < wis_delnum; i++) {
+			struct WisData *wd = (struct WisData*)idb_get(wis_db, wis_dellist[i]);
+			ShowWarning("inter: wis data id=%d time out : from %s to %s\n", wd->id, wd->src, wd->dst);
+			// removed. not send information after a timeout. Just no answer for the player
+			//mapif_wis_end(wd, 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+			idb_remove(wis_db, wd->id);
+		}
+	} while(wis_delnum >= WISDELLIST_MAX);
+
+	return 0;
 }
 
 //--------------------------------------------------------
@@ -986,206 +965,209 @@ int check_ttl_wisdata(void)
 // broadcast sending
 int mapif_parse_broadcast(int fd)
 {
-    mapif_broadcast(RFIFOP(fd,16), RFIFOW(fd,2), RFIFOL(fd,4), RFIFOW(fd,8), RFIFOW(fd,10), RFIFOW(fd,12), RFIFOW(fd,14), fd);
-    return 0;
+	mapif_broadcast(RFIFOP(fd,16), RFIFOW(fd,2), RFIFOL(fd,4), RFIFOW(fd,8), RFIFOW(fd,10), RFIFOW(fd,12), RFIFOW(fd,14), fd);
+	return 0;
 }
 
 
 // Wisp/page request to send
 int mapif_parse_WisRequest(int fd)
 {
-    struct WisData *wd;
-    static int wisid = 0;
-    char name[NAME_LENGTH];
-    char esc_name[NAME_LENGTH*2+1];// escaped name
-    char *data;
-    size_t len;
-
-
-    if (fd <= 0) {
-        return 0;   // check if we have a valid fd
-    }
-
-    if (RFIFOW(fd,2)-52 >= sizeof(wd->msg)) {
-        ShowWarning("inter: Wis message size too long.\n");
-        return 0;
-    } else if (RFIFOW(fd,2)-52 <= 0) { // normaly, impossible, but who knows...
-        ShowError("inter: Wis message doesn't exist.\n");
-        return 0;
-    }
-
-    safestrncpy(name, (char *)RFIFOP(fd,28), NAME_LENGTH); //Received name may be too large and not contain \0! [Skotlex]
-
-    Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-    if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `name` FROM `%s` WHERE `name`='%s'", char_db, esc_name))
-        Sql_ShowDebug(sql_handle);
-
-    // search if character exists before to ask all map-servers
-    if (SQL_SUCCESS != Sql_NextRow(sql_handle)) {
-        unsigned char buf[27];
-        WBUFW(buf, 0) = 0x3802;
-        memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
-        WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
-        mapif_send(fd, buf, 27);
-    } else {
-        // Character exists. So, ask all map-servers
-        // to be sure of the correct name, rewrite it
-        Sql_GetData(sql_handle, 0, &data, &len);
-        memset(name, 0, NAME_LENGTH);
-        memcpy(name, data, min(len, NAME_LENGTH));
-        // if source is destination, don't ask other servers.
-        if (strncmp((const char *)RFIFOP(fd,4), name, NAME_LENGTH) == 0) {
-            uint8 buf[27];
-            WBUFW(buf, 0) = 0x3802;
-            memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
-            WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
-            mapif_send(fd, buf, 27);
-        } else {
-
-            CREATE(wd, struct WisData, 1);
-
-            // Whether the failure of previous wisp/page transmission (timeout)
-            check_ttl_wisdata();
-
-            wd->id = ++wisid;
-            wd->fd = fd;
-            wd->len= RFIFOW(fd,2)-52;
-            memcpy(wd->src, RFIFOP(fd, 4), NAME_LENGTH);
-            memcpy(wd->dst, RFIFOP(fd,28), NAME_LENGTH);
-            memcpy(wd->msg, RFIFOP(fd,52), wd->len);
-            wd->tick = gettick();
-            idb_put(wis_db, wd->id, wd);
-            mapif_wis_message(wd);
-        }
-    }
-
-    Sql_FreeResult(sql_handle);
-    return 0;
+	struct WisData* wd;
+	static int wisid = 0;
+	char name[NAME_LENGTH];
+	char esc_name[NAME_LENGTH*2+1];// escaped name
+	char* data;
+	size_t len;
+
+
+	if ( fd <= 0 ) {return 0;} // check if we have a valid fd
+
+	if (RFIFOW(fd,2)-52 >= sizeof(wd->msg)) {
+		ShowWarning("inter: Wis message size too long.\n");
+		return 0;
+	} else if (RFIFOW(fd,2)-52 <= 0) { // normaly, impossible, but who knows...
+		ShowError("inter: Wis message doesn't exist.\n");
+		return 0;
+	}
+
+	safestrncpy(name, (char*)RFIFOP(fd,28), NAME_LENGTH); //Received name may be too large and not contain \0! [Skotlex]
+
+	Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `name` FROM `%s` WHERE `name`='%s'", char_db, esc_name) )
+		Sql_ShowDebug(sql_handle);
+
+	// search if character exists before to ask all map-servers
+	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	{
+		unsigned char buf[27];
+		WBUFW(buf, 0) = 0x3802;
+		memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
+		WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+		mapif_send(fd, buf, 27);
+	}
+	else
+	{// Character exists. So, ask all map-servers
+		// to be sure of the correct name, rewrite it
+		Sql_GetData(sql_handle, 0, &data, &len);
+		memset(name, 0, NAME_LENGTH);
+		memcpy(name, data, min(len, NAME_LENGTH));
+		// if source is destination, don't ask other servers.
+		if( strncmp((const char*)RFIFOP(fd,4), name, NAME_LENGTH) == 0 )
+		{
+			uint8 buf[27];
+			WBUFW(buf, 0) = 0x3802;
+			memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
+			WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+			mapif_send(fd, buf, 27);
+		}
+		else
+		{
+
+			CREATE(wd, struct WisData, 1);
+
+			// Whether the failure of previous wisp/page transmission (timeout)
+			check_ttl_wisdata();
+
+			wd->id = ++wisid;
+			wd->fd = fd;
+			wd->len= RFIFOW(fd,2)-52;
+			memcpy(wd->src, RFIFOP(fd, 4), NAME_LENGTH);
+			memcpy(wd->dst, RFIFOP(fd,28), NAME_LENGTH);
+			memcpy(wd->msg, RFIFOP(fd,52), wd->len);
+			wd->tick = gettick();
+			idb_put(wis_db, wd->id, wd);
+			mapif_wis_message(wd);
+		}
+	}
+
+	Sql_FreeResult(sql_handle);
+	return 0;
 }
 
 
 // Wisp/page transmission result
 int mapif_parse_WisReply(int fd)
 {
-    int id, flag;
-    struct WisData *wd;
+	int id, flag;
+	struct WisData *wd;
 
-    id = RFIFOL(fd,2);
-    flag = RFIFOB(fd,6);
-    wd = (struct WisData *)idb_get(wis_db, id);
-    if (wd == NULL)
-        return 0;   // This wisp was probably suppress before, because it was timeout of because of target was found on another map-server
+	id = RFIFOL(fd,2);
+	flag = RFIFOB(fd,6);
+	wd = (struct WisData*)idb_get(wis_db, id);
+	if (wd == NULL)
+		return 0;	// This wisp was probably suppress before, because it was timeout of because of target was found on another map-server
 
-    if ((--wd->count) <= 0 || flag != 1) {
-        mapif_wis_end(wd, flag); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
-        idb_remove(wis_db, id);
-    }
+	if ((--wd->count) <= 0 || flag != 1) {
+		mapif_wis_end(wd, flag); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+		idb_remove(wis_db, id);
+	}
 
-    return 0;
+	return 0;
 }
 
 // Received wisp message from map-server for ALL gm (just copy the message and resends it to ALL map-servers)
 int mapif_parse_WisToGM(int fd)
 {
-    unsigned char buf[2048]; // 0x3003/0x3803 <packet_len>.w <wispname>.24B <min_gm_level>.w <message>.?B
+	unsigned char buf[2048]; // 0x3003/0x3803 <packet_len>.w <wispname>.24B <min_gm_level>.w <message>.?B
 
-    memcpy(WBUFP(buf,0), RFIFOP(fd,0), RFIFOW(fd,2));
-    WBUFW(buf, 0) = 0x3803;
-    mapif_sendall(buf, RFIFOW(fd,2));
+	memcpy(WBUFP(buf,0), RFIFOP(fd,0), RFIFOW(fd,2));
+	WBUFW(buf, 0) = 0x3803;
+	mapif_sendall(buf, RFIFOW(fd,2));
 
-    return 0;
+	return 0;
 }
 
 // Save account_reg into sql (type=2)
 int mapif_parse_Registry(int fd)
 {
-    int j,p,len, max;
-    struct accreg *reg=accreg_pt;
-
-    memset(accreg_pt,0,sizeof(struct accreg));
-    switch (RFIFOB(fd, 12)) {
-        case 3: //Character registry
-            max = GLOBAL_REG_NUM;
-            break;
-        case 2: //Account Registry
-            max = ACCOUNT_REG_NUM;
-            break;
-        case 1: //Account2 registry, must be sent over to login server.
-            return save_accreg2(RFIFOP(fd,4), RFIFOW(fd,2)-4);
-        default:
-            return 1;
-    }
-    for (j=0,p=13; j<max && p<RFIFOW(fd,2); j++) {
-        sscanf((char *)RFIFOP(fd,p), "%31c%n",reg->reg[j].str,&len);
-        reg->reg[j].str[len]='\0';
-        p +=len+1; //+1 to skip the '\0' between strings.
-        sscanf((char *)RFIFOP(fd,p), "%255c%n",reg->reg[j].value,&len);
-        reg->reg[j].value[len]='\0';
-        p +=len+1;
-    }
-    reg->reg_num=j;
-
-    inter_accreg_tosql(RFIFOL(fd,4),RFIFOL(fd,8),reg, RFIFOB(fd,12));
-    mapif_account_reg(fd,RFIFOP(fd,0)); // Send updated accounts to other map servers.
-    return 0;
+	int j,p,len, max;
+	struct accreg *reg=accreg_pt;
+
+	memset(accreg_pt,0,sizeof(struct accreg));
+	switch (RFIFOB(fd, 12)) {
+	case 3: //Character registry
+		max = GLOBAL_REG_NUM;
+	break;
+	case 2: //Account Registry
+		max = ACCOUNT_REG_NUM;
+	break;
+	case 1: //Account2 registry, must be sent over to login server.
+		return save_accreg2(RFIFOP(fd,4), RFIFOW(fd,2)-4);
+	default:
+		return 1;
+	}
+	for(j=0,p=13;j<max && p<RFIFOW(fd,2);j++){
+		sscanf((char*)RFIFOP(fd,p), "%31c%n",reg->reg[j].str,&len);
+		reg->reg[j].str[len]='\0';
+		p +=len+1; //+1 to skip the '\0' between strings.
+		sscanf((char*)RFIFOP(fd,p), "%255c%n",reg->reg[j].value,&len);
+		reg->reg[j].value[len]='\0';
+		p +=len+1;
+	}
+	reg->reg_num=j;
+
+	inter_accreg_tosql(RFIFOL(fd,4),RFIFOL(fd,8),reg, RFIFOB(fd,12));
+	mapif_account_reg(fd,RFIFOP(fd,0));	// Send updated accounts to other map servers.
+	return 0;
 }
 
 // Request the value of all registries.
 int mapif_parse_RegistryRequest(int fd)
 {
-    //Load Char Registry
-    if (RFIFOB(fd,12)) mapif_account_reg_reply(fd,RFIFOL(fd,2),RFIFOL(fd,6),3);
-    //Load Account Registry
-    if (RFIFOB(fd,11)) mapif_account_reg_reply(fd,RFIFOL(fd,2),RFIFOL(fd,6),2);
-    //Ask Login Server for Account2 values.
-    if (RFIFOB(fd,10)) request_accreg2(RFIFOL(fd,2),RFIFOL(fd,6));
-    return 1;
+	//Load Char Registry
+	if (RFIFOB(fd,12)) mapif_account_reg_reply(fd,RFIFOL(fd,2),RFIFOL(fd,6),3);
+	//Load Account Registry
+	if (RFIFOB(fd,11)) mapif_account_reg_reply(fd,RFIFOL(fd,2),RFIFOL(fd,6),2);
+	//Ask Login Server for Account2 values.
+	if (RFIFOB(fd,10)) request_accreg2(RFIFOL(fd,2),RFIFOL(fd,6));
+	return 1;
 }
 
 static void mapif_namechange_ack(int fd, int account_id, int char_id, int type, int flag, char *name)
 {
-    WFIFOHEAD(fd, NAME_LENGTH+13);
-    WFIFOW(fd, 0) = 0x3806;
-    WFIFOL(fd, 2) = account_id;
-    WFIFOL(fd, 6) = char_id;
-    WFIFOB(fd,10) = type;
-    WFIFOB(fd,11) = flag;
-    memcpy(WFIFOP(fd, 12), name, NAME_LENGTH);
-    WFIFOSET(fd, NAME_LENGTH+13);
+	WFIFOHEAD(fd, NAME_LENGTH+13);
+	WFIFOW(fd, 0) = 0x3806;
+	WFIFOL(fd, 2) = account_id;
+	WFIFOL(fd, 6) = char_id;
+	WFIFOB(fd,10) = type;
+	WFIFOB(fd,11) = flag;
+	memcpy(WFIFOP(fd, 12), name, NAME_LENGTH);
+	WFIFOSET(fd, NAME_LENGTH+13);
 }
 
 int mapif_parse_NameChangeRequest(int fd)
 {
-    int account_id, char_id, type;
-    char *name;
-    int i;
-
-    account_id = RFIFOL(fd,2);
-    char_id = RFIFOL(fd,6);
-    type = RFIFOB(fd,10);
-    name = (char *)RFIFOP(fd,11);
-
-    // Check Authorised letters/symbols in the name
-    if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) == NULL) {
-                mapif_namechange_ack(fd, account_id, char_id, type, 0, name);
-                return 0;
-            }
-    } else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
-        for (i = 0; i < NAME_LENGTH && name[i]; i++)
-            if (strchr(char_name_letters, name[i]) != NULL) {
-                mapif_namechange_ack(fd, account_id, char_id, type, 0, name);
-                return 0;
-            }
-    }
-    //TODO: type holds the type of object to rename.
-    //If it were a player, it needs to have the guild information and db information
-    //updated here, because changing it on the map won't make it be saved [Skotlex]
-
-    //name allowed.
-    mapif_namechange_ack(fd, account_id, char_id, type, 1, name);
-    return 0;
+	int account_id, char_id, type;
+	char* name;
+	int i;
+
+	account_id = RFIFOL(fd,2);
+	char_id = RFIFOL(fd,6);
+	type = RFIFOB(fd,10);
+	name = (char*)RFIFOP(fd,11);
+
+	// Check Authorised letters/symbols in the name
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+		for (i = 0; i < NAME_LENGTH && name[i]; i++)
+		if (strchr(char_name_letters, name[i]) == NULL) {
+			mapif_namechange_ack(fd, account_id, char_id, type, 0, name);
+			return 0;
+		}
+	} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
+		for (i = 0; i < NAME_LENGTH && name[i]; i++)
+		if (strchr(char_name_letters, name[i]) != NULL) {
+			mapif_namechange_ack(fd, account_id, char_id, type, 0, name);
+			return 0;
+		}
+	}
+	//TODO: type holds the type of object to rename.
+	//If it were a player, it needs to have the guild information and db information
+	//updated here, because changing it on the map won't make it be saved [Skotlex]
+
+	//name allowed.
+	mapif_namechange_ack(fd, account_id, char_id, type, 1, name);
+	return 0;
 }
 
 //--------------------------------------------------------
@@ -1196,75 +1178,59 @@ int mapif_parse_NameChangeRequest(int fd)
 /// @param length The minimum allowed length, or -1 for dynamic lookup
 int inter_check_length(int fd, int length)
 {
-    if (length == -1) {
-        // variable-length packet
-        if (RFIFOREST(fd) < 4)
-            return 0;
-        length = RFIFOW(fd,2);
-    }
+	if( length == -1 )
+	{// variable-length packet
+		if( RFIFOREST(fd) < 4 )
+			return 0;
+		length = RFIFOW(fd,2);
+	}
 
-    if ((int)RFIFOREST(fd) < length)
-        return 0;
+	if( (int)RFIFOREST(fd) < length )
+		return 0;
 
-    return length;
+	return length;
 }
 
 int inter_parse_frommap(int fd)
 {
-    int cmd;
-    int len = 0;
-    cmd = RFIFOW(fd,0);
-    // Check is valid packet entry
-    if (cmd < 0x3000 || cmd >= 0x3000 + ARRAYLENGTH(inter_recv_packet_length) || inter_recv_packet_length[cmd - 0x3000] == 0)
-        return 0;
-
-    // Check packet length
-    if ((len = inter_check_length(fd, inter_recv_packet_length[cmd - 0x3000])) == 0)
-        return 2;
-
-    switch (cmd) {
-        case 0x3000:
-            mapif_parse_broadcast(fd);
-            break;
-        case 0x3001:
-            mapif_parse_WisRequest(fd);
-            break;
-        case 0x3002:
-            mapif_parse_WisReply(fd);
-            break;
-        case 0x3003:
-            mapif_parse_WisToGM(fd);
-            break;
-        case 0x3004:
-            mapif_parse_Registry(fd);
-            break;
-        case 0x3005:
-            mapif_parse_RegistryRequest(fd);
-            break;
-        case 0x3006:
-            mapif_parse_NameChangeRequest(fd);
-            break;
-        case 0x3007:
-            mapif_parse_accinfo(fd);
-            break;
-            /* 0x3008 is used by the report stuff */
-        default:
-            if (inter_party_parse_frommap(fd)
-                || inter_guild_parse_frommap(fd)
-                || inter_storage_parse_frommap(fd)
-                || inter_pet_parse_frommap(fd)
-                || inter_homunculus_parse_frommap(fd)
-                || inter_mercenary_parse_frommap(fd)
-                || inter_elemental_parse_frommap(fd)
-                || inter_mail_parse_frommap(fd)
-                || inter_auction_parse_frommap(fd)
-                || inter_quest_parse_frommap(fd)
-               )
-                break;
-            else
-                return 0;
-    }
-
-    RFIFOSKIP(fd, len);
-    return 1;
+	int cmd;
+	int len = 0;
+	cmd = RFIFOW(fd,0);
+	// Check is valid packet entry
+	if(cmd < 0x3000 || cmd >= 0x3000 + ARRAYLENGTH(inter_recv_packet_length) || inter_recv_packet_length[cmd - 0x3000] == 0)
+		return 0;
+
+	// Check packet length
+	if((len = inter_check_length(fd, inter_recv_packet_length[cmd - 0x3000])) == 0)
+		return 2;
+
+	switch(cmd) {
+	case 0x3000: mapif_parse_broadcast(fd); break;
+	case 0x3001: mapif_parse_WisRequest(fd); break;
+	case 0x3002: mapif_parse_WisReply(fd); break;
+	case 0x3003: mapif_parse_WisToGM(fd); break;
+	case 0x3004: mapif_parse_Registry(fd); break;
+	case 0x3005: mapif_parse_RegistryRequest(fd); break;
+	case 0x3006: mapif_parse_NameChangeRequest(fd); break;
+	case 0x3007: mapif_parse_accinfo(fd); break;
+	/* 0x3008 is used by the report stuff */
+	default:
+		if(  inter_party_parse_frommap(fd)
+		  || inter_guild_parse_frommap(fd)
+		  || inter_storage_parse_frommap(fd)
+		  || inter_pet_parse_frommap(fd)
+		  || inter_homunculus_parse_frommap(fd)
+		  || inter_mercenary_parse_frommap(fd)
+		  || inter_elemental_parse_frommap(fd)
+		  || inter_mail_parse_frommap(fd)
+		  || inter_auction_parse_frommap(fd)
+		  || inter_quest_parse_frommap(fd)
+		   )
+			break;
+		else
+			return 0;
+	}
+
+	RFIFOSKIP(fd, len);
+	return 1;
 }
diff --git a/src/char/inter.h b/src/char/inter.h
index 199d70bb4..ac2e1785f 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -20,8 +20,8 @@ int inter_log(char *fmt,...);
 
 extern unsigned int party_share_level;
 
-extern Sql *sql_handle;
-extern Sql *lsql_handle;
+extern Sql* sql_handle;
+extern Sql* lsql_handle;
 
 extern char main_chat_nick[16];