Merge pull request #1 from Earisu/master

updating, with earisu's

18 files changed, 2787 insertions, 2282 deletions

diff --git a/src/char/CMakeLists.txt b/src/char/CMakeLists.txt
index 22b793bef..9413ff303 100644
--- a/src/char/CMakeLists.txt
+++ b/src/char/CMakeLists.txt
@@ -9,7 +9,7 @@ set( SQL_CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}  CACHE INTERNAL "" )
 # char sql
 #
 if( BUILD_SQL_SERVERS )
-message( STATUS "Creating target char-server_sql" )
+message( STATUS "Creating target char-server" )
 set( SQL_CHAR_HEADERS
 	"${CMAKE_CURRENT_SOURCE_DIR}/char.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/int_auction.h"
@@ -23,6 +23,7 @@ set( SQL_CHAR_HEADERS
 	"${CMAKE_CURRENT_SOURCE_DIR}/int_quest.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/int_storage.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/inter.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/pincode.h"
 	)
 set( SQL_CHAR_SOURCES
 	"${CMAKE_CURRENT_SOURCE_DIR}/char.c"
@@ -37,6 +38,7 @@ set( SQL_CHAR_SOURCES
 	"${CMAKE_CURRENT_SOURCE_DIR}/int_quest.c"
 	"${CMAKE_CURRENT_SOURCE_DIR}/int_storage.c"
 	"${CMAKE_CURRENT_SOURCE_DIR}/inter.c"
+	"${CMAKE_CURRENT_SOURCE_DIR}/pincode.c"
 	)
 set( DEPENDENCIES common_sql )
 set( LIBRARIES ${GLOBAL_LIBRARIES} )
@@ -46,15 +48,15 @@ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_CHAR_HEADER
 source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} )
 source_group( char FILES ${SQL_CHAR_HEADERS} ${SQL_CHAR_SOURCES} )
 include_directories( ${INCLUDE_DIRS} )
-add_executable( char-server_sql ${SOURCE_FILES} )
-add_dependencies( char-server_sql ${DEPENDENCIES} )
-target_link_libraries( char-server_sql ${LIBRARIES} ${DEPENDENCIES} )
-set_target_properties( char-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
+add_executable( char-server ${SOURCE_FILES} )
+add_dependencies( char-server ${DEPENDENCIES} )
+target_link_libraries( char-server ${LIBRARIES} ${DEPENDENCIES} )
+set_target_properties( char-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
 if( INSTALL_COMPONENT_RUNTIME )
-	cpack_add_component( Runtime_charserver_sql DESCRIPTION "char-server (sql version)" DISPLAY_NAME "char-server_sql" GROUP Runtime )
-	install( TARGETS char-server_sql
+	cpack_add_component( Runtime_charserver_sql DESCRIPTION "char-server (sql version)" DISPLAY_NAME "char-server" GROUP Runtime )
+	install( TARGETS char-server
 		DESTINATION "."
 		COMPONENT Runtime_charserver_sql )
 endif( INSTALL_COMPONENT_RUNTIME )
-message( STATUS "Creating target char-server_sql - done" )
+message( STATUS "Creating target char-server - done" )
 endif( BUILD_SQL_SERVERS )
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index bfe9d1585..a320579b5 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -16,8 +16,8 @@ COMMON_SQL_OBJ = ../common/obj_sql/sql.o
 COMMON_H = ../common/sql.h
 
 CHAR_OBJ = obj_sql/char.o obj_sql/inter.o obj_sql/int_party.o obj_sql/int_guild.o \
-	obj_sql/int_storage.o obj_sql/int_pet.o obj_sql/int_homun.o obj_sql/int_mail.o obj_sql/int_auction.o obj_sql/int_quest.o obj_sql/int_mercenary.o obj_sql/int_elemental.o
-CHAR_H = char.h inter.h int_party.h int_guild.h int_storage.h int_pet.h int_homun.h int_mail.h int_auction.h int_quest.h int_mercenary.h int_elemental.h
+	obj_sql/int_storage.o obj_sql/int_pet.o obj_sql/int_homun.o obj_sql/int_mail.o obj_sql/int_auction.o obj_sql/int_quest.o obj_sql/int_mercenary.o obj_sql/int_elemental.o obj_sql/pincode.o
+CHAR_H = char.h inter.h int_party.h int_guild.h int_storage.h int_pet.h int_homun.h int_mail.h int_auction.h int_quest.h int_mercenary.h int_elemental.h pincode.h
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
@@ -29,21 +29,21 @@ endif
 @SET_MAKE@
 
 #####################################################################
-.PHONY : all char-server_sql clean help
+.PHONY : all char-server clean help
 
-all: char-server_sql
+all: char-server
 
-char-server_sql: $(CHAR_SERVER_SQL_DEPENDS)
+char-server: $(CHAR_SERVER_SQL_DEPENDS)
 	@echo "	LD	$@"
-	@@CC@ @LDFLAGS@ -o ../../char-server_sql@EXEEXT@ $(CHAR_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
+	@@CC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) ../common/obj_sql/common_sql.a ../common/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
 
 clean:
 	@echo "	CLEAN	char"
-	@rm -rf *.o obj_sql ../../char-server_sql@EXEEXT@
+	@rm -rf *.o obj_sql ../../char-server@EXEEXT@
 
 help:
-	@echo "possible targets are 'char-server_sql' 'all' 'clean' 'help'"
-	@echo "'char-server_sql'  - char server (SQL version)"
+	@echo "possible targets are 'char-server' 'all' 'clean' 'help'"
+	@echo "'char-server'  - char server (SQL version)"
 	@echo "'all'              - builds all above targets"
 	@echo "'clean'            - cleans builds and objects"
 	@echo "'help'             - outputs this message"
diff --git a/src/char/char.c b/src/char/char.c
index f21730d3b..00fc633df 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/cbasetypes.h"
 #include "../common/core.h"
@@ -20,6 +21,7 @@
 #include "int_storage.h"
 #include "char.h"
 #include "inter.h"
+#include "pincode.h"
 
 #include <sys/types.h>
 #include <time.h>
@@ -82,7 +84,7 @@ struct mmo_map_server {
 	unsigned short map[MAX_MAP_PER_SERVER];
 } server[MAX_MAP_SERVERS];
 
-int login_fd=-1, char_fd=-1;
+int char_fd=-1;
 char userid[24];
 char passwd[24];
 char server_name[20];
@@ -105,7 +107,6 @@ char unknown_char_name[NAME_LENGTH] = "Unknown"; // Name to use when the request
 #define TRIM_CHARS "\255\xA0\032\t\x0A\x0D " //The following characters are trimmed regardless because they cause confusion and problems on the servers. [Skotlex]
 char char_name_letters[1024] = ""; // list of letters/symbols allowed (or not) in a character name. by [Yor]
 
-int char_per_account = 0; //Maximum chars per account (default unlimited) [Sirius]
 int char_del_level = 0; //From which level u can delete character [Lupus]
 int char_del_delay = 86400;
 
@@ -120,25 +121,11 @@ struct s_subnet {
 } 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
-};
-
-int max_connect_user = 0;
+int max_connect_user = -1;
 int gm_allow_group = -1;
 int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
 int start_zeny = 0;
-int start_weapon = 1201;
-int start_armor = 2301;
+int start_items[MAX_START_ITEMS*2];
 int guild_exp_rate = 100;
 
 //Custom limits for the fame lists. [Skotlex]
@@ -159,7 +146,7 @@ unsigned int save_flag = 0;
 // Initial position (it's possible to set it in conf file)
 struct point start_point = { 0, 53, 111 };
 
-int console = 0;
+unsigned short skillid2idx[MAX_SKILL_ID];
 
 //-----------------------------------------------------
 // Auth database
@@ -184,15 +171,6 @@ 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
-};
-
-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);
 
@@ -206,9 +184,10 @@ static DBData create_online_char_data(DBKey key, va_list args)
 	character->account_id = key.i;
 	character->char_id = -1;
   	character->server = -1;
+	character->pincode_enable = -1;
 	character->fd = -1;
 	character->waiting_disconnect = INVALID_TIMER;
-	return db_ptr2data(character);
+	return DB->ptr2data(character);
 }
 
 void set_char_charselect(int account_id)
@@ -223,6 +202,8 @@ void set_char_charselect(int account_id)
 
 	character->char_id = -1;
 	character->server = -1;
+	if(character->pincode_enable == -1)
+		character->pincode_enable = *pincode->charselect + *pincode->enabled;
 
 	if(character->waiting_disconnect != INVALID_TIMER) {
 		delete_timer(character->waiting_disconnect, chardb_waiting_disconnect);
@@ -245,7 +226,7 @@ void set_char_online(int map_id, int char_id, int account_id)
 	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) )
+	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
@@ -290,7 +271,7 @@ void set_char_offline(int char_id, int account_id)
 
 	if ( char_id == -1 )
 	{
-		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `online`='0' WHERE `account_id`='%d'", char_db, account_id) )
+		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
@@ -300,7 +281,7 @@ void set_char_offline(int char_id, int account_id)
 		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) )
+		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);
 	}
 
@@ -319,6 +300,7 @@ void set_char_offline(int char_id, int account_id)
 		{
 			character->char_id = -1;
 			character->server = -1;
+			character->pincode_enable = -1;
 		}
 
 		//FIXME? Why Kevin free'd the online information when the char was effectively in the map-server?
@@ -339,7 +321,7 @@ 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);
+	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;
@@ -358,7 +340,7 @@ 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);
+	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)
@@ -394,11 +376,11 @@ void set_all_offline(int id)
 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) )
+	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) )
+	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) )
+	if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `connect_member` = '0'", guild_db) )
 		Sql_ShowDebug(sql_handle);
 }
 
@@ -410,7 +392,7 @@ 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);
+	return DB->ptr2data(cp);
 }
 
 int inventory_to_sql(const struct item items[], int max, int id);
@@ -429,7 +411,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 
 	cp = idb_ensure(char_db_, char_id, create_charstatus);
 
-	StringBuf_Init(&buf);
+	StrBuf->Init(&buf);
 	memset(save_status, 0, sizeof(save_status));
 
 	//map inventory data
@@ -455,7 +437,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		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) ||
@@ -472,17 +454,24 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		(p->pet_id != cp->pet_id) || (p->weapon != cp->weapon) || (p->hom_id != cp->hom_id) ||
 		(p->ele_id != cp->ele_id) || (p->shield != cp->shield) || (p->head_top != cp->head_top) ||
 		(p->head_mid != cp->head_mid) || (p->head_bottom != cp->head_bottom) || (p->delete_date != cp->delete_date) ||
-		(p->rename != cp->rename) || (p->robe != cp->robe)
-	)
-	{	//Save status
-		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `base_level`='%d', `job_level`='%d',"
+		(p->rename != cp->rename) || (p->slotchange != cp->slotchange) || (p->robe != cp->robe) ||
+		(p->show_equip != cp->show_equip) || (p->allow_party != cp->allow_party)
+	) {	//Save status
+		unsigned int opt = 0;
+		
+		if( p->allow_party )
+			opt |= OPT_ALLOW_PARTY;
+		if( p->show_equip )
+			opt |= OPT_SHOW_EQUIP;
+		
+		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'"
+			"`delete_date`='%lu',`robe`='%d',`slotchange`='%d', `char_opt`='%u'"
 			" WHERE  `account_id`='%d' AND `char_id` = '%d'",
 			char_db, p->base_level, p->job_level,
 			p->base_exp, p->job_exp, p->zeny,
@@ -493,7 +482,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 			mapindex_id2name(p->last_point.map), p->last_point.x, p->last_point.y,
 			mapindex_id2name(p->save_point.map), p->save_point.x, p->save_point.y, p->rename,
 			(unsigned long)p->delete_date,  // FIXME: platform-dependent size
-			p->robe,
+			p->robe,p->slotchange,opt,
 			p->account_id, p->char_id) )
 		{
 			Sql_ShowDebug(sql_handle);
@@ -512,7 +501,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		(p->fame != cp->fame)
 	)
 	{
-		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `class`='%d',"
+		if( SQL_ERROR == SQL->Query(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'"
@@ -547,29 +536,29 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		char esc_mapname[NAME_LENGTH*2+1];
 
 		//`memo` (`memo_id`,`char_id`,`map`,`x`,`y`)
-		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", memo_db, p->char_id) )
+		if( SQL_ERROR == SQL->Query(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);
+		StrBuf->Clear(&buf);
+		StrBuf->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);
+					StrBuf->AppendStr(&buf, ",");
+				SQL->EscapeString(sql_handle, esc_mapname, mapindex_id2name(p->memo_point[i].map));
+				StrBuf->Printf(&buf, "('%d', '%s', '%d', '%d')", char_id, esc_mapname, p->memo_point[i].x, p->memo_point[i].y);
 				++count;
 			}
 		}
 		if( count )
 		{
-			if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+			if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
 			{
 				Sql_ShowDebug(sql_handle);
 				errors++;
@@ -578,42 +567,35 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 		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)) )
-	{
+	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) )
-		{
+		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);
+		StrBuf->Clear(&buf);
+		StrBuf->Printf(&buf, "INSERT INTO `%s`(`char_id`,`id`,`lv`,`flag`) 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 )
+		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].lv == 0 && ( p->skill[i].flag == SKILL_FLAG_PERM_GRANTED || p->skill[i].flag == SKILL_FLAG_PERMANENT ) )
 					continue;
-				if( p->skill[i].flag != SKILL_FLAG_PERMANENT && (p->skill[i].flag - SKILL_FLAG_REPLACED_LV_0) == 0 )
+				if( p->skill[i].flag != SKILL_FLAG_PERMANENT && p->skill[i].flag != SKILL_FLAG_PERM_GRANTED && (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));
+					StrBuf->AppendStr(&buf, ",");
+				StrBuf->Printf(&buf, "('%d','%d','%d','%d')", char_id, p->skill[i].id,
+								 ( (p->skill[i].flag == SKILL_FLAG_PERMANENT || p->skill[i].flag == SKILL_FLAG_PERM_GRANTED) ? p->skill[i].lv : p->skill[i].flag - SKILL_FLAG_REPLACED_LV_0),
+								 p->skill[i].flag == SKILL_FLAG_PERM_GRANTED ? p->skill[i].flag : 0);/* other flags do not need to be saved */
 				++count;
 			}
 		}
 		if( count )
 		{
-			if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+			if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
 			{
 				Sql_ShowDebug(sql_handle);
 				errors++;
@@ -634,27 +616,27 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 
 	if(diff == 1)
 	{	//Save friends
-		if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id`='%d'", friend_db, char_id) )
+		if( SQL_ERROR == SQL->Query(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);
+		StrBuf->Clear(&buf);
+		StrBuf->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);
+					StrBuf->AppendStr(&buf, ",");
+				StrBuf->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)) )
+			if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
 			{
 				Sql_ShowDebug(sql_handle);
 				errors++;
@@ -665,20 +647,20 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 
 #ifdef HOTKEY_SAVING
 	// hotkeys
-	StringBuf_Clear(&buf);
-	StringBuf_Printf(&buf, "REPLACE INTO `%s` (`char_id`, `hotkey`, `type`, `itemskill_id`, `skill_lvl`) VALUES ", hotkey_db);
+	StrBuf->Clear(&buf);
+	StrBuf->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);
+				StrBuf->AppendStr(&buf, ",");// not the first hotkey
+			StrBuf->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)) )
+		if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
 		{
 			Sql_ShowDebug(sql_handle);
 			errors++;
@@ -686,7 +668,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus* p)
 			strcat(save_status, " hotkeys");
 	}
 #endif
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 	if (save_status[0]!='\0' && save_log)
 		ShowInfo("Saved char %d - %s:%s.\n", char_id, p->name, save_status);
 	if (!errors)
@@ -724,19 +706,19 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 	// 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`");
+	StrBuf->Init(&buf);
+	StrBuf->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);
+		StrBuf->Printf(&buf, ", `card%d`", j);
+	StrBuf->Printf(&buf, " FROM `%s` WHERE `%s`='%d'", tablename, selectoption, id);
 
 	stmt = SqlStmt_Malloc(sql_handle);
-	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StrBuf->Value(&buf))
 	||  SQL_ERROR == SqlStmt_Execute(stmt) )
 	{
 		SqlStmt_ShowDebug(stmt);
 		SqlStmt_Free(stmt);
-		StringBuf_Destroy(&buf);
+		StrBuf->Destroy(&buf);
 		return 1;
 	}
 
@@ -781,14 +763,14 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 				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'",
+					StrBuf->Clear(&buf);
+					StrBuf->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);
+						StrBuf->Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
+					StrBuf->Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
 
-					if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+					if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
 					{
 						Sql_ShowDebug(sql_handle);
 						errors++;
@@ -801,7 +783,7 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 		}
 		if( !found )
 		{// Item not present in inventory, remove it.
-			if( SQL_ERROR == Sql_Query(sql_handle, "DELETE from `%s` where `id`='%d' LIMIT 1", tablename, item.id) )
+			if( SQL_ERROR == SQL->Query(sql_handle, "DELETE from `%s` where `id`='%d' LIMIT 1", tablename, item.id) )
 			{
 				Sql_ShowDebug(sql_handle);
 				errors++;
@@ -810,11 +792,11 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 	}
 	SqlStmt_Free(stmt);
 
-	StringBuf_Clear(&buf);
-	StringBuf_Printf(&buf, "INSERT INTO `%s`(`%s`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `unique_id`", tablename, selectoption);
+	StrBuf->Clear(&buf);
+	StrBuf->Printf(&buf, "INSERT INTO `%s`(`%s`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `unique_id`", tablename, selectoption);
 	for( j = 0; j < MAX_SLOTS; ++j )
-		StringBuf_Printf(&buf, ", `card%d`", j);
-	StringBuf_AppendStr(&buf, ") VALUES ");
+		StrBuf->Printf(&buf, ", `card%d`", j);
+	StrBuf->AppendStr(&buf, ") VALUES ");
 
 	found = false;
 	// insert non-matched items into the db as new items
@@ -825,27 +807,27 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
 			continue;
 
 		if( found )
-			StringBuf_AppendStr(&buf, ",");
+			StrBuf->AppendStr(&buf, ",");
 		else
 			found = true;
 
-		StringBuf_Printf(&buf, "('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%"PRIu64"'",
+		StrBuf->Printf(&buf, "('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%"PRIu64"'",
 			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].unique_id);
 		for( j = 0; j < MAX_SLOTS; ++j )
-			StringBuf_Printf(&buf, ", '%d'", items[i].card[j]);
-		StringBuf_AppendStr(&buf, ")");
+			StrBuf->Printf(&buf, ", '%d'", items[i].card[j]);
+		StrBuf->AppendStr(&buf, ")");
 		
 		updateLastUid(items[i].unique_id); // Unique Non Stackable Item ID
 	}
 	dbUpdateUid(sql_handle); // Unique Non Stackable Item ID
 
-	if( found && SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
+	if( found && SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
 	{
 		Sql_ShowDebug(sql_handle);
 		errors++;
 	}
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 	aFree(flag);
 
 	return errors;
@@ -868,19 +850,19 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 	// 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`");
+	StrBuf->Init(&buf);
+	StrBuf->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);
+		StrBuf->Printf(&buf, ", `card%d`", j);
+	StrBuf->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))
+	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StrBuf->Value(&buf))
 	   ||  SQL_ERROR == SqlStmt_Execute(stmt) )
 	{
 		SqlStmt_ShowDebug(stmt);
 		SqlStmt_Free(stmt);
-		StringBuf_Destroy(&buf);
+		StrBuf->Destroy(&buf);
 		return 1;
 	}
 
@@ -924,14 +906,14 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 					;	//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'",
+					StrBuf->Clear(&buf);
+					StrBuf->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);
+						StrBuf->Printf(&buf, ", `card%d`=%d", j, items[i].card[j]);
+					StrBuf->Printf(&buf, " WHERE `id`='%d' LIMIT 1", item.id);
 
-					if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) ) {
+					if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) ) {
 						Sql_ShowDebug(sql_handle);
 						errors++;
 					}
@@ -942,7 +924,7 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 			}
 		}
 		if( !found ) {// Item not present in inventory, remove it.
-			if( SQL_ERROR == Sql_Query(sql_handle, "DELETE from `%s` where `id`='%d' LIMIT 1", inventory_db, item.id) ) {
+			if( SQL_ERROR == SQL->Query(sql_handle, "DELETE from `%s` where `id`='%d' LIMIT 1", inventory_db, item.id) ) {
 				Sql_ShowDebug(sql_handle);
 				errors++;
 			}
@@ -950,11 +932,11 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 	}
 	SqlStmt_Free(stmt);
 
-	StringBuf_Clear(&buf);
-	StringBuf_Printf(&buf, "INSERT INTO `%s` (`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`, `unique_id`", inventory_db);
+	StrBuf->Clear(&buf);
+	StrBuf->Printf(&buf, "INSERT INTO `%s` (`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`, `unique_id`", inventory_db);
 	for( j = 0; j < MAX_SLOTS; ++j )
-		StringBuf_Printf(&buf, ", `card%d`", j);
-	StringBuf_AppendStr(&buf, ") VALUES ");
+		StrBuf->Printf(&buf, ", `card%d`", j);
+	StrBuf->AppendStr(&buf, ") VALUES ");
 
 	found = false;
 	// insert non-matched items into the db as new items
@@ -964,26 +946,26 @@ int inventory_to_sql(const struct item items[], int max, int id) {
 			continue;
 
 		if( found )
-			StringBuf_AppendStr(&buf, ",");
+			StrBuf->AppendStr(&buf, ",");
 		else
 			found = true;
 
-		StringBuf_Printf(&buf, "('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%d', '%"PRIu64"'",
+		StrBuf->Printf(&buf, "('%d', '%d', '%d', '%d', '%d', '%d', '%d', '%u', '%d', '%"PRIu64"'",
 						 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, items[i].unique_id);
 		for( j = 0; j < MAX_SLOTS; ++j )
-			StringBuf_Printf(&buf, ", '%d'", items[i].card[j]);
-		StringBuf_AppendStr(&buf, ")");
+			StrBuf->Printf(&buf, ", '%d'", items[i].card[j]);
+		StrBuf->AppendStr(&buf, ")");
 
 		updateLastUid(items[i].unique_id);// Unique Non Stackable Item ID
 	}
 	dbUpdateUid(sql_handle);
 
-	if( found && SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) ) {
+	if( found && SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) ) {
 		Sql_ShowDebug(sql_handle);
 		errors++;
 	}
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 	aFree(flag);
 
 	return errors;
@@ -1002,20 +984,22 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	char last_map[MAP_NAME_LENGTH_EXT];
 
 	stmt = SqlStmt_Malloc(sql_handle);
-	if( stmt == NULL )
-	{
+	if( stmt == NULL ) {
 		SqlStmt_ShowDebug(stmt);
 		return 0;
 	}
 	memset(&p, 0, sizeof(p));
 
+	for(i = 0 ; i < MAX_CHARS; i++ )
+		sd->found_char[i] = -1;
+	
 	// 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`"
+		"`robe`,`slotchange`"
 		" FROM `%s` WHERE `account_id`='%d' AND `char_num` < '%d'", char_db, sd->account_id, MAX_CHARS)
 	||	SQL_ERROR == SqlStmt_Execute(stmt)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0,  SQLDT_INT,    &p.char_id, 0, NULL, NULL)
@@ -1051,24 +1035,23 @@ int mmo_chars_fromsql(struct char_session_data* sd, uint8* buf)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 30, SQLDT_SHORT,  &p.head_mid, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 31, SQLDT_SHORT,  &p.head_bottom, 0, NULL, NULL)
 	||  SQL_ERROR == SqlStmt_BindColumn(stmt, 32, SQLDT_STRING, &last_map, sizeof(last_map), NULL, NULL)
-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_SHORT,	&p.rename, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 33, SQLDT_USHORT,	&p.rename, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 34, SQLDT_UINT32, &p.delete_date, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 35, SQLDT_SHORT,  &p.robe, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 36, SQLDT_USHORT, &p.slotchange, 0, NULL, NULL)
 	)
 	{
 		SqlStmt_ShowDebug(stmt);
 		SqlStmt_Free(stmt);
 		return 0;
 	}
-	for( i = 0; i < MAX_CHARS && SQL_SUCCESS == SqlStmt_NextRow(stmt); i++ )
-	{
+	
+	for( i = 0; i < MAX_CHARS && SQL_SUCCESS == SqlStmt_NextRow(stmt); i++ ) {
 		p.last_point.map = mapindex_name2id(last_map);
-		sd->found_char[i] = p.char_id;
+		sd->found_char[p.slot] = p.char_id;
 		j += mmo_char_tobuf(WBUFP(buf, j), &p);
 	}
-	for( ; i < MAX_CHARS; i++ )
-		sd->found_char[i] = -1;
-
+	
 	memset(sd->new_name,0,sizeof(sd->new_name));
 
 	SqlStmt_Free(stmt);
@@ -1094,6 +1077,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	struct hotkey tmp_hotkey;
 	int hotkey_num;
 #endif
+	unsigned int opt;
 
 	memset(p, 0, sizeof(struct mmo_charstatus));
 
@@ -1112,7 +1096,8 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 		"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,"
 		"`status_point`,`skill_point`,`option`,`karma`,`manner`,`party_id`,`guild_id`,`pet_id`,`homun_id`,`elemental_id`,`hair`,"
 		"`hair_color`,`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`,`last_map`,`last_x`,`last_y`,"
-		"`save_map`,`save_x`,`save_y`,`partner_id`,`father`,`mother`,`child`,`fame`,`rename`,`delete_date`,`robe`"
+		"`save_map`,`save_x`,`save_y`,`partner_id`,`father`,`mother`,`child`,`fame`,`rename`,`delete_date`,`robe`,`slotchange`,"
+		"`char_opt`"
 		" 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)
@@ -1165,9 +1150,11 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 46, SQLDT_INT,    &p->mother, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 47, SQLDT_INT,    &p->child, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 48, SQLDT_INT,    &p->fame, 0, NULL, NULL)
-	||  SQL_ERROR == SqlStmt_BindColumn(stmt, 49, SQLDT_SHORT,	&p->rename, 0, NULL, NULL)
+	||  SQL_ERROR == SqlStmt_BindColumn(stmt, 49, SQLDT_USHORT,	&p->rename, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 50, SQLDT_UINT32, &p->delete_date, 0, NULL, NULL)
 	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 51, SQLDT_SHORT,  &p->robe, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 52, SQLDT_USHORT, &p->slotchange, 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 53, SQLDT_UINT,	&opt, 0, NULL, NULL)
 	)
 	{
 		SqlStmt_ShowDebug(stmt);
@@ -1183,6 +1170,18 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	p->last_point.map = mapindex_name2id(last_map);
 	p->save_point.map = mapindex_name2id(save_map);
 
+	if( p->last_point.map == 0 ) {
+		p->last_point.map = strdb_iget(mapindex_db, MAP_DEFAULT);
+		p->last_point.x = MAP_DEFAULT_X;
+		p->last_point.y = MAP_DEFAULT_Y;
+	}
+	
+	if( p->save_point.map == 0 ) {
+		p->save_point.map = strdb_iget(mapindex_db, MAP_DEFAULT);
+		p->save_point.x = MAP_DEFAULT_X;
+		p->save_point.y = MAP_DEFAULT_Y;
+	}
+	
 	strcat(t_msg, " status");
 
 	if (!load_everything) // For quick selection of data when displaying the char menu
@@ -1201,8 +1200,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	||	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 )
-	{
+	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));
 	}
@@ -1210,13 +1208,13 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 
 	//read inventory
 	//`inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`, `expire_time`, `favorite`, `unique_id`)
-	StringBuf_Init(&buf);
-	StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`, `unique_id`");
+	StrBuf->Init(&buf);
+	StrBuf->AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `favorite`, `unique_id`");
 	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);
+		StrBuf->Printf(&buf, ", `card%d`", i);
+	StrBuf->Printf(&buf, " FROM `%s` WHERE `char_id`=? LIMIT %d", inventory_db, MAX_INVENTORY);
 
-	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StrBuf->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)
@@ -1241,13 +1239,13 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 
 	//read cart
 	//`cart_inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`, expire_time`, `unique_id`)
-	StringBuf_Clear(&buf);
-	StringBuf_AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `unique_id`");
+	StrBuf->Clear(&buf);
+	StrBuf->AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `unique_id`");
 	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);
+		StrBuf->Printf(&buf, ", `card%d`", j);
+	StrBuf->Printf(&buf, " FROM `%s` WHERE `char_id`=? LIMIT %d", cart_db, MAX_CART);
 
-	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	if( SQL_ERROR == SqlStmt_PrepareStr(stmt, StrBuf->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)
@@ -1274,18 +1272,20 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 
 	//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)
+	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `id`, `lv`,`flag` 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) )
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_USHORT, &tmp_skill.id  , 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_UCHAR , &tmp_skill.lv  , 0, NULL, NULL)
+	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_UCHAR , &tmp_skill.flag, 0, NULL, NULL) )
 		SqlStmt_ShowDebug(stmt);
-	tmp_skill.flag = SKILL_FLAG_PERMANENT;
+	
+	if( tmp_skill.flag != SKILL_FLAG_PERM_GRANTED )
+		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));
+	for( i = 0; i < MAX_SKILL && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i ) {
+		if( skillid2idx[tmp_skill.id] )
+			memcpy(&p->skill[skillid2idx[tmp_skill.id]], &tmp_skill, sizeof(tmp_skill));
 		else
 			ShowWarning("mmo_char_fromsql: ignoring invalid skill (id=%u,lv=%u) of character %s (AID=%d,CID=%d)\n", tmp_skill.id, tmp_skill.lv, p->name, p->account_id, p->char_id);
 	}
@@ -1334,8 +1334,14 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 
 	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);
-
+	StrBuf->Destroy(&buf);
+
+	/* load options into proper vars */
+	if( opt & OPT_ALLOW_PARTY )
+		p->allow_party = true;
+	if( opt & OPT_SHOW_EQUIP )
+		p->show_equip = true;
+	
 	cp = idb_ensure(char_db_, char_id, create_charstatus);
 	memcpy(cp, p, sizeof(struct mmo_charstatus));
 	return 1;
@@ -1346,8 +1352,6 @@ int mmo_char_sql_init(void)
 {
 	char_db_= idb_alloc(DB_OPT_RELEASE_DATA);
 
-	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
@@ -1359,6 +1363,54 @@ int mmo_char_sql_init(void)
 
 	return 0;
 }
+/* [Ind/Hercules] - special thanks to Yommy for providing the packet structure/data */
+bool char_slotchange(struct char_session_data *sd, int fd, unsigned short from, unsigned short to) {
+	struct mmo_charstatus char_dat;
+	int from_id = 0;
+
+	if( from > MAX_CHARS || to > MAX_CHARS || ( sd->char_slots && to > sd->char_slots ) || sd->found_char[from] <= 0 )
+		return false;
+
+	if( !mmo_char_fromsql(sd->found_char[from], &char_dat, false) ) // Only the short data is needed.
+		return false;
+
+	if( char_dat.slotchange == 0 )
+		return false;
+
+	from_id = sd->found_char[from];
+	
+	if( sd->found_char[to] > 0 ) {/* moving char to occupied slot */
+		bool result = false;
+		/* update both at once */
+		if( SQL_SUCCESS != SQL->QueryStr(sql_handle, "START TRANSACTION")
+		   ||  SQL_SUCCESS != SQL->Query(sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d' LIMIT 1", char_db, from, sd->found_char[to])
+		   ||  SQL_SUCCESS != SQL->Query(sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d' LIMIT 1", char_db, to, sd->found_char[from]) )
+			Sql_ShowDebug(sql_handle);
+		else
+			result = true;
+		
+		if( SQL_ERROR == SQL->QueryStr(sql_handle, (result == true) ? "COMMIT" : "ROLLBACK") ) {
+			Sql_ShowDebug(sql_handle);
+			result = false;
+		}
+		if( !result )
+			return false;
+		
+	} else {/* slot is free. */
+		if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `char_num`='%d' WHERE `char_id`='%d' LIMIT 1", char_db, to, sd->found_char[from] ) ) {
+			Sql_ShowDebug(sql_handle);
+			return false;
+		}
+	}
+	
+	/* update count */
+	if( SQL_ERROR == SQL->Query(sql_handle, "UPDATE `%s` SET `slotchange`=`slotchange`-1 WHERE `char_id`='%d' LIMIT 1", char_db, from_id ) ) {
+		Sql_ShowDebug(sql_handle);
+		return false;
+	}
+	
+	return true;
+}
 
 //-----------------------------------
 // Function to change chararcter's names
@@ -1377,16 +1429,16 @@ int rename_char_sql(struct char_session_data *sd, int char_id)
 	if( char_dat.rename == 0 )
 		return 1;
 
-	Sql_EscapeStringLen(sql_handle, esc_name, sd->new_name, strnlen(sd->new_name, NAME_LENGTH));
+	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) )
+	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) )
+	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;
@@ -1402,7 +1454,7 @@ int rename_char_sql(struct char_session_data *sd, int char_id)
 	// 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`)"
+		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);
@@ -1429,7 +1481,7 @@ int check_char_name(char * name, char * esc_name)
 		return -2; // control chars in name
 
 	// check for reserved names
-	if( strcmpi(name, main_chat_nick) == 0 || strcmpi(name, wisp_server_name) == 0 )
+	if( strcmpi(name, wisp_server_name) == 0 )
 		return -1; // nick reserved for internal server messages
 
 	// Check Authorised letters/symbols in the name of the character
@@ -1446,17 +1498,17 @@ int check_char_name(char * name, char * esc_name)
 				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) ) {
+		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) ) {
+		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 )
+	if( SQL->NumRows(sql_handle) > 0 )
 		return -1; // name already exists
 
 	return 0;
@@ -1474,52 +1526,45 @@ int make_new_char_sql(struct char_session_data* sd, char* name_, int str, int ag
 
 	char name[NAME_LENGTH];
 	char esc_name[NAME_LENGTH*2+1];
-	int char_id, flag;
+	int char_id, flag, k;
 
 	safestrncpy(name, name_, NAME_LENGTH);
 	normalize_name(name,TRIM_CHARS);
-	Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+	SQL->EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
 
 	flag = check_char_name(name,esc_name);
 	if( flag < 0 )
 		return flag;
-
+	
 	//check other inputs
 #if PACKETVER >= 20120307
-	if(slot >= MAX_CHARS)
+	if(slot < 0 || slot >= sd->char_slots)
 #else
-	if((slot >= MAX_CHARS) // slots
+	if((slot < 0 || slot >= sd->char_slots) // 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
+#if PACKETVER >= 20100413
+		return -4; // invalid slot
+#else
 		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
-	}
+#endif
 
 	// 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
+	if( sd->found_char[slot] != -1 )
+		return -2; /* character account limit exceeded */
 
 	// 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`)"
+		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`,"
+	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,
@@ -1531,7 +1576,7 @@ int make_new_char_sql(struct char_session_data* sd, char* name_, int str, int ag
 	}
 #else
 	//Insert the new char entry to the database
-	if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` (`account_id`, `char_num`, `name`, `zeny`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `max_hp`, `hp`,"
+	if( SQL_ERROR == SQL->Query(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,
@@ -1543,15 +1588,12 @@ int make_new_char_sql(struct char_session_data* sd, char* name_, int str, int ag
 	}
 #endif
 	//Retrieve the newly auto-generated char id
-	char_id = (int)Sql_LastInsertId(sql_handle);
+	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);
+	
+	for (k = 0; k < ARRAYLENGTH(start_items) && start_items[k] != 0; k += 2) {
+		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_items[k], start_items[k + 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);
@@ -1565,9 +1607,9 @@ int divorce_char_sql(int partner_id1, int partner_id2)
 {
 	unsigned char buf[64];
 
-	if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `partner_id`='0' WHERE `char_id`='%d' OR `char_id`='%d' LIMIT 2", char_db, partner_id1, partner_id2) )
+	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) )
+	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;
@@ -1592,30 +1634,30 @@ int delete_char_sql(int char_id)
 	char *data;
 	size_t len;
 
-	if (SQL_ERROR == Sql_Query(sql_handle, "SELECT `name`,`account_id`,`party_id`,`guild_id`,`base_level`,`homun_id`,`partner_id`,`father`,`mother`,`elemental_id` FROM `%s` WHERE `char_id`='%d'", char_db, char_id))
+	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) )
+	if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
 	{
 		ShowError("delete_char_sql: Unable to fetch character data, deletion aborted.\n");
-		Sql_FreeResult(sql_handle);
+		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);
+	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);
+	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).
@@ -1635,9 +1677,9 @@ int delete_char_sql(int char_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) )
+		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) )
+		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;
@@ -1653,13 +1695,13 @@ int delete_char_sql(int 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) )
+	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) )
+	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) )
+	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 */
@@ -1674,69 +1716,69 @@ int delete_char_sql(int char_id)
 	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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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))
+	if (SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `dest_id`='%d'", mail_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) )
+	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')",
+		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) )
+	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) )
+	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) )
+	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 )
+	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.
@@ -1779,7 +1821,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 	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,28) = (p->option &~ 0x40);
 	WBUFL(buf,32) = p->karma;
 	WBUFL(buf,36) = p->manner;
 	WBUFW(buf,40) = min(p->status_point, INT16_MAX);
@@ -1828,7 +1870,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 #endif
 #if PACKETVER != 20111116 //2011-11-16 wants 136, ask gravity.
 	#if PACKETVER >= 20110928
-		WBUFL(buf,132) = 0;  // change slot feature (0 = disabled, otherwise enabled)
+	WBUFL(buf,132) = ( p->slotchange > 0 ) ? 1 : 0;  // change slot feature (0 = disabled, otherwise enabled)
 		offset += 4;
 	#endif
 	#if PACKETVER >= 20111025
@@ -1839,7 +1881,32 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 
 	return 106+offset;
 }
-
+/* Made Possible by Yommy~! <3 */
+void mmo_char_send099d(int fd, struct char_session_data *sd) {
+	WFIFOHEAD(fd,4 + (MAX_CHARS*MAX_CHAR_BUF));
+	WFIFOW(fd,0) = 0x99d;
+	WFIFOW(fd,2) = mmo_chars_fromsql(sd, WFIFOP(fd,4)) + 4;
+	WFIFOSET(fd,WFIFOW(fd,2));
+}
+int mmo_char_send006b(int fd, struct char_session_data* sd);
+//----------------------------------------
+// [Ind/Hercules] notify client about charselect window data
+//----------------------------------------
+void mmo_char_send082d(int fd, struct char_session_data* sd) {
+	
+	WFIFOHEAD(fd,29);
+	WFIFOW(fd,0) = 0x82d;
+	WFIFOW(fd,2) = 29;
+	WFIFOB(fd,4) = sd->char_slots;
+	WFIFOB(fd,5) = MAX_CHARS - sd->char_slots;
+	WFIFOB(fd,6) = MAX_CHARS - sd->char_slots;
+	WFIFOB(fd,7) = sd->char_slots;
+	WFIFOB(fd,8) = sd->char_slots;
+	memset(WFIFOP(fd,9), 0, 20); // unused bytes
+	WFIFOSET(fd,29);
+	mmo_char_send006b(fd,sd);
+	
+}
 //----------------------------------------
 // Function to send characters to a player
 //----------------------------------------
@@ -1848,18 +1915,17 @@ int mmo_char_send006b(int fd, struct char_session_data* sd)
 	int j, offset = 0;
 #if PACKETVER >= 20100413
 	offset += 3;
-#endif
-
+#endif	
 	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;
 #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,5) = sd->char_slots; // Available slots. (aka PremiumStartSlot)
+	WFIFOB(fd,6) = MAX_CHARS; // Premium slots. AKA any existent chars past sd->char_slots but within MAX_CHARS will show a 'Premium Service' in red
 #endif
 	memset(WFIFOP(fd,4 + offset), 0, 20); // unknown bytes
 	j+=mmo_chars_fromsql(sd, WFIFOP(fd,j));
@@ -1871,66 +1937,66 @@ int mmo_char_send006b(int fd, struct char_session_data* sd)
 
 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) )
+	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) )
+	else if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 	{
 		char* data;
 
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		if( pl2 == atoi(data) )
 		{
-			Sql_FreeResult(sql_handle);
+			SQL->FreeResult(sql_handle);
 			return 1;
 		}
 	}
-	Sql_FreeResult(sql_handle);
+	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) )
+	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) )
+	else if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 	{
 		char* data;
 
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		if( child_id == atoi(data) )
 		{
-			Sql_FreeResult(sql_handle);
+			SQL->FreeResult(sql_handle);
 			return 1;
 		}
 	}
-	Sql_FreeResult(sql_handle);
+	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) )
+	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) )
+	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);
+		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);
+			SQL->FreeResult(sql_handle);
 			return childid;
 		}
 	}
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 	return 0;
 }
 
@@ -2077,299 +2143,302 @@ int parse_fromlogin(int fd) {
 
 	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 /conf/map-server.conf and /conf/char-server.conf\n");
+					set_eof(fd);
+					return 0;
+				} else {
+					ShowStatus("Connected to login-server (connection #%d).\n", fd);
+					loginif_on_ready();
+				}
+				RFIFOSKIP(fd,3);
+			break;
 
-		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 /conf/map-server.conf and /conf/char-server.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 )
+			// acknowledgement of account authentication request
+			case 0x2713:
+				if (RFIFOREST(fd) < 25)
+					return 0;
 			{
-				int client_fd = request_id;
-				sd->version = version;
-				sd->clienttype = clienttype;
-				switch( result )
+				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 )
 				{
-				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;
+					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;
+			break;
 
-			// 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);
-#endif
+			case 0x2717: // account data
+				if (RFIFOREST(fd) < 72)
+					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);
+					sd->char_slots = RFIFOB(fd,51);
+					if( sd->char_slots > MAX_CHARS ) {
+						ShowError("Account '%d' `character_slots` column is higher than supported MAX_CHARS (%d), update MAX_CHARS in mmo.h! capping to MAX_CHARS...\n",sd->account_id,sd->char_slots);
+						sd->char_slots = MAX_CHARS;/* cap to maximum */
+					} else if ( sd->char_slots <= 0 )/* no value aka 0 in sql */
+						sd->char_slots = MAX_CHARS;/* cap to maximum */
+					safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,52), sizeof(sd->birthdate));
+					safestrncpy(sd->pincode, (const char*)RFIFOP(fd,63), sizeof(sd->pincode));
+					sd->pincode_change = RFIFOL(fd,68);
+					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 == 0 && sd->group_id != gm_allow_group) ||
+						( max_connect_user > 0 && count_users() >= max_connect_user && sd->group_id != gm_allow_group ) ) {
+						// refuse connection (over populated)
+						WFIFOHEAD(i,3);
+						WFIFOW(i,0) = 0x6c;
+						WFIFOW(i,2) = 0;
+						WFIFOSET(i,3);
+					} else {
+						// send characters to player
+	#if PACKETVER >= 20130000
+						mmo_char_send082d(i, sd);
+	#else
+						mmo_char_send006b(i, sd);
+	#endif
+	#if PACKETVER >= 20110309
+						pincode->handle(i, sd);
+	#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;
+				RFIFOSKIP(fd,72);
+			break;
 
-				struct auth_node* node = (struct auth_node*)idb_get(auth_db, acc);
-				if( node != NULL )
-					node->sex = sex;
+			// login-server alive packet
+			case 0x2718:
+				if (RFIFOREST(fd) < 2)
+					return 0;
+				RFIFOSKIP(fd,2);
+				session[fd]->flag.ping = 0;
+			break;
 
-				// 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 )
+			// 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 )
 					{
-						// 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);
+						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);
 
-					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);
+					// disconnect player if online on char-server
+					disconnect_player(acc);
 				}
-				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;
 
-			// 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;
+			// 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;
 
-		{	// 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));
+			// 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;
+				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);
+			// 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);
 					}
-					else // still moving to the map-server
-						set_char_offline(-1, aid);
 				}
+				idb_remove(auth_db, aid);// reject auth attempts from map-server
 			}
-			idb_remove(auth_db, aid);// reject auth attempts from map-server
-		}
-		break;
+			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);
-			}
+			// 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;
+				RFIFOSKIP(fd,2);
+			}
+			break;
 
-		default:
-			ShowError("Unknown packet 0x%04x received from login-server, disconnecting.\n", command);
-			set_eof(fd);
-			return 0;
-		}
+			default:
+				ShowError("Unknown packet 0x%04x received from login-server, disconnecting.\n", command);
+				set_eof(fd);
+				return 0;
+			}
 	}
 
 	RFIFOFLUSH(fd);
@@ -2437,51 +2506,51 @@ void char_read_fame_list(void)
 	memset(chemist_fame_list, 0, sizeof(chemist_fame_list));
 	memset(taekwon_fame_list, 0, sizeof(taekwon_fame_list));
 	// Build Blacksmith ranking list
-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `char_id`,`fame`,`name` FROM `%s` WHERE `fame`>0 AND (`class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d' OR `class`='%d') ORDER BY `fame` DESC LIMIT 0,%d", char_db, JOB_BLACKSMITH, JOB_WHITESMITH, JOB_BABY_BLACKSMITH, JOB_MECHANIC, JOB_MECHANIC_T, JOB_BABY_MECHANIC, fame_list_size_smith) )
+	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 )
+	for( i = 0; i < fame_list_size_smith && SQL_SUCCESS == SQL->NextRow(sql_handle); ++i )
 	{
 		// char_id
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		smith_fame_list[i].id = atoi(data);
 		// fame
-		Sql_GetData(sql_handle, 1, &data, &len);
+		SQL->GetData(sql_handle, 1, &data, &len);
 		smith_fame_list[i].fame = atoi(data);
 		// name
-		Sql_GetData(sql_handle, 2, &data, &len);
+		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) )
+	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 )
+	for( i = 0; i < fame_list_size_chemist && SQL_SUCCESS == SQL->NextRow(sql_handle); ++i )
 	{
 		// char_id
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		chemist_fame_list[i].id = atoi(data);
 		// fame
-		Sql_GetData(sql_handle, 1, &data, &len);
+		SQL->GetData(sql_handle, 1, &data, &len);
 		chemist_fame_list[i].fame = atoi(data);
 		// name
-		Sql_GetData(sql_handle, 2, &data, &len);
+		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) )
+	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 )
+	for( i = 0; i < fame_list_size_taekwon && SQL_SUCCESS == SQL->NextRow(sql_handle); ++i )
 	{
 		// char_id
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		taekwon_fame_list[i].id = atoi(data);
 		// fame
-		Sql_GetData(sql_handle, 1, &data, &len);
+		SQL->GetData(sql_handle, 1, &data, &len);
 		taekwon_fame_list[i].fame = atoi(data);
 		// name
-		Sql_GetData(sql_handle, 2, &data, &len);
+		SQL->GetData(sql_handle, 2, &data, &len);
 		memcpy(taekwon_fame_list[i].name, data, min(len, NAME_LENGTH));
 	}
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 }
 
 // Send map-servers the fame ranking lists
@@ -2538,11 +2607,11 @@ int char_loadName(int char_id, char* name)
 	char* data;
 	size_t len;
 
-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `name` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) )
+	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) )
+	else if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 	{
-		Sql_GetData(sql_handle, 0, &data, &len);
+		SQL->GetData(sql_handle, 0, &data, &len);
 		safestrncpy(name, data, NAME_LENGTH);
 		return 1;
 	}
@@ -2593,7 +2662,7 @@ void mapif_server_reset(int id)
 		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) )
+	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);
@@ -2615,732 +2684,754 @@ int parse_frommap(int fd)
 	int id;
 
 	ARR_FIND( 0, ARRAYLENGTH(server), id, server[id].fd == fd );
-	if( id == ARRAYLENGTH(server) )
-	{// not a map server
+	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 )
-	{
+	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))
-		{
+	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;
+			case 0x2b0a:
+				if( RFIFOREST(fd) < RFIFOW(fd, 2) )
+					return 0;
+				socket_datasync(fd, false);
+				RFIFOSKIP(fd,RFIFOW(fd,2));
+				break;
 
-			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++;
-			}
+			case 0x2b0b:
+				if( RFIFOREST(fd) < RFIFOW(fd, 2) )
+					return 0;
+				memset(&skillid2idx, 0, sizeof(skillid2idx));
+				j = RFIFOW(fd, 2) - 4;
+				if( j )
+					j /= 4;
+				for(i = 0; i < j; i++) {
+					if( RFIFOW(fd, 4 + (i*4)) > MAX_SKILL_ID ) {
+						ShowWarning("Error skillid2dx[%d] = %d failed, %d is higher than MAX_SKILL_ID (%d)\n",RFIFOW(fd, 4 + (i*4)), RFIFOW(fd, 6 + (i*4)),RFIFOW(fd, 4 + (i*4)),MAX_SKILL_ID);
+						continue;
+					}
+					skillid2idx[RFIFOW(fd, 4 + (i*4))] = RFIFOW(fd, 6 + (i*4));
+				}
+				RFIFOSKIP(fd, RFIFOW(fd, 2));
+				break;
+			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);
+				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);
+				// 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.
+				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));
+				{
+				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;
+				}
+				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) )
+			case 0x2afc: //Packet command is now used for sc_data request. [Skotlex]
+				if (RFIFOREST(fd) < 10)
+					return 0;
 			{
-				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 )
+	#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_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));
+					Sql_ShowDebug(sql_handle);
+					break;
 				}
-				if (count >= 50)
-					ShowWarning("Too many status changes for %d:%d, some of them were not loaded.\n", aid, cid);
-				if (count > 0)
+				if( SQL->NumRows(sql_handle) > 0 )
 				{
-					WFIFOW(fd,2) = 14 + count*sizeof(struct status_change_data);
-					WFIFOW(fd,12) = count;
-					WFIFOSET(fd,WFIFOW(fd,2));
+					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);
+						//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);
 			}
-			Sql_FreeResult(sql_handle);
-#endif
-			RFIFOSKIP(fd, 10);
-		}
-		break;
+			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);
+			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));
 			}
-			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 )
+			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))
 				{
-					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);
+					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);
 				}
-				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));
+				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;
 			}
-			//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))
+			break;
+
+			case 0x2b02: // req char selection
+				if( RFIFOREST(fd) < 18 )
+					return 0;
 			{
-				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);
-			}
+				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 (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);
+				if( runflag != CHARSERVER_ST_RUNNING )
+				{
+					WFIFOHEAD(fd,7);
+					WFIFOW(fd,0) = 0x2b03;
+					WFIFOL(fd,2) = account_id;
+					WFIFOB(fd,6) = 0;// not ok
+					WFIFOSET(fd,7);
+				}
+				else
+				{
+					struct auth_node* node;
+				
+					// create temporary auth entry
+					CREATE(node, struct auth_node, 1);
+					node->account_id = account_id;
+					node->char_id = 0;
+					node->login_id1 = login_id1;
+					node->login_id2 = login_id2;
+					//node->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);
+				}
 			}
-			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);
+			break;
 
-			if( runflag != CHARSERVER_ST_RUNNING )
+			case 0x2b05: // request "change map server"
+				if (RFIFOREST(fd) < 39)
+					return 0;
 			{
-				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;
+				int map_id, map_fd = -1;
+				struct mmo_charstatus* char_data;
+				struct mmo_charstatus char_dat;
 
-		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);
+				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( 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);
+				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));
+				}
 
-				// 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);
+				if( runflag == CHARSERVER_ST_RUNNING &&
+					session_isActive(map_fd) &&
+					char_data )
+				{	//Send the map server the auth of this player.
+					struct online_char_data* data;
+					struct auth_node* node;
+
+					//Update the "last map" as this is where the player must be spawned on the new map server.
+					char_data->last_point.map = RFIFOW(fd,18);
+					char_data->last_point.x = RFIFOW(fd,20);
+					char_data->last_point.y = RFIFOW(fd,22);
+					char_data->sex = RFIFOB(fd,30);
+
+					// create temporary auth entry
+					CREATE(node, struct auth_node, 1);
+					node->account_id = RFIFOL(fd,2);
+					node->char_id = RFIFOL(fd,14);
+					node->login_id1 = RFIFOL(fd,6);
+					node->login_id2 = RFIFOL(fd,10);
+					node->sex = RFIFOB(fd,30);
+					node->expiration_time = 0; // FIXME (this thing isn't really supported we could as well purge it instead of fixing)
+					node->ip = ntohl(RFIFOL(fd,31));
+					node->group_id = RFIFOL(fd,35);
+					node->changing_mapservers = 1;
+					idb_put(auth_db, RFIFOL(fd,2), node);
+
+					data = idb_ensure(online_char_db, RFIFOL(fd,2), create_online_char_data);
+					data->char_id = char_data->char_id;
+					data->server = map_id; //Update server where char is.
+
+					//Reply with an ack.
+					WFIFOHEAD(fd,30);
+					WFIFOW(fd,0) = 0x2b06;
+					memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
+					WFIFOSET(fd,30);
+				} else { //Reply with nak
+					WFIFOHEAD(fd,30);
+					WFIFOW(fd,0) = 0x2b06;
+					memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 28);
+					WFIFOL(fd,6) = 0; //Set login1 to 0.
+					WFIFOSET(fd,30);
+				}
+				RFIFOSKIP(fd,39);
 			}
-			RFIFOSKIP(fd,39);
-		}
-		break;
+			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;
+			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);
 				}
-				RFIFOSKIP(fd,10);
-			}
-		break;
+			break;
 
-		case 0x2b08: // char name request
-			if (RFIFOREST(fd) < 6)
-				return 0;
+			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);
+				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;
+				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 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
+			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;
 			{
-				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));
+				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];
 
-				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
+				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
-				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;
+				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);
+				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;
+			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 0x2b10: // Update and send fame ranking list
+				if (RFIFOREST(fd) < 11)
+					return 0;
 			{
-				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;
-			}
+				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
+				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);
+				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
-				{// 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;
+				{// 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);
 				}
-				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;
+				RFIFOSKIP(fd,11);
+			}
+			break;
 
-		case 0x2b16: // Receive rates [Wizputer]
-			if( RFIFOREST(fd) < 14 )
-				return 0;
-		{
-			char esc_server_name[sizeof(server_name)*2+1];
+			// Divorce chars
+			case 0x2b11:
+				if( RFIFOREST(fd) < 10 )
+					return 0;
 
-			Sql_EscapeString(sql_handle, esc_server_name, server_name);
+				divorce_char_sql(RFIFOL(fd,2), RFIFOL(fd,6));
+				RFIFOSKIP(fd,10);
+			break;
 
-			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 0x2b16: // Receive rates [Wizputer]
+				if( RFIFOREST(fd) < 14 )
+					return 0;
+			{
+				char esc_server_name[sizeof(server_name)*2+1];
 
-		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;
+				SQL->EscapeString(sql_handle, esc_server_name, server_name);
 
-		case 0x2b18: // Reset all chars to offline [Wizputer]
-			set_all_offline(id);
-			RFIFOSKIP(fd,2);
-		break;
+				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 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 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 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 0x2b18: // Reset all chars to offline [Wizputer]
+				set_all_offline(id);
+				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;
+			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;
 
-			aid = RFIFOL(fd, 4);
-			cid = RFIFOL(fd, 8);
-			count = RFIFOW(fd, 12);
+			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;
 
-			if( count > 0 )
+			case 0x2b1c: //Request to save status change data. [Skotlex]
+				if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+					return 0;
 			{
-				struct status_change_data data;
-				StringBuf buf;
-				int i;
+	#ifdef ENABLE_SC_SAVING
+				int count, aid, cid;
 
-				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 )
+				aid = RFIFOL(fd, 4);
+				cid = RFIFOL(fd, 8);
+				count = RFIFOW(fd, 12);
+
+				if( count > 0 )
 				{
-					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);
+					struct status_change_data data;
+					StringBuf buf;
+					int i;
+
+					StrBuf->Init(&buf);
+					StrBuf->Printf(&buf, "INSERT INTO `%s` (`account_id`, `char_id`, `type`, `tick`, `val1`, `val2`, `val3`, `val4`) VALUES ", scdata_db);
+					for( i = 0; i < count; ++i )
+					{
+						memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
+						if( i > 0 )
+							StrBuf->AppendStr(&buf, ", ");
+						StrBuf->Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
+							data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
+					}
+					if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) )
+						Sql_ShowDebug(sql_handle);
+					StrBuf->Destroy(&buf);
 				}
-				if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )
-					Sql_ShowDebug(sql_handle);
-				StringBuf_Destroy(&buf);
+	#endif
+				RFIFOSKIP(fd, RFIFOW(fd, 2));
 			}
-#endif
-			RFIFOSKIP(fd, RFIFOW(fd, 2));
-		}
-		break;
+			break;
 
-		case 0x2b23: // map-server alive packet
-			WFIFOHEAD(fd,2);
-			WFIFOW(fd,0) = 0x2b24;
-			WFIFOSET(fd,2);
-			RFIFOSKIP(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;
+			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);
+			{
+				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( 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 */
+				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;
 
-				session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
+			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;
 
-				WFIFOHEAD(sfd, RFIFOW(fd,2) );
+			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 */
 
-				memcpy((char*)WFIFOP(sfd,0), (char*)RFIFOP(fd, 0), RFIFOW(fd,2));
+					if( (sfd = make_connection(host2ip("stats.hercules.ws"),(uint16)25427,true) ) == -1 ) {
+						RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+						RFIFOFLUSH(fd);
+						break;/* connection not possible, we drop the report */
+					}
+			
+					session[sfd]->flag.server = 1;/* to ensure we won't drop our own packet */
+					realloc_fifo(sfd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+					
+					WFIFOHEAD(sfd, RFIFOW(fd,2) );
 
-				WFIFOSET(sfd, RFIFOW(fd,2) );
+					memcpy((char*)WFIFOP(sfd,0), (char*)RFIFOP(fd, 0), RFIFOW(fd,2));
 
-				flush_fifo(sfd);
+					WFIFOSET(sfd, RFIFOW(fd,2) );
 
-				do_close(sfd);
+					flush_fifo(sfd);
 
-				RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
-		}
-		break;
+					do_close(sfd);
+					
+					RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
+					RFIFOFLUSH(fd);
+			}
+			break;
 
 
-		default:
-		{
-			// inter server - packet
-			int r = inter_parse_frommap(fd);
-			if (r == 1) break;		// processed
-			if (r == 2) return 0;	// need more packet
+			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;
-		}
+				// 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
 
@@ -3470,14 +3561,14 @@ static void char_delete2_req(int fd, struct char_session_data* sd)
 		return;
 	}
 
-	if( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `delete_date` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) || SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	if( SQL_SUCCESS != SQL->Query(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);
+	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);
@@ -3504,7 +3595,7 @@ static void char_delete2_req(int fd, struct char_session_data* sd)
 	// success
 	delete_date = time(NULL)+char_del_delay;
 
-	if( SQL_SUCCESS != Sql_Query(sql_handle, "UPDATE `%s` SET `delete_date`='%lu' WHERE `char_id`='%d'", char_db, (unsigned long)delete_date, char_id) )
+	if( SQL_SUCCESS != SQL->Query(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);
@@ -3545,15 +3636,15 @@ static void char_delete2_accept(int fd, struct char_session_data* sd)
 		return;
 	}
 
-	if( SQL_SUCCESS != Sql_Query(sql_handle, "SELECT `base_level`,`delete_date` FROM `%s` WHERE `char_id`='%d'", char_db, char_id) || SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	if( SQL_SUCCESS != SQL->Query(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);
+	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
@@ -3581,8 +3672,7 @@ static void char_delete2_accept(int fd, struct char_session_data* sd)
 	}
 
 	// refresh character list cache
-	for(k = i; k < MAX_CHARS-1; k++)
-	{
+	for(k = i; k < MAX_CHARS-1; k++) {
 		sd->found_char[k] = sd->found_char[k+1];
 	}
 	sd->found_char[MAX_CHARS-1] = -1;
@@ -3607,7 +3697,7 @@ static void char_delete2_cancel(int fd, struct char_session_data* sd)
 	// 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) )
+	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);
@@ -3647,525 +3737,633 @@ int parse_char(int fd)
 		return 0;
 	}
 
-	while( RFIFOREST(fd) >= 2 )
-	{
+	while( RFIFOREST(fd) >= 2 ) {
 		//For use in packets that depend on an sd being present [Skotlex]
 		#define FIFOSD_CHECK(rest) { if(RFIFOREST(fd) < rest) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,rest); return 0; } }
 
 		cmd = RFIFOW(fd,0);
-		switch( cmd )
-		{
 
-		// request to connect
-		// 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
-		case 0x65:
-			if( RFIFOREST(fd) < 17 )
-				return 0;
-		{
-			struct auth_node* node;
+		switch( cmd ) {
 
-			int account_id = RFIFOL(fd,2);
-			uint32 login_id1 = RFIFOL(fd,6);
-			uint32 login_id2 = RFIFOL(fd,10);
-			int sex = RFIFOB(fd,16);
-			RFIFOSKIP(fd,17);
-
-			ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", account_id, login_id1, login_id2);
+			// request to connect
+			// 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
+			case 0x65:
+				if( RFIFOREST(fd) < 17 )
+					return 0;
+			{
+				struct auth_node* node;
 
-			if (sd) {
-				//Received again auth packet for already authentified account?? Discard it.
-				//TODO: Perhaps log this as a hack attempt?
-				//TODO: and perhaps send back a reply?
-				break;
-			}
+				int account_id = RFIFOL(fd,2);
+				uint32 login_id1 = RFIFOL(fd,6);
+				uint32 login_id2 = RFIFOL(fd,10);
+				int sex = RFIFOB(fd,16);
+				RFIFOSKIP(fd,17);
 
-			CREATE(session[fd]->session_data, struct char_session_data, 1);
-			sd = (struct char_session_data*)session[fd]->session_data;
-			sd->account_id = account_id;
-			sd->login_id1 = login_id1;
-			sd->login_id2 = login_id2;
-			sd->sex = sex;
-			sd->auth = false; // not authed yet
+				ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", account_id, login_id1, login_id2);
 
-			// send back account_id
-			WFIFOHEAD(fd,4);
-			WFIFOL(fd,0) = account_id;
-			WFIFOSET(fd,4);
+				if (sd) {
+					//Received again auth packet for already authentified account?? Discard it.
+					//TODO: Perhaps log this as a hack attempt?
+					//TODO: and perhaps send back a reply?
+					break;
+				}
 
-			if( runflag != CHARSERVER_ST_RUNNING )
-			{
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x6c;
-				WFIFOB(fd,2) = 0;// rejected from server
-				WFIFOSET(fd,3);
-				break;
-			}
+				CREATE(session[fd]->session_data, struct char_session_data, 1);
+				sd = (struct char_session_data*)session[fd]->session_data;
+				sd->account_id = account_id;
+				sd->login_id1 = login_id1;
+				sd->login_id2 = login_id2;
+				sd->sex = sex;
+				sd->auth = false; // not authed yet
+
+				// send back account_id
+				WFIFOHEAD(fd,4);
+				WFIFOL(fd,0) = account_id;
+				WFIFOSET(fd,4);
 
-			// search authentification
-			node = (struct auth_node*)idb_get(auth_db, account_id);
-			if( node != NULL &&
-			    node->account_id == account_id &&
-				node->login_id1  == login_id1 &&
-				node->login_id2  == login_id2 /*&&
-				node->ip         == ipl*/ )
-			{// authentication found (coming from map server)
-				idb_remove(auth_db, account_id);
-				char_auth_ok(fd, sd);
-			}
-			else
-			{// authentication not found (coming from login server)
-				if (login_fd > 0) { // don't send request if no login-server
-					WFIFOHEAD(login_fd,23);
-					WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
-					WFIFOL(login_fd,2) = sd->account_id;
-					WFIFOL(login_fd,6) = sd->login_id1;
-					WFIFOL(login_fd,10) = sd->login_id2;
-					WFIFOB(login_fd,14) = sd->sex;
-					WFIFOL(login_fd,15) = htonl(ipl);
-					WFIFOL(login_fd,19) = fd;
-					WFIFOSET(login_fd,23);
-				} else { // if no login-server, we must refuse connection
+				if( runflag != CHARSERVER_ST_RUNNING )
+				{
 					WFIFOHEAD(fd,3);
 					WFIFOW(fd,0) = 0x6c;
-					WFIFOB(fd,2) = 0;
+					WFIFOB(fd,2) = 0;// rejected from server
 					WFIFOSET(fd,3);
+					break;
 				}
-			}
-		}
-		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;
+				// 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_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];
+			// 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;
 
-				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) )
+				int slot = RFIFOB(fd,2);
+				RFIFOSKIP(fd,3);
+#if PACKETVER >= 20110309
+				if( *pincode->enabled ){ // hack check
+					struct online_char_data* character;	
+					character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
+					if( character && character->pincode_enable == -1){
+						WFIFOHEAD(fd,3);
+						WFIFOW(fd,0) = 0x6c;
+						WFIFOB(fd,2) = 0;
+						WFIFOSET(fd,3);
+						break;
+					}
+				}
+#endif
+				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);
-			}
-			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");
+					SQL->FreeResult(sql_handle);
 					WFIFOHEAD(fd,3);
-					WFIFOW(fd,0) = 0x81;
-					WFIFOB(fd,2) = 1; // 01 = Server closed
+					WFIFOW(fd,0) = 0x6c;
+					WFIFOB(fd,2) = 0; // rejected from server
 					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));
+
+				char_id = atoi(data);
+				SQL->FreeResult(sql_handle);
+				
+				/* set char as online prior to loading its data so 3rd party applications will realise the sql data is not reliable */
+				set_char_online(-2,char_id,sd->account_id);
+				if( !mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
+					set_char_offline(char_id, sd->account_id);
+					/* failed to load something. REJECT! */
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x6c;
+					WFIFOB(fd,2) = 0;
+					WFIFOSET(fd,3);
+					break;/* jump off this boat */
+				}
+
+				//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;
 				}
-				ShowWarning("Unable to find map-server for '%s', sending to major city '%s'.\n", mapindex_id2name(cd->last_point.map), mapindex_id2name(j));
-				cd->last_point.map = j;
-			}
 
-			//Send NEW auth packet [Kevin]
-			//FIXME: is this case even possible? [ultramage]
-			if ((map_fd = server[i].fd) < 1 || session[map_fd] == NULL)
-			{
-				ShowError("parse_char: Attempting to write to invalid session %d! Map Server #%d disconnected.\n", map_fd, i);
-				server[i].fd = -1;
-				memset(&server[i], 0, sizeof(struct mmo_map_server));
-				//Send server closed.
-				WFIFOHEAD(fd,3);
-				WFIFOW(fd,0) = 0x81;
-				WFIFOB(fd,2) = 1; // 01 = Server closed
-				WFIFOSET(fd,3);
-				break;
+				//Send player to map
+				WFIFOHEAD(fd,28);
+				WFIFOW(fd,0) = 0x71;
+				WFIFOL(fd,2) = cd->char_id;
+				mapindex_getmapname_ext(mapindex_id2name(cd->last_point.map), (char*)WFIFOP(fd,6));
+				subnet_map_ip = lan_subnetcheck(ipl); // Advanced subnet check [LuzZza]
+				WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : server[i].ip);
+				WFIFOW(fd,26) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
+				WFIFOSET(fd,28);
+
+				// create temporary auth entry
+				CREATE(node, struct auth_node, 1);
+				node->account_id = sd->account_id;
+				node->char_id = cd->char_id;
+				node->login_id1 = sd->login_id1;
+				node->login_id2 = sd->login_id2;
+				node->sex = sd->sex;
+				node->expiration_time = sd->expiration_time;
+				node->group_id = sd->group_id;
+				node->ip = ipl;
+				idb_put(auth_db, sd->account_id, node);
+
 			}
+			break;
 
-			//Send player to map
-			WFIFOHEAD(fd,28);
-			WFIFOW(fd,0) = 0x71;
-			WFIFOL(fd,2) = cd->char_id;
-			mapindex_getmapname_ext(mapindex_id2name(cd->last_point.map), (char*)WFIFOP(fd,6));
-			subnet_map_ip = lan_subnetcheck(ipl); // Advanced subnet check [LuzZza]
-			WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : server[i].ip);
-			WFIFOW(fd,26) = ntows(htons(server[i].port)); // [!] LE byte order here [!]
-			WFIFOSET(fd,28);
-
-			// create temporary auth entry
-			CREATE(node, struct auth_node, 1);
-			node->account_id = sd->account_id;
-			node->char_id = cd->char_id;
-			node->login_id1 = sd->login_id1;
-			node->login_id2 = sd->login_id2;
-			node->sex = sd->sex;
-			node->expiration_time = sd->expiration_time;
-			node->group_id = sd->group_id;
-			node->ip = ipl;
-			idb_put(auth_db, sd->account_id, node);
-
-			set_char_online(-2,node->char_id,sd->account_id);
+			// create new char
+	#if PACKETVER >= 20120307
+			// S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
+			case 0x970:
+				FIFOSD_CHECK(31);
+	#else
+			// S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
+			case 0x67:
+				FIFOSD_CHECK(37);
+	#endif
 
-		}
-		break;
+				if( !char_new ) //turn character creation on/off [Kevin]
+					i = -2;
+				else
+	#if PACKETVER >= 20120307
+					i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
+	#else
+					i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
+	#endif
 
-		// create new char
-#if PACKETVER >= 20120307
-		// S 0970 <name>.24B <slot>.B <hair color>.W <hair style>.W
-		case 0x970:
-			FIFOSD_CHECK(31);
-#else
-		// S 0067 <name>.24B <str>.B <agi>.B <vit>.B <int>.B <dex>.B <luk>.B <slot>.B <hair color>.W <hair style>.W
-		case 0x67:
-			FIFOSD_CHECK(37);
-#endif
+				//'Charname already exists' (-1), 'Char creation denied' (-2) and 'You are underaged' (-3)
+				if (i < 0) {
+					WFIFOHEAD(fd,3);
+					WFIFOW(fd,0) = 0x6e;
+					/* Others I found [Ind] */
+					/* 0x02 = Symbols in Character Names are forbidden */
+					/* 0x03 = You are not elegible to open the Character Slot. */
+					switch (i) {
+						case -1: WFIFOB(fd,2) = 0x00; break;
+						case -2: WFIFOB(fd,2) = 0xFF; break;
+						case -3: WFIFOB(fd,2) = 0x01; break;
+						case -4: WFIFOB(fd,2) = 0x03; break;
+					}
+					WFIFOSET(fd,3);
+				} else {
+					int len;
+					// retrieve data
+					struct mmo_charstatus char_dat;
+					mmo_char_fromsql(i, &char_dat, false); //Only the short data is needed.
+
+					// send to player
+					WFIFOHEAD(fd,2+MAX_CHAR_BUF);
+					WFIFOW(fd,0) = 0x6d;
+					len = 2 + mmo_char_tobuf(WFIFOP(fd,2), &char_dat);
+					WFIFOSET(fd,len);
+
+					// add new entry to the chars list
+					ARR_FIND( 0, MAX_CHARS, ch, sd->found_char[ch] == -1 );
+					if( ch < MAX_CHARS )
+						sd->found_char[ch] = i; // the char_id of the new char
+				}
+	#if PACKETVER >= 20120307
+				RFIFOSKIP(fd,31);
+	#else
+				RFIFOSKIP(fd,37);
+	#endif
+			break;
 
-			if( !char_new ) //turn character creation on/off [Kevin]
-				i = -2;
-			else
-#if PACKETVER >= 20120307
-				i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOW(fd,27),RFIFOW(fd,29));
-#else
-				i = make_new_char_sql(sd, (char*)RFIFOP(fd,2),RFIFOB(fd,26),RFIFOB(fd,27),RFIFOB(fd,28),RFIFOB(fd,29),RFIFOB(fd,30),RFIFOB(fd,31),RFIFOB(fd,32),RFIFOW(fd,33),RFIFOW(fd,35));
+			// 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);
+#if PACKETVER >= 20110309
+				if( *pincode->enabled ){ // hack check
+					struct online_char_data* character;	
+					character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
+					if( character && character->pincode_enable == -1 ){
+						WFIFOHEAD(fd,3);
+						WFIFOW(fd,0) = 0x6c;
+						WFIFOB(fd,2) = 0;
+						WFIFOSET(fd,3);
+						break;
+					}
+				}
 #endif
+				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;
+				}
 
-			//'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;
+				// 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;
 				}
-				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
+
+				// 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);
 			}
-#if PACKETVER >= 20120307
-			RFIFOSKIP(fd,31);
-#else
-			RFIFOSKIP(fd,37);
-#endif
-		break;
-
-		// delete char
-		case 0x68:
-		// 2004-04-19aSakexe+ langtype 12 char deletion packet
-		case 0x1fb:
-			if (cmd == 0x68) FIFOSD_CHECK(46);
-			if (cmd == 0x1fb) FIFOSD_CHECK(56);
-		{
-			int cid = RFIFOL(fd,2);
-
-			ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
-			memcpy(email, RFIFOP(fd,6), 40);
-			RFIFOSKIP(fd,( cmd == 0x68) ? 46 : 56);
-
-			// 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;
+
+			// client keep-alive packet (every 12 seconds)
+			// R 0187 <account ID>.l
+			case 0x187:
+				if (RFIFOREST(fd) < 6)
+					return 0;
+				RFIFOSKIP(fd,6);
+			break;
+			// char rename request
+			// R 08fc <char ID>.l <new name>.24B
+			case 0x8fc:
+				FIFOSD_CHECK(30);
+				{
+					int i, cid =RFIFOL(fd,2);
+					char name[NAME_LENGTH];
+					char esc_name[NAME_LENGTH*2+1];
+					safestrncpy(name, (char *)RFIFOP(fd,6), NAME_LENGTH);
+					RFIFOSKIP(fd,30);
+					
+					ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
+					if( i == MAX_CHARS )
+						break;
+					
+					normalize_name(name,TRIM_CHARS);
+					SQL->EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
+					if( !check_char_name(name,esc_name) ) {
+						i = 1;
+						safestrncpy(sd->new_name, name, NAME_LENGTH);
+					} else
+						i = 0;
+					
+					WFIFOHEAD(fd, 4);
+					WFIFOW(fd,0) = 0x28e;
+					WFIFOW(fd,2) = i;
+					WFIFOSET(fd,4);
+				}
 				break;
-			}
 
-			// 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);
+			// 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;
-			}
 
-			// 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);
+			// 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;
-			}
-			/* 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;
+			// 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;
 
-		// 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);
+			// deletion timer request
+			case 0x827:
+				FIFOSD_CHECK(6);
+				char_delete2_req(fd, sd);
+				RFIFOSKIP(fd,6);
+			break;
 
-				if( aid != sd->account_id )
-					break;
-				ARR_FIND( 0, MAX_CHARS, i, sd->found_char[i] == cid );
-				if( i == MAX_CHARS )
-					break;
+			// deletion accept request
+			case 0x829:
+				FIFOSD_CHECK(12);
+				char_delete2_accept(fd, sd);
+				RFIFOSKIP(fd,12);
+			break;
 
-				normalize_name(name,TRIM_CHARS);
-				Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
-				if( !check_char_name(name,esc_name) )
+			// 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 )
 				{
-					i = 1;
-					safestrncpy(sd->new_name, name, NAME_LENGTH);
+					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);
 				}
-				else
-					i = 0;
+				socket_datasync(fd, true);
 
-				WFIFOHEAD(fd, 4);
-				WFIFOW(fd,0) = 0x28e;
-				WFIFOW(fd,2) = i;
-				WFIFOSET(fd,4);
+				RFIFOSKIP(fd,60);
 			}
+			return 0; // avoid processing of followup packets here
+				
+			// checks the entered pin
+			case 0x8b8:
+				if( RFIFOREST(fd) < 10 )
+					return 0;
+				
+				if( RFIFOL(fd,2) == sd->account_id )
+					pincode->check( fd, sd );
+					
+				RFIFOSKIP(fd,10);
 			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);
+				
+			// request for PIN window
+			case 0x8c5:
+				if( RFIFOREST(fd) < 6 )
+					return 0;
+				if( RFIFOL(fd,2) == sd->account_id )
+					pincode->sendstate( fd, sd, PINCODE_NOTSET );
+							
 				RFIFOSKIP(fd,6);
-
-				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);
+				
+			// pincode change request
+			case 0x8be:
+				if( RFIFOREST(fd) < 14 )
+					return 0;
+				if( RFIFOL(fd,2) == sd->account_id )
+					pincode->change( fd, sd );
+				
+				RFIFOSKIP(fd,14);
 			break;
-
-		// 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)
+				
+			// activate PIN system and set first PIN
+			case 0x8ba:
+				if( RFIFOREST(fd) < 10 )
+					return 0;
+				if( RFIFOL(fd,2) == sd->account_id )
+					pincode->setnew( fd, sd );
+				RFIFOSKIP(fd,10);
+			break;
+			
+			/* 0x8d4 <from>.W <to>.W <unused>.W (2+2+2+2) */
+			case 0x8d4:
+				if( RFIFOREST(fd) < 8 )
+					return 0;
+				else {
+					bool ret;
+					ret = char_slotchange(sd, fd, RFIFOW(fd, 2), RFIFOW(fd, 4));
+					WFIFOHEAD(fd, 8);
+					WFIFOW(fd, 0) = 0x8d5;
+					WFIFOW(fd, 2) = 8;
+					WFIFOW(fd, 4) = ret?0:1;
+					WFIFOW(fd, 6) = 0;/* we enforce it elsewhere, go 0 */
+					WFIFOSET(fd, 8);
+					/* for some stupid reason it requires the char data again (gravity -_-) */
+					if( ret )
+#if PACKETVER >= 20130000
+						mmo_char_send099d(fd, sd);
+#else
+						mmo_char_send006b(fd, sd);
+#endif
+						
+					RFIFOSKIP(fd, 8);
+				}
+			break;
+				
+			// unknown packet received
+			default:
+				ShowError("parse_char: Received unknown packet "CL_WHITE"0x%x"CL_RESET" from ip '"CL_WHITE"%s"CL_RESET"'! Disconnecting!\n", RFIFOW(fd,0), ip2str(ipl, NULL));
+				set_eof(fd);
 				return 0;
-		{
-			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)
-{
-	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;
@@ -4252,7 +4450,7 @@ 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);
+	struct online_char_data* character = DB->data2ptr(data);
 	int* i = va_arg(ap, int*);
 
 	if(character->server > -1)
@@ -4334,7 +4532,7 @@ 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);
+	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
@@ -4488,7 +4686,17 @@ void sql_config_read(const char* cfgName)
 	fclose(fp);
 	ShowInfo("Done reading %s.\n", cfgName);
 }
-
+void char_config_dispatch(char *w1, char *w2) {
+	bool (*dispatch_to[]) (char *w1, char *w2) = {
+		/* as many as it needs */
+		pincode->config_read
+	};
+	int i, len = ARRAYLENGTH(dispatch_to);
+	for(i = 0; i < len; i++) {
+		if( (*dispatch_to[i])(w1,w2) )
+			break;/* we found who this belongs to, can stop */
+	}
+}
 int char_config_read(const char* cfgName)
 {
 	char line[1024], w1[1024], w2[1024];
@@ -4527,25 +4735,25 @@ int char_config_read(const char* cfgName)
 				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) {
+				char ip_str[16];
 				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){
+			if (char_ip) {
+				char ip_str[16];
 				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) {
+				char ip_str[16];
 				safestrncpy(bind_ip_str, w2, sizeof(bind_ip_str));
 				ShowStatus("Character server binding IP address : %s -> %s\n", w2, ip2str(bind_ip, ip_str));
 			}
@@ -4559,8 +4767,8 @@ int char_config_read(const char* cfgName)
 			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
+			if (max_connect_user < -1)
+				max_connect_user = -1; // unlimited online players
 		} else if(strcmpi(w1, "gm_allow_group") == 0) {
 			gm_allow_group = atoi(w2);
 		} else if (strcmpi(w1, "autosave_time") == 0) {
@@ -4579,18 +4787,29 @@ int char_config_read(const char* cfgName)
 				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_items") == 0) {
+			int i;
+			char *split, *split2;
+
+			i = 0;
+			split = strtok(w2, ",");
+			while (split != NULL && i < MAX_START_ITEMS*2) {
+				split2 = split;
+				split = strtok(NULL, ",");
+				start_items[i] = atoi(split2);
+				if (start_items[i] < 0)
+					start_items[i] = 0;
+				++i;
+			}
+
+			if (i%2) { //we know it must be a even number
+				ShowError("Specified 'start_items' is missing a parameter. Removing '%d'.\n", start_items[i - 1]);
+				start_items[i - 1] = 0;
+			}
 		} 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) {
@@ -4602,21 +4821,12 @@ int char_config_read(const char* cfgName)
 			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) {
@@ -4639,7 +4849,8 @@ int char_config_read(const char* cfgName)
 			guild_exp_rate = atoi(w2);
 		} else if (strcmpi(w1, "import") == 0) {
 			char_config_read(w2);
-		}
+		} else
+			char_config_dispatch(w1,w2);
 	}
 	fclose(fp);
 
@@ -4661,7 +4872,7 @@ void do_final(void)
 	do_final_mapif();
 	do_final_loginif();
 
-	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s`", ragsrvinfo_db) )
+	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s`", ragsrvinfo_db) )
 		Sql_ShowDebug(sql_handle);
 
 	char_db_->destroy(char_db_, NULL);
@@ -4674,7 +4885,7 @@ void do_final(void)
 		char_fd = -1;
 	}
 
-	Sql_Free(sql_handle);
+	SQL->Free(sql_handle);
 	mapindex_final();
 
 	ShowStatus("Finished.\n");
@@ -4688,9 +4899,8 @@ void do_abort(void)
 {
 }
 
-void set_server_type(void)
-{
-	SERVER_TYPE = ATHENA_SERVER_CHAR;
+void set_server_type(void) {
+	SERVER_TYPE = SERVER_TYPE_CHAR;
 }
 
 
@@ -4712,12 +4922,14 @@ void do_shutdown(void)
 }
 
 
-int do_init(int argc, char **argv)
-{
+int do_init(int argc, char **argv) {
+	memset(&skillid2idx, 0, sizeof(skillid2idx));
 	//Read map indexes
 	mapindex_init();
 	start_point.map = mapindex_name2id("new_zone01");
 
+	pincode_defaults();
+	
 	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);
@@ -4725,9 +4937,9 @@ int do_init(int argc, char **argv)
 	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");
+		ShowNotice("And then change the user/password to use in conf/char-server.conf (or conf/import/char_conf.txt)\n");
 	}
-
+	
 	inter_init_sql((argc > 2) ? argv[2] : inter_cfgName); // inter server configuration
 
 	auth_db = idb_alloc(DB_OPT_RELEASE_DATA);
@@ -4735,8 +4947,7 @@ int do_init(int argc, char **argv)
 	mmo_char_sql_init();
 	char_read_fame_list(); //Read fame lists.
 
-	if ((naddr_ != 0) && (!login_ip || !char_ip))
-	{
+	if ((naddr_ != 0) && (!login_ip || !char_ip)) {
 		char ip_str[16];
 		ip2str(addr_[0], ip_str);
 
@@ -4768,28 +4979,30 @@ int do_init(int argc, char **argv)
 	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) )
+	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) )
+	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) )
+	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);
+	
+	if( (char_fd = make_listen_bind(bind_ip,char_port)) == -1 ) {
+		ShowFatalError("Failed to bind to port '"CL_WHITE"%d"CL_RESET"'\n",char_port);
+		exit(EXIT_FAILURE);
+	}
+	
+	Sql_HerculesUpdateCheck(sql_handle);
+	
 	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;
diff --git a/src/char/char.h b/src/char/char.h
index e16350cb3..b48ea359c 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -6,9 +6,9 @@
 
 #include "../config/core.h"
 #include "../common/core.h" // CORE_ST_LAST
+#include "../common/db.h"
 
-enum E_CHARSERVER_ST
-{
+enum E_CHARSERVER_ST {
 	CHARSERVER_ST_RUNNING = CORE_ST_LAST,
 	CHARSERVER_ST_SHUTDOWN,
 	CHARSERVER_ST_LAST
@@ -16,6 +16,35 @@ enum E_CHARSERVER_ST
 
 struct mmo_charstatus;
 
+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
+	uint8 char_slots;
+	uint32 version;
+	uint8 clienttype;
+	char pincode[4+1];
+	uint32 pincode_seed;
+	uint16 pincode_try;
+	uint32 pincode_change;
+	char new_name[NAME_LENGTH];
+	char birthdate[10+1];  // YYYY-MM-DD
+};
+
+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 pincode_enable;
+};
+
+DBMap* online_char_db; // int account_id -> struct online_char_data*
+
 #define MAX_MAP_SERVERS 30
 
 #define DEFAULT_AUTOSAVE_INTERVAL 300*1000
@@ -39,7 +68,7 @@ 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 login_fd;
 extern int char_name_option;
 extern char char_name_letters[];
 extern bool char_gm_read;
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index 34aed5bf7..977638aad 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/malloc.h"
@@ -48,15 +49,15 @@ void auction_save(struct auction_data *auction)
 	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'",
+	StrBuf->Init(&buf);
+	StrBuf->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);
+		StrBuf->Printf(&buf, ", `card%d` = '%d'", j, auction->item.card[j]);
+	StrBuf->Printf(&buf, " WHERE `auction_id` = '%d'", auction->auction_id);
 
 	stmt = SqlStmt_Malloc(sql_handle);
-	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StrBuf->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))
@@ -66,7 +67,7 @@ void auction_save(struct auction_data *auction)
 	}
 
 	SqlStmt_Free(stmt);
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 }
 
 unsigned int auction_create(struct auction_data *auction)
@@ -80,22 +81,22 @@ unsigned int auction_create(struct auction_data *auction)
 
 	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`,`unique_id`", auction_db);
+	StrBuf->Init(&buf);
+	StrBuf->Printf(&buf, "INSERT INTO `%s` (`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,`price`,`buynow`,`hours`,`timestamp`,`nameid`,`item_name`,`type`,`refine`,`attribute`,`unique_id`", 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','%"PRIu64"'",
+		StrBuf->Printf(&buf, ",`card%d`", j);
+	StrBuf->Printf(&buf, ") VALUES ('%d',?,'%d',?,'%d','%d','%d','%lu','%d',?,'%d','%d','%d','%"PRIu64"'",
 		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, auction->item.unique_id);
 	for( j = 0; j < MAX_SLOTS; j++ )
-		StringBuf_Printf(&buf, ",'%d'", auction->item.card[j]);
-	StringBuf_AppendStr(&buf, ")");
+		StrBuf->Printf(&buf, ",'%d'", auction->item.card[j]);
+	StrBuf->AppendStr(&buf, ")");
 	
 	//Unique Non Stackable Item ID
 	updateLastUid(auction->item.unique_id);
 	dbUpdateUid(sql_handle);
 
 	stmt = SqlStmt_Malloc(sql_handle);
-	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StrBuf->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))
@@ -123,7 +124,7 @@ unsigned int auction_create(struct auction_data *auction)
 	}
 
 	SqlStmt_Free(stmt);
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 
 	return auction->auction_id;
 }
@@ -165,7 +166,7 @@ void auction_delete(struct auction_data *auction)
 {
 	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) )
+	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 )
@@ -184,39 +185,39 @@ void inter_auctions_fromsql(void)
 	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`,"
+	StrBuf->Init(&buf);
+	StrBuf->AppendStr(&buf, "SELECT `auction_id`,`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,"
 		"`price`,`buynow`,`hours`,`timestamp`,`nameid`,`item_name`,`type`,`refine`,`attribute`,`unique_id`");
 	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);
+		StrBuf->Printf(&buf, ",`card%d`", i);
+	StrBuf->Printf(&buf, " FROM `%s` ORDER BY `auction_id` DESC", auction_db);
 
-	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+	if( SQL_ERROR == SQL->Query(sql_handle, StrBuf->Value(&buf)) )
 		Sql_ShowDebug(sql_handle);
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 
-	while( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	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);
+		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, 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);
-		Sql_GetData(sql_handle,14, &data, NULL); item->unique_id = strtoull(data, NULL, 10);
+		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->unique_id = strtoull(data, NULL, 10);
 
 		item->identify = 1;
 		item->amount = 1;
@@ -224,7 +225,7 @@ void inter_auctions_fromsql(void)
 
 		for( i = 0; i < MAX_SLOTS; i++ )
 		{
-			Sql_GetData(sql_handle, 14 + i, &data, NULL);
+			SQL->GetData(sql_handle, 15 + i, &data, NULL);
 			item->card[i] = atoi(data);
 		}
 
@@ -237,7 +238,7 @@ void inter_auctions_fromsql(void)
 		idb_put(auction_db_, auction->auction_id, auction);
 	}
 
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 }
 
 static void mapif_Auction_sendlist(int fd, int char_id, short count, short pages, unsigned char *buf)
diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c
index 3c2f6672d..53a63a212 100644
--- a/src/char/int_elemental.c
+++ b/src/char/int_elemental.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/malloc.h"
@@ -19,7 +20,7 @@ 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,
+		if( SQL_ERROR == SQL->Query(sql_handle,
 								   "INSERT INTO `elemental` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`atk1`,`atk2`,`matk`,`aspd`,`def`,`mdef`,`flee`,`hit`,`life_time`)"
 								   "VALUES ('%d','%d','%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->atk, ele->atk2, ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time) )
@@ -28,8 +29,8 @@ bool mapif_elemental_save(struct s_elemental* ele) {
 			flag = false;
 		}
 		else
-			ele->elemental_id = (int)Sql_LastInsertId(sql_handle);
-	} else if( SQL_ERROR == Sql_Query(sql_handle,
+			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', `atk1` = '%d', `atk2` = '%d', `matk` = '%d', `aspd` = '%d', `def` = '%d',"
 									"`mdef` = '%d', `flee` = '%d', `hit` = '%d', `life_time` = '%u' WHERE `ele_id` = '%d'",
@@ -49,34 +50,34 @@ bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) {
 	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`, `atk1`, `atk2`, `matk`, `aspd`,"
+	if( SQL_ERROR == SQL->Query(sql_handle, "SELECT `class`, `mode`, `hp`, `sp`, `max_hp`, `max_sp`, `atk1`, `atk2`, `matk`, `aspd`,"
 							   "`def`, `mdef`, `flee`, `hit`, `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);
+	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->atk = atoi(data);
-	Sql_GetData(sql_handle,  7, &data, NULL); ele->atk2 = atoi(data);
-	Sql_GetData(sql_handle,  8, &data, NULL); ele->matk = atoi(data);
-	Sql_GetData(sql_handle,  9, &data, NULL); ele->amotion = atoi(data);
-	Sql_GetData(sql_handle, 10, &data, NULL); ele->def = atoi(data);
-	Sql_GetData(sql_handle, 11, &data, NULL); ele->mdef = atoi(data);
-	Sql_GetData(sql_handle, 12, &data, NULL); ele->flee = atoi(data);
-	Sql_GetData(sql_handle, 13, &data, NULL); ele->hit = atoi(data);
-	Sql_GetData(sql_handle, 14, &data, NULL); ele->life_time = atoi(data);
-	Sql_FreeResult(sql_handle);
+	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->atk = atoi(data);
+	SQL->GetData(sql_handle,  7, &data, NULL); ele->atk2 = atoi(data);
+	SQL->GetData(sql_handle,  8, &data, NULL); ele->matk = atoi(data);
+	SQL->GetData(sql_handle,  9, &data, NULL); ele->amotion = atoi(data);
+	SQL->GetData(sql_handle, 10, &data, NULL); ele->def = atoi(data);
+	SQL->GetData(sql_handle, 11, &data, NULL); ele->mdef = atoi(data);
+	SQL->GetData(sql_handle, 12, &data, NULL); ele->flee = atoi(data);
+	SQL->GetData(sql_handle, 13, &data, NULL); ele->hit = atoi(data);
+	SQL->GetData(sql_handle, 14, &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);
 	
@@ -84,7 +85,7 @@ bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) {
 }
 
 bool mapif_elemental_delete(int ele_id) {
-	if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `elemental` WHERE `ele_id` = '%d'", ele_id) ) {
+	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `elemental` WHERE `ele_id` = '%d'", ele_id) ) {
 		Sql_ShowDebug(sql_handle);
 		return false;
 	}
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 9090bc007..e1e012725 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
@@ -56,7 +57,7 @@ static int guild_save_timer(int tid, unsigned int tick, int id, intptr_t data)
 	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)) )
+	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.
@@ -91,9 +92,9 @@ static int guild_save_timer(int tid, unsigned int tick, int id, intptr_t data)
 
 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) )
+	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) )
+	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;
 }
@@ -128,8 +129,8 @@ int inter_guild_tosql(struct guild *g,int 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));
+	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
@@ -138,7 +139,7 @@ int inter_guild_tosql(struct guild *g,int flag)
 		strcat(t_info, " guild_create");
 
 		// Create a new guild
-		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
+		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) )
@@ -149,7 +150,7 @@ int inter_guild_tosql(struct guild *g,int flag)
 		}
 		else
 		{
-			g->guild_id = (int)Sql_LastInsertId(sql_handle);
+			g->guild_id = (int)SQL->LastInsertId(sql_handle);
 			new_guild = 1;
 		}
 	}
@@ -160,8 +161,8 @@ int inter_guild_tosql(struct guild *g,int flag)
 		StringBuf buf;
 		bool add_comma = false;
 
-		StringBuf_Init(&buf);
-		StringBuf_Printf(&buf, "UPDATE `%s` SET ", guild_db);
+		StrBuf->Init(&buf);
+		StrBuf->Printf(&buf, "UPDATE `%s` SET ", guild_db);
 
 		if (flag & GS_EMBLEM)
 		{
@@ -176,26 +177,26 @@ int inter_guild_tosql(struct guild *g,int flag)
 				*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);
+			StrBuf->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, ", ");
+				StrBuf->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);
+			StrBuf->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, ", ");
+				StrBuf->AppendStr(&buf, ", ");
 			else
 				add_comma = true;
-			StringBuf_Printf(&buf, "`connect_member`=%d, `average_lv`=%d", g->connect_member, g->average_lv);
+			StrBuf->Printf(&buf, "`connect_member`=%d, `average_lv`=%d", g->connect_member, g->average_lv);
 		}
 		if (flag & GS_MES)
 		{
@@ -204,26 +205,26 @@ int inter_guild_tosql(struct guild *g,int flag)
 
 			strcat(t_info, " mes");
 			if( add_comma )
-				StringBuf_AppendStr(&buf, ", ");
+				StrBuf->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);
+			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)));
+			StrBuf->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);
+				StrBuf->AppendStr(&buf, ", ");
+			//else	//last condition using add_coma setting
+			//	add_comma = true;
+			StrBuf->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)) )
+		StrBuf->Printf(&buf, " WHERE `guild_id`=%d", g->guild_id);
+		if( SQL_ERROR == SQL->Query(sql_handle, "%s", StrBuf->Value(&buf)) )
 			Sql_ShowDebug(sql_handle);
-		StringBuf_Destroy(&buf);
+		StrBuf->Destroy(&buf);
 	}
 
 	if (flag&GS_MEMBER)
@@ -238,8 +239,8 @@ int inter_guild_tosql(struct guild *g,int flag)
 				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`) "
+				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,
@@ -247,7 +248,7 @@ int inter_guild_tosql(struct guild *g,int flag)
 					Sql_ShowDebug(sql_handle);
 				if (m->modified&GS_MEMBER_NEW || new_guild == 1)
 				{
-					if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id` = '%d' WHERE `char_id` = '%d'",
+					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);
 				}
@@ -263,8 +264,8 @@ int inter_guild_tosql(struct guild *g,int flag)
 			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')",
+			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;
@@ -277,8 +278,8 @@ int inter_guild_tosql(struct guild *g,int flag)
 		// 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) )
+		//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);
 		}
@@ -290,8 +291,8 @@ int inter_guild_tosql(struct guild *g,int flag)
 				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`) "
+					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);
@@ -308,9 +309,9 @@ int inter_guild_tosql(struct guild *g,int flag)
 			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`) "
+				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);
 			}
@@ -322,7 +323,7 @@ int inter_guild_tosql(struct guild *g,int flag)
 		//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')",
+				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);
 			}
@@ -354,38 +355,38 @@ struct guild * inter_guild_fromsql(int 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` "
+	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) )
+	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);
+	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);
+	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 )
@@ -409,90 +410,90 @@ struct guild * inter_guild_fromsql(int guild_id)
 	}
 
 	// 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` "
+	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 )
+	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);
+		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));
+		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) )
+	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) )
+	while( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 	{
 		int position;
 		struct guild_position* p;
 
-		Sql_GetData(sql_handle, 0, &data, NULL); position = atoi(data);
+		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);
+		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) )
+	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 )
+	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));
+		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) )
+	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 )
+	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)));
+		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) )
+	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);
@@ -504,15 +505,15 @@ struct guild * inter_guild_fromsql(int guild_id)
 		g->skill[i].id = i + GD_SKILLBASE;
 	}
 
-	while( SQL_SUCCESS == Sql_NextRow(sql_handle) )
+	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 )
+		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->GetData(sql_handle, 1, &data, NULL); g->skill[id].lv = atoi(data);
 	}
-	Sql_FreeResult(sql_handle);
+	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.
@@ -529,20 +530,20 @@ 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', "
+	StrBuf->Init(&buf);
+	StrBuf->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);
+		StrBuf->Printf(&buf, ", `visibleG%d`='%d'", i, gc->guardian[i].visible);
 
-	if (SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)))
+	if (SQL_ERROR == SQL->Query(sql_handle, StrBuf->Value(&buf)))
 		Sql_ShowDebug(sql_handle);
 	else if(save_log)
 		ShowInfo("Saved guild castle (%d)\n", gc->castle_id);
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 	return 0;
 }
 
@@ -557,37 +558,37 @@ static struct guild_castle* inter_guildcastle_fromsql(int castle_id)
 	if (gc != NULL)
 		return gc;
 
-	StringBuf_Init(&buf);
-	StringBuf_AppendStr(&buf, "SELECT `castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, "
+	StrBuf->Init(&buf);
+	StrBuf->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))) {
+		StrBuf->Printf(&buf, ", `visibleG%d`", i);
+	StrBuf->Printf(&buf, " FROM `%s` WHERE `castle_id`='%d'", guild_castle_db, castle_id);
+	if (SQL_ERROR == SQL->Query(sql_handle, StrBuf->Value(&buf))) {
 		Sql_ShowDebug(sql_handle);
-		StringBuf_Destroy(&buf);
+		StrBuf->Destroy(&buf);
 		return NULL;
 	}
-	StringBuf_Destroy(&buf);
+	StrBuf->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);
+	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->GetData(sql_handle, i, &data, NULL); gc->guardian[i-10].visible = atoi(data);
 		}
 	}
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 
 	idb_put(castle_db, castle_id, gc);
 
@@ -601,9 +602,9 @@ static struct guild_castle* inter_guildcastle_fromsql(int castle_id)
 // Read exp_guild.txt
 static bool exp_guild_parse_row(char* split[], int column, int current)
 {
-	int exp = atoi(split[0]);
+	unsigned int exp = (unsigned int)atol(split[0]);
 
-	if (exp < 0 || exp >= INT_MAX) {
+	if (exp >= UINT_MAX) {
 		ShowError("exp_guild: Invalid exp %d at line %d\n", exp, current);
 		return false;
 	}
@@ -620,24 +621,24 @@ int inter_guild_CharOnline(int char_id, int guild_id)
 
 	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) )
+		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) )
+		if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 		{
 			char* data;
 
-			Sql_GetData(sql_handle, 0, &data, NULL);
+			SQL->GetData(sql_handle, 0, &data, NULL);
 			guild_id = atoi(data);
 		}
 		else
 		{
 			guild_id = 0;
 		}
-		Sql_FreeResult(sql_handle);
+		SQL->FreeResult(sql_handle);
 	}
 	if (guild_id == 0)
 		return 0; //No guild...
@@ -671,24 +672,24 @@ int inter_guild_CharOffline(int char_id, int guild_id)
 	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) )
+		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) )
+		if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 		{
 			char* data;
 
-			Sql_GetData(sql_handle, 0, &data, NULL);
+			SQL->GetData(sql_handle, 0, &data, NULL);
 			guild_id = atoi(data);
 		}
 		else
 		{
 			guild_id = 0;
 		}
-		Sql_FreeResult(sql_handle);
+		SQL->FreeResult(sql_handle);
 	}
 	if (guild_id == 0)
 		return 0; //No guild...
@@ -726,7 +727,7 @@ int inter_guild_sql_init(void)
 	castle_db = idb_alloc(DB_OPT_RELEASE_DATA);
 
 	//Read exp file
-	sv_readdb("db/"DBPATH, "exp_guild.txt", ',', 1, 1, 100, exp_guild_parse_row);
+	sv->readdb("db", DBPATH"exp_guild.txt", ',', 1, 1, 100, exp_guild_parse_row);
 
 	add_timer_func_list(guild_save_timer, "guild_save_timer");
 	add_timer(gettick() + 10000, guild_save_timer, 0, 0);
@@ -738,7 +739,7 @@ int inter_guild_sql_init(void)
  */
 static int guild_db_final(DBKey key, DBData *data, va_list ap)
 {
-	struct guild *g = db_data2ptr(data);
+	struct guild *g = DB->data2ptr(data);
 	if (g->save_flag&GS_MASK) {
 		inter_guild_tosql(g, g->save_flag&GS_MASK);
 		return 1;
@@ -759,26 +760,26 @@ 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));
+	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) )
+	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) )
+	if( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 	{
 		char* data;
 
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		guild_id = atoi(data);
 	}
 	else
 	{
 		guild_id = 0;
 	}
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 	return guild_id;
 }
 
@@ -1261,13 +1262,13 @@ int mapif_parse_GuildAddMember(int fd,int guild_id,struct guild_member *m)
 // 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;
+	int i;
 
 	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) )
+		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;
@@ -1284,6 +1285,7 @@ int mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, in
 	if( flag )
 	{	// Write expulsion reason
 		// Find an empty slot
+		int j;
 		ARR_FIND( 0, MAX_GUILDEXPULSION, j, g->expulsion[j].account_id == 0 );
 		if( j == MAX_GUILDEXPULSION )
 		{
@@ -1379,32 +1381,32 @@ int mapif_parse_BreakGuild(int fd,int guild_id)
 
 	// 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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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) )
+	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);
@@ -1815,7 +1817,7 @@ int mapif_parse_GuildMasterChange(int fd, int guild_id, const char* name, int le
 	g->member[0].position = 0; //Position 0: guild Master.
 	g->member[0].modified = GS_MEMBER_MODIFIED;
 
-	strncpy(g->master, name, len);
+	safestrncpy(g->master, name, len);
 	if (len < NAME_LENGTH)
 		g->master[len] = '\0';
 
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 933661954..6e4f63849 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/malloc.h"
@@ -88,11 +89,11 @@ 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));
+	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` "
+		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,
@@ -103,12 +104,12 @@ bool mapif_homunculus_save(struct s_homunculus* hd)
 		}
 		else
 		{
-			hd->hom_id = (int)Sql_LastInsertId(sql_handle);
+			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'",
+		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) )
 		{
@@ -156,61 +157,61 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd)
 
 	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) )
+	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) )
+	if( !SQL->NumRows(sql_handle) )
 	{	//No homunculus found.
-		Sql_FreeResult(sql_handle);
+		SQL->FreeResult(sql_handle);
 		return false;
 	}
-	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
 	{
 		Sql_ShowDebug(sql_handle);
-		Sql_FreeResult(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);
+	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) )
+	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) )
+	while( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 	{
 		// id
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		i = atoi(data);
 		if( i < HM_SKILLBASE || i >= HM_SKILLBASE + MAX_HOMUNSKILL )
 			continue;// invalid skill id
@@ -218,10 +219,10 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd)
 		hd->hskill[i].id = (unsigned short)atoi(data);
 
 		// lv
-		Sql_GetData(sql_handle, 1, &data, NULL);
+		SQL->GetData(sql_handle, 1, &data, NULL);
 		hd->hskill[i].lv = (unsigned char)atoi(data);
 	}
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 
 	if( save_log )
 		ShowInfo("Homunculus loaded (%d - %s).\n", hd->hom_id, hd->name);
@@ -231,8 +232,8 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd)
 
 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)
+	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;
diff --git a/src/char/int_mail.c b/src/char/int_mail.c
index 8d50c713f..9181b7db6 100644
--- a/src/char/int_mail.c
+++ b/src/char/int_mail.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/malloc.h"
@@ -27,54 +28,54 @@ static int mail_fromsql(int char_id, struct mail_data* md)
 	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`,"
+	StrBuf->Init(&buf);
+	StrBuf->AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`status`,"
 		"`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`,`unique_id`");
 	for (i = 0; i < MAX_SLOTS; i++)
-		StringBuf_Printf(&buf, ",`card%d`", i);
+		StrBuf->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",
+	StrBuf->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)) )
+	if( SQL_ERROR == SQL->Query(sql_handle, StrBuf->Value(&buf)) )
 		Sql_ShowDebug(sql_handle);
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 
-	for (i = 0; i < MAIL_MAX_INBOX && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	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);
+		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);
-		Sql_GetData(sql_handle,15, &data, NULL); item->unique_id = strtoull(data, NULL, 10);
+		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);
+		SQL->GetData(sql_handle,15, &data, NULL); item->unique_id = strtoull(data, NULL, 10);
 		item->expire_time = 0;
 
 		for (j = 0; j < MAX_SLOTS; j++)
 		{
-			Sql_GetData(sql_handle, 16 + j, &data, NULL);
+			SQL->GetData(sql_handle, 16 + j, &data, NULL);
 			item->card[j] = atoi(data);
 		}
 	}
 
-	md->full = ( Sql_NumRows(sql_handle) > MAIL_MAX_INBOX );
+	md->full = ( SQL->NumRows(sql_handle) > MAIL_MAX_INBOX );
 
 	md->amount = i;
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 
 	md->unchecked = 0;
 	md->unread = 0;
@@ -83,7 +84,7 @@ static int mail_fromsql(int char_id, struct mail_data* md)
 		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) )
+			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;
@@ -106,15 +107,15 @@ int mail_savemessage(struct mail_message* msg)
 	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`, `unique_id`", mail_db);
+	StrBuf->Init(&buf);
+	StrBuf->Printf(&buf, "INSERT INTO `%s` (`send_name`, `send_id`, `dest_name`, `dest_id`, `title`, `message`, `time`, `status`, `zeny`, `amount`, `nameid`, `refine`, `attribute`, `identify`, `unique_id`", 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', '%"PRIu64"'",
+		StrBuf->Printf(&buf, ", `card%d`", j);
+	StrBuf->Printf(&buf, ") VALUES (?, '%d', ?, '%d', ?, ?, '%lu', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%"PRIu64"'",
 		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, msg->item.unique_id);
 	for (j = 0; j < MAX_SLOTS; j++)
-		StringBuf_Printf(&buf, ", '%d'", msg->item.card[j]);
-	StringBuf_AppendStr(&buf, ")");
+		StrBuf->Printf(&buf, ", '%d'", msg->item.card[j]);
+	StrBuf->AppendStr(&buf, ")");
 	
 	//Unique Non Stackable Item ID
 	updateLastUid(msg->item.unique_id);
@@ -122,7 +123,7 @@ int mail_savemessage(struct mail_message* msg)
 
 	// prepare and execute query
 	stmt = SqlStmt_Malloc(sql_handle);
-	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
+	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StrBuf->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))
@@ -135,7 +136,7 @@ int mail_savemessage(struct mail_message* msg)
 		msg->id = (int)SqlStmt_LastInsertId(stmt);
 
 	SqlStmt_Free(stmt);
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 
 	return msg->id;
 }
@@ -147,52 +148,52 @@ 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`,"
+	StrBuf->Init(&buf);
+	StrBuf->AppendStr(&buf, "SELECT `id`,`send_name`,`send_id`,`dest_name`,`dest_id`,`title`,`message`,`time`,`status`,"
 		"`zeny`,`amount`,`nameid`,`refine`,`attribute`,`identify`,`unique_id`");
 	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);
+		StrBuf->Printf(&buf, ",`card%d`", j);
+	StrBuf->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) )
+	if( SQL_ERROR == SQL->Query(sql_handle, StrBuf->Value(&buf))
+	||  SQL_SUCCESS != SQL->NextRow(sql_handle) )
 	{
 		Sql_ShowDebug(sql_handle);
-		Sql_FreeResult(sql_handle);
-		StringBuf_Destroy(&buf);
+		SQL->FreeResult(sql_handle);
+		StrBuf->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);
-		Sql_GetData(sql_handle,15, &data, NULL); msg->item.unique_id = strtoull(data, NULL, 10);
+		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);
+		SQL->GetData(sql_handle,15, &data, NULL); msg->item.unique_id = strtoull(data, NULL, 10);
 		msg->item.expire_time = 0;
 
 		for( j = 0; j < MAX_SLOTS; j++ )
 		{
-			Sql_GetData(sql_handle,16 + j, &data, NULL);
+			SQL->GetData(sql_handle,16 + j, &data, NULL);
 			msg->item.card[j] = atoi(data);
 		}
 	}
 
-	StringBuf_Destroy(&buf);
-	Sql_FreeResult(sql_handle);
+	StrBuf->Destroy(&buf);
+	SQL->FreeResult(sql_handle);
 
 	return true;
 }
@@ -226,7 +227,7 @@ 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) )
+	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);
 }
 
@@ -238,21 +239,21 @@ static bool mail_DeleteAttach(int mail_id)
 	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);
+	StrBuf->Init(&buf);
+	StrBuf->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);
+		StrBuf->Printf(&buf, ", `card%d` = '0'", i);
+	StrBuf->Printf(&buf, " WHERE `id` = '%d'", mail_id);
 
-	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )
+	if( SQL_ERROR == SQL->Query(sql_handle, StrBuf->Value(&buf)) )
 	{
 		Sql_ShowDebug(sql_handle);
-		StringBuf_Destroy(&buf);
+		StrBuf->Destroy(&buf);
 
 		return false;
 	}
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 	return true;
 }
 
@@ -295,7 +296,7 @@ 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) )
+	if ( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id) )
 	{
 		Sql_ShowDebug(sql_handle);
 		failed = true;
@@ -344,7 +345,7 @@ static void mapif_Mail_return(int fd, int char_id, int mail_id)
 	{
 		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) )
+		else if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `id` = '%d'", mail_db, mail_id) )
 			Sql_ShowDebug(sql_handle);
 		else
 		{
@@ -408,21 +409,21 @@ static void mapif_parse_Mail_send(int fd)
 	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->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) )
+	if ( SQL_SUCCESS == SQL->NextRow(sql_handle) )
 	{
 		char *data;
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		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);
+			SQL->GetData(sql_handle, 1, &data, NULL);
 			msg.dest_id = atoi(data);
 		}
 	}
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 	msg.status = MAIL_NEW;
 
 	if( msg.dest_id > 0 )
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c
index 3b3714416..aecb3844a 100644
--- a/src/char/int_mercenary.c
+++ b/src/char/int_mercenary.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/malloc.h"
@@ -19,33 +20,33 @@ 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) )
+	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) )
+	if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
 	{
-		Sql_FreeResult(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);
+	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')",
+	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);
@@ -57,10 +58,10 @@ bool mercenary_owner_tosql(int char_id, struct mmo_charstatus *status)
 
 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) )
+	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) )
+	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", mercenary_db, char_id) )
 		Sql_ShowDebug(sql_handle);
 
 	return true;
@@ -72,7 +73,7 @@ bool mapif_mercenary_save(struct s_mercenary* merc)
 
 	if( merc->mercenary_id == 0 )
 	{ // Create new DB entry
-		if( SQL_ERROR == Sql_Query(sql_handle,
+		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) )
 		{
@@ -80,9 +81,9 @@ bool mapif_mercenary_save(struct s_mercenary* merc)
 			flag = false;
 		}
 		else
-			merc->mercenary_id = (int)Sql_LastInsertId(sql_handle);
+			merc->mercenary_id = (int)SQL->LastInsertId(sql_handle);
 	}
-	else if( SQL_ERROR == Sql_Query(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
@@ -101,24 +102,24 @@ bool mapif_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc)
 	merc->mercenary_id = merc_id;
 	merc->char_id = char_id;
 
-	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) )
+	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;
 	}
 
-	if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
+	if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
 	{
-		Sql_FreeResult(sql_handle);
+		SQL->FreeResult(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);
+	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);
 	
@@ -127,7 +128,7 @@ bool mapif_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc)
 
 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) )
+	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `mer_id` = '%d'", mercenary_db, merc_id) )
 	{
 		Sql_ShowDebug(sql_handle);
 		return false;
diff --git a/src/char/int_party.c b/src/char/int_party.c
index a88e5c586..9cb4ccf80 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h"
@@ -125,14 +126,14 @@ int inter_party_tosql(struct party *p, int flag, int index)
 #ifdef NOISY
 	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));
+	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) )
+		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) )
+		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);
@@ -141,7 +142,7 @@ int inter_party_tosql(struct party *p, int flag, int index)
 
 	if( flag & PS_CREATE )
 	{// Create party
-		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
+		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) )
@@ -149,33 +150,33 @@ int inter_party_tosql(struct party *p, int flag, int index)
 			Sql_ShowDebug(sql_handle);
 			return 0;
 		}
-		party_id = p->party_id = (int)Sql_LastInsertId(sql_handle);
+		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'",
+		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'",
+		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'",
+		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'",
+		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);
 	}
@@ -210,42 +211,42 @@ struct party_data *inter_party_fromsql(int party_id)
 	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) )
+	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) )
+	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);
+	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) )
+	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 )
+	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);
+		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);
+	SQL->FreeResult(sql_handle);
 
 	if( save_log )
 		ShowInfo("Party loaded (%d - %s).\n", party_id, p->party.name);
@@ -270,7 +271,7 @@ int inter_party_sql_init(void)
 
 	/* 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",
+	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);
 	*/
@@ -291,15 +292,14 @@ struct party_data* search_partyname(char* str)
 	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->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);
+	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);
+	SQL->FreeResult(sql_handle);
 
 	return p;
 }
@@ -476,6 +476,11 @@ int mapif_parse_CreateParty(int fd, char *name, int item, int item2, struct part
 	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) {
+				if( name[i] == '"' ) { /* client-special-char */
+					normalize_name(name,"\"");
+					mapif_parse_CreateParty(fd,name,item,item2,leader);
+					return 0;
+				}
 				mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
 				return 0;
 			}
@@ -592,7 +597,7 @@ int mapif_parse_PartyLeave(int fd, int party_id, int account_id, int char_id)
 	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) )
+		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;
 	}
@@ -777,18 +782,18 @@ int inter_party_CharOnline(int char_id, int party_id)
 	{// 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) )
+		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) )
+		if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
 			return 0; //Eh? No party?
 
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		party_id = atoi(data);
-		Sql_FreeResult(sql_handle);
+		SQL->FreeResult(sql_handle);
 	}
 	if (party_id == 0)
 		return 0; //No party...
@@ -823,18 +828,18 @@ int inter_party_CharOffline(int char_id, int party_id) {
 	{// 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) )
+		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) )
+		if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
 			return 0; //Eh? No party?
 
-		Sql_GetData(sql_handle, 0, &data, NULL);
+		SQL->GetData(sql_handle, 0, &data, NULL);
 		party_id = atoi(data);
-		Sql_FreeResult(sql_handle);
+		SQL->FreeResult(sql_handle);
 	}
 	if (party_id == 0)
 		return 0; //No party...
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 114398290..2867aed77 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/malloc.h"
@@ -23,13 +24,13 @@ 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));
+	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` "
+		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,
@@ -38,11 +39,11 @@ int inter_pet_tosql(int pet_id, struct s_pet* p)
 			Sql_ShowDebug(sql_handle);
 			return 0;
 		}
-		p->pet_id = (int)Sql_LastInsertId(sql_handle);
+		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'",
+		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) )
 		{
@@ -68,28 +69,28 @@ int inter_pet_fromsql(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`)
 
-	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) )
+	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) )
+	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);
+		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);
@@ -114,7 +115,7 @@ void inter_pet_sql_final(void){
 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) )
+	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `pet_id`='%d'", pet_db, pet_id) )
 		Sql_ShowDebug(sql_handle);
 	return 0;
 }
@@ -184,7 +185,7 @@ int mapif_create_pet(int fd, int account_id, int char_id, short pet_class, short
 	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);
+	safestrncpy(pet_pt->name, pet_name, NAME_LENGTH);
 	if(incuvate == 1)
 		pet_pt->account_id = pet_pt->char_id = 0;
 	else {
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 224205412..d771543cc 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/db.h"
@@ -55,7 +56,7 @@ int mapif_quests_fromsql(int char_id, struct quest questlog[])
 //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) )
+	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;
@@ -67,7 +68,7 @@ bool mapif_quest_delete(int char_id, int quest_id)
 //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]) ) 
+	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;
@@ -79,7 +80,7 @@ bool mapif_quest_add(int char_id, struct quest qd)
 //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) ) 
+	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;
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index 68b588087..429b80105 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/malloc.h"
@@ -37,36 +38,36 @@ int storage_fromsql(int account_id, struct storage_data* p)
 	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`,`unique_id`");
+	StrBuf->Init(&buf);
+	StrBuf->AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`expire_time`,`unique_id`");
 	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);
+		StrBuf->Printf(&buf, ",`card%d`", j);
+	StrBuf->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)) )
+	if( SQL_ERROR == SQL->Query(sql_handle, StrBuf->Value(&buf)) )
 		Sql_ShowDebug(sql_handle);
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 
-	for( i = 0; i < MAX_STORAGE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	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);
-		Sql_GetData(sql_handle, 8, &data, NULL); item->unique_id = strtoull(data, NULL, 10);
+		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);
+		SQL->GetData(sql_handle, 8, &data, NULL); item->unique_id = strtoull(data, NULL, 10);
 		for( j = 0; j < MAX_SLOTS; ++j )
 		{
-			Sql_GetData(sql_handle, 9+j, &data, NULL); item->card[j] = atoi(data);
+			SQL->GetData(sql_handle, 9+j, &data, NULL); item->card[j] = atoi(data);
 		}
 	}
 	p->storage_amount = i;
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 
 	ShowInfo("storage load complete from DB - id: %d (total: %d)\n", account_id, p->storage_amount);
 	return 1;
@@ -94,36 +95,36 @@ int guild_storage_fromsql(int guild_id, struct guild_storage* p)
 	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`,`unique_id`");
+	StrBuf->Init(&buf);
+	StrBuf->AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`unique_id`");
 	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);
+		StrBuf->Printf(&buf, ",`card%d`", j);
+	StrBuf->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)) )
+	if( SQL_ERROR == SQL->Query(sql_handle, StrBuf->Value(&buf)) )
 		Sql_ShowDebug(sql_handle);
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 
-	for( i = 0; i < MAX_GUILD_STORAGE && SQL_SUCCESS == Sql_NextRow(sql_handle); ++i )
+	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);
-		Sql_GetData(sql_handle, 7, &data, NULL); item->unique_id = strtoull(data, NULL, 10);
+		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->unique_id = strtoull(data, NULL, 10);
 		item->expire_time = 0;
 		for( j = 0; j < MAX_SLOTS; ++j )
 		{
-			Sql_GetData(sql_handle, 8+j, &data, NULL); item->card[j] = atoi(data);
+			SQL->GetData(sql_handle, 8+j, &data, NULL); item->card[j] = atoi(data);
 		}
 	}
 	p->storage_amount = i;
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 
 	ShowInfo("guild storage load complete from DB - id: %d (total: %d)\n", guild_id, p->storage_amount);
 	return 0;
@@ -144,13 +145,13 @@ void inter_storage_sql_final(void)
 // 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) )
+	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) )
+	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;
 }
@@ -160,9 +161,9 @@ 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) )
+	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 )
+	else if( SQL->NumRows(sql_handle) > 0 )
 	{// guild exists
 		WFIFOHEAD(fd, sizeof(struct guild_storage)+12);
 		WFIFOW(fd,0) = 0x3818;
@@ -174,7 +175,7 @@ int mapif_load_guild_storage(int fd,int account_id,int guild_id)
 		return 0;
 	}
 	// guild does not exist
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 	WFIFOHEAD(fd, 12);
 	WFIFOW(fd,0) = 0x3818;
 	WFIFOW(fd,2) = 12;
@@ -219,16 +220,16 @@ int mapif_parse_SaveGuildStorage(int fd)
 	}
 	else
 	{
-		if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `guild_id`='%d'", guild_db, 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 )
+		else if( SQL->NumRows(sql_handle) > 0 )
 		{// guild exists
-			Sql_FreeResult(sql_handle);
+			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);
+		SQL->FreeResult(sql_handle);
 	}
 	mapif_save_guild_storage_ack(fd, RFIFOL(fd,4), guild_id, 1);
 	return 0;
diff --git a/src/char/inter.c b/src/char/inter.c
index 8ff10e290..a1b075a14 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #include "../common/mmo.h"
 #include "../common/db.h"
@@ -43,7 +44,6 @@ char default_codepage[32] = ""; //Feature by irmin.
 
 static struct accreg *accreg_pt;
 unsigned int party_share_level = 10;
-char main_chat_nick[16] = "Main";
 
 // recv. packet list
 int inter_recv_packet_length[] = {
@@ -446,43 +446,43 @@ void mapif_parse_accinfo(int fd) {
 
 	safestrncpy(query, (char*) RFIFOP(fd,14), NAME_LENGTH);
 
-	Sql_EscapeString(sql_handle, query_esq, query);
+	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 ) {
+		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);
+			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);
+			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) ) {
+				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);
+					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);
+				SQL->FreeResult(sql_handle);
 				return;
 			}
 		}
@@ -490,30 +490,32 @@ void mapif_parse_accinfo(int fd) {
 
 	/* 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];
+		char userid[NAME_LENGTH], user_pass[NAME_LENGTH], email[40], last_ip[20], lastlogin[30], pincode[5], birthdate[11];
 		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 ) {
+		if ( SQL_ERROR == SQL->Query(sql_handle, "SELECT `userid`, `user_pass`, `email`, `last_ip`, `group_id`, `lastlogin`, `logincount`, `state`,`pincode`,`birthdate` 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->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->GetData(sql_handle, 8, &data, NULL); safestrncpy(pincode, data, sizeof(pincode));
+			SQL->GetData(sql_handle, 9, &data, NULL); safestrncpy(birthdate, data, sizeof(birthdate));
 		}
 
-		Sql_FreeResult(sql_handle);
+		SQL->FreeResult(sql_handle);
 
 		if (level == -1)
 			return;
@@ -521,19 +523,23 @@ void mapif_parse_accinfo(int fd) {
 		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 );
+		if (level < castergroup) { /* only show pass if your gm level is greater than the one you're searching for */
+			if( strlen(pincode) )
+				inter_to_fd(fd, u_fd, aid, "Password: %s (PIN:%s)", user_pass, pincode );
+			else
+				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, "Account e-mail: %s | Birthdate: %s", email, birthdate);
 		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_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 )
+				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.");
@@ -541,23 +547,23 @@ void mapif_parse_accinfo(int fd) {
 				}
 
 		} else {
-			while ( SQL_SUCCESS == Sql_NextRow(sql_handle) ) {
+			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);
+				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);
+		SQL->FreeResult(sql_handle);
 	}
 
 	return;
@@ -579,12 +585,12 @@ int inter_accreg_tosql(int account_id, int char_id, struct accreg* reg, int type
 	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) )
+		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) )
+		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;
@@ -599,8 +605,8 @@ int inter_accreg_tosql(int account_id, int char_id, struct accreg* reg, int type
 	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);
+	StrBuf->Init(&buf);
+	StrBuf->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];
@@ -609,20 +615,20 @@ int inter_accreg_tosql(int account_id, int char_id, struct accreg* reg, int type
 			char val[256];
 
 			if( i > 0 )
-				StringBuf_AppendStr(&buf, ",");
+				StrBuf->AppendStr(&buf, ",");
 
-			Sql_EscapeString(sql_handle, str, r->str);
-			Sql_EscapeString(sql_handle, val, r->value);
+			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);
+			StrBuf->Printf(&buf, "('%d','%d','%d','%s','%s')", type, account_id, char_id, str, val);
 		}
 	}
 
-	if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) ) {
+	if( SQL_ERROR == SQL->QueryStr(sql_handle, StrBuf->Value(&buf)) ) {
 		Sql_ShowDebug(sql_handle);
 	}
 
-	StringBuf_Destroy(&buf);
+	StrBuf->Destroy(&buf);
 
 	return 1;
 }
@@ -646,11 +652,11 @@ int inter_accreg_fromsql(int account_id,int char_id, struct accreg *reg, int typ
 	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) )
+		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) )
+		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
@@ -660,18 +666,18 @@ int inter_accreg_fromsql(int account_id,int char_id, struct accreg *reg, int typ
 		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 )
+	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);
+		SQL->GetData(sql_handle, 0, &data, &len);
 		memcpy(r->str, data, min(len, sizeof(r->str)));
 		// value
-		Sql_GetData(sql_handle, 1, &data, &len);
+		SQL->GetData(sql_handle, 1, &data, &len);
 		memcpy(r->value, data, min(len, sizeof(r->value)));
 	}
 	reg->reg_num = i;
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 	return 1;
 }
 
@@ -726,8 +732,6 @@ static int inter_config_read(const char* cfgName)
 			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);
 	}
@@ -749,8 +753,8 @@ int inter_log(char* 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->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;
@@ -764,17 +768,17 @@ int inter_init_sql(const char *file)
 	inter_config_read(file);
 
 	//DB connection initialized
-	sql_handle = Sql_Malloc();
+	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) )
+	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);
+		SQL->Free(sql_handle);
 		exit(EXIT_FAILURE);
 	}
 
 	if( *default_codepage ) {
-		if( SQL_ERROR == Sql_SetEncoding(sql_handle, default_codepage) )
+		if( SQL_ERROR == SQL->SetEncoding(sql_handle, default_codepage) )
 			Sql_ShowDebug(sql_handle);
 	}
 
@@ -931,7 +935,7 @@ 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);
+	struct WisData *wd = DB->data2ptr(data);
 	tick = va_arg(ap, unsigned long);
 
 	if (DIFF_TICK(tick, wd->tick) > WISDATA_TTL && wis_delnum < WISDELLIST_MAX)
@@ -993,12 +997,12 @@ int mapif_parse_WisRequest(int fd)
 
 	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->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) )
+	if( SQL_SUCCESS != SQL->NextRow(sql_handle) )
 	{
 		unsigned char buf[27];
 		WBUFW(buf, 0) = 0x3802;
@@ -1009,7 +1013,7 @@ int mapif_parse_WisRequest(int fd)
 	else
 	{// Character exists. So, ask all map-servers
 		// to be sure of the correct name, rewrite it
-		Sql_GetData(sql_handle, 0, &data, &len);
+		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.
@@ -1041,7 +1045,7 @@ int mapif_parse_WisRequest(int fd)
 		}
 	}
 
-	Sql_FreeResult(sql_handle);
+	SQL->FreeResult(sql_handle);
 	return 0;
 }
 
diff --git a/src/char/inter.h b/src/char/inter.h
index 9f99197eb..de27b0473 100644
--- a/src/char/inter.h
+++ b/src/char/inter.h
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena Dev Teams
 
 #ifndef _INTER_SQL_H_
 #define _INTER_SQL_H_
@@ -23,8 +24,6 @@ extern unsigned int party_share_level;
 extern Sql* sql_handle;
 extern Sql* lsql_handle;
 
-extern char main_chat_nick[16];
-
 int inter_accreg_tosql(int account_id, int char_id, struct accreg *reg, int type);
 
 uint64 inter_chk_lastuid(int8 flag, uint64 value);
@@ -33,7 +32,7 @@ uint64 inter_chk_lastuid(int8 flag, uint64 value);
 	#define dbUpdateUid(handler_)\
 	{ \
 		uint64 unique_id_ = inter_chk_lastuid(0, 0); \
-		if (unique_id_ && SQL_ERROR == Sql_Query(handler_, "UPDATE `interreg` SET `value`='%"PRIu64"' WHERE `varname`='unique_id'", unique_id_)) \
+		if (unique_id_ && SQL_ERROR == SQL->Query(handler_, "UPDATE `interreg` SET `value`='%"PRIu64"' WHERE `varname`='unique_id'", unique_id_)) \
 				Sql_ShowDebug(handler_);\
 	}
 #else
diff --git a/src/char/pincode.c b/src/char/pincode.c
new file mode 100644
index 000000000..2603df2d8
--- /dev/null
+++ b/src/char/pincode.c
@@ -0,0 +1,201 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+
+#include "../common/cbasetypes.h"
+#include "../common/mmo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "char.h"
+#include "pincode.h"
+
+#include <stdlib.h>
+
+int enabled = PINCODE_OK;
+int changetime = 0;
+int maxtry = 3;
+int charselect = 0;
+unsigned int multiplier = 0x3498, baseSeed = 0x881234;
+
+void pincode_handle ( int fd, struct char_session_data* sd ) {
+	struct online_char_data* character = (struct online_char_data*)idb_get(online_char_db, sd->account_id);
+	
+	if( character && character->pincode_enable > *pincode->charselect ){
+		character->pincode_enable = *pincode->charselect * 2;
+	}else{
+		pincode->sendstate( fd, sd, PINCODE_OK );
+		return;
+	}
+	
+	if( strlen(sd->pincode) == 4 ){
+		if( *pincode->changetime && time(NULL) > (sd->pincode_change+*pincode->changetime) ){ // User hasnt changed his PIN code for a long time
+			pincode->sendstate( fd, sd, PINCODE_EXPIRED );
+		} else { // Ask user for his PIN code
+			pincode->sendstate( fd, sd, PINCODE_ASK );
+		}
+	} else // No PIN code has been set yet
+		pincode->sendstate( fd, sd, PINCODE_NOTSET );
+
+	if( character )
+		character->pincode_enable = -1;
+}
+
+void pincode_check(int fd, struct char_session_data* sd) {
+	char pin[5] = "\0\0\0\0";
+	
+	strncpy(pin, (char*)RFIFOP(fd, 6), 4+1);
+	pincode->decrypt(sd->pincode_seed, pin);
+	if( pincode->compare( fd, sd, pin ) ){
+		struct online_char_data* character;
+		if( (character = (struct online_char_data*)idb_get(online_char_db, sd->account_id)) )
+			character->pincode_enable = *pincode->charselect * 2;
+		pincode->sendstate( fd, sd, PINCODE_OK );
+	}
+}
+
+int pincode_compare(int fd, struct char_session_data* sd, char* pin) {
+	if( strcmp( sd->pincode, pin ) == 0 ){
+		sd->pincode_try = 0;
+		return 1;
+	} else {
+		pincode->sendstate( fd, sd, PINCODE_WRONG );
+		if( *pincode->maxtry && ++sd->pincode_try >= *pincode->maxtry ){
+			pincode->error( sd->account_id );
+		}
+		return 0;
+	}
+}
+
+void pincode_change(int fd, struct char_session_data* sd) {
+	char oldpin[5] = "\0\0\0\0", newpin[5] = "\0\0\0\0";
+
+	strncpy(oldpin, (char*)RFIFOP(fd,6), sizeof(oldpin));
+	pincode->decrypt(sd->pincode_seed,oldpin);
+	if( !pincode->compare( fd, sd, oldpin ) )
+		return;
+	
+	strncpy(newpin, (char*)RFIFOP(fd,10), sizeof(newpin));
+	pincode->decrypt(sd->pincode_seed,newpin);
+	pincode->update( sd->account_id, newpin );
+	strncpy(sd->pincode, newpin, sizeof(sd->pincode));
+	pincode->sendstate( fd, sd, PINCODE_ASK );
+}
+
+void pincode_setnew(int fd, struct char_session_data* sd) {
+	char newpin[5] = "\0\0\0\0";
+
+	strncpy(newpin, (char*)RFIFOP(fd,6), sizeof(newpin));
+	pincode->decrypt(sd->pincode_seed,newpin);
+	pincode->update( sd->account_id, newpin );
+	strncpy(sd->pincode, newpin, sizeof(sd->pincode));
+	pincode->sendstate( fd, sd, PINCODE_ASK );
+}
+
+// 0 = pin is correct
+// 1 = ask for pin - client sends 0x8b8
+// 2 = create new pin - client sends 0x8ba
+// 3 = pin must be changed - client 0x8be
+// 4 = create new pin ?? - client sends 0x8ba
+// 5 = client shows msgstr(1896)
+// 6 = client shows msgstr(1897) Unable to use your KSSN number
+// 7 = char select window shows a button - client sends 0x8c5
+// 8 = pincode was incorrect
+void pincode_sendstate(int fd, struct char_session_data* sd, uint16 state) {
+	WFIFOHEAD(fd, 12);
+	WFIFOW(fd, 0) = 0x8b9;
+	WFIFOL(fd, 2) = sd->pincode_seed = rand() % 0xFFFF;
+	WFIFOL(fd, 6) = sd->account_id;
+	WFIFOW(fd,10) = state;
+	WFIFOSET(fd,12);
+}
+
+void pincode_notifyLoginPinUpdate(int account_id, char* pin) {
+	WFIFOHEAD(login_fd,11);
+	WFIFOW(login_fd,0) = 0x2738;
+	WFIFOL(login_fd,2) = account_id;
+	strncpy( (char*)WFIFOP(login_fd,6), pin, 5 );
+	WFIFOSET(login_fd,11);
+}
+
+void pincode_notifyLoginPinError(int account_id) {
+	WFIFOHEAD(login_fd,6);
+	WFIFOW(login_fd,0) = 0x2739;
+	WFIFOL(login_fd,2) = account_id;
+	WFIFOSET(login_fd,6);
+}
+
+void pincode_decrypt(unsigned int userSeed, char* pin) {
+	int i, pos;
+	char tab[10] = {0,1,2,3,4,5,6,7,8,9};
+	
+	for( i = 1; i < 10; i++ ){
+		userSeed = *pincode->baseSeed + userSeed * *pincode->multiplier;
+		pos = userSeed % (i + 1);
+		if( i != pos ){
+			tab[i] ^= tab[pos];
+			tab[pos] ^= tab[i];
+			tab[i] ^= tab[pos];
+		}
+	}
+	
+	for( i = 0; i < 4; i++ ){
+		pin[i] = tab[pin[i] - '0'];
+	}
+	
+	sprintf(pin, "%d%d%d%d", pin[0], pin[1], pin[2], pin[3]);
+}
+
+bool pincode_config_read(char *w1, char *w2) {
+	
+	while ( true ) {
+		
+		if ( strcmpi(w1, "pincode_enabled") == 0 ) {
+			enabled = atoi(w2);
+#if PACKETVER < 20110309
+			if( enabled ) {
+				ShowWarning("pincode_enabled requires PACKETVER 20110309 or higher. disabling...\n");
+				enabled = 0;
+			}
+#endif
+		} else if ( strcmpi(w1, "pincode_changetime") == 0 ) {
+			changetime = atoi(w2)*60;
+		} else if ( strcmpi(w1, "pincode_maxtry") == 0 ) {
+			maxtry = atoi(w2);
+			if( maxtry > 3 ) {
+				ShowWarning("pincode_maxtry is too high (%d); maximum allowed: 3! capping to 3...\n",maxtry);
+				maxtry = 3;
+			}
+		} else if ( strcmpi(w1, "pincode_charselect") == 0 ) {
+			charselect = atoi(w2);
+		} else
+			return false;
+		
+		break;
+	}
+	
+	return true;
+}
+
+void pincode_defaults(void) {
+	pincode = &pincode_s;
+	
+	pincode->enabled = &enabled;
+	pincode->changetime = &changetime;
+	pincode->maxtry = &maxtry;
+	pincode->charselect = &charselect;
+	pincode->multiplier = &multiplier;
+	pincode->baseSeed = &baseSeed;
+	
+	pincode->handle = pincode_handle;
+	pincode->decrypt = pincode_decrypt;
+	pincode->error = pincode_notifyLoginPinError;
+	pincode->update = pincode_notifyLoginPinUpdate;
+	pincode->sendstate = pincode_sendstate;
+	pincode->setnew = pincode_setnew;
+	pincode->change = pincode_change;
+	pincode->compare = pincode_compare;
+	pincode->check = pincode_check;
+	pincode->config_read = pincode_config_read;
+
+}
diff --git a/src/char/pincode.h b/src/char/pincode.h
new file mode 100644
index 000000000..358f21ff7
--- /dev/null
+++ b/src/char/pincode.h
@@ -0,0 +1,42 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+
+#ifndef _PINCODE_H_
+#define _PINCODE_H_
+
+#include "char.h"
+
+#define PINCODE_OK 0
+#define PINCODE_ASK 1
+#define PINCODE_NOTSET 2
+#define PINCODE_EXPIRED 3
+#define PINCODE_UNUSED 7
+#define	PINCODE_WRONG 8
+
+/* Pincode Interface */
+struct pincode_interface {
+	/* vars */
+	int *enabled;
+	int *changetime;
+	int *maxtry;
+	int *charselect;
+	unsigned int *multiplier;
+	unsigned int *baseSeed;
+	/* handler */
+	void (*handle) (int fd, struct char_session_data* sd);
+	void (*decrypt) (unsigned int userSeed, char* pin);
+	void (*error) (int account_id);
+	void (*update) (int account_id, char* pin);
+	void (*sendstate) (int fd, struct char_session_data* sd, uint16 state);
+	void (*setnew) (int fd, struct char_session_data* sd);
+	void (*change) (int fd, struct char_session_data* sd);
+	int  (*compare) (int fd, struct char_session_data* sd, char* pin);
+	void (*check) (int fd, struct char_session_data* sd);
+	bool (*config_read) (char *w1, char *w2);
+} pincode_s;
+
+struct pincode_interface *pincode;
+
+void pincode_defaults(void);
+
+#endif /* _PINCODE_H_ */