branch for major stability breakage

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

19 files changed, 3120 insertions, 2540 deletions

diff --git a/src/char_sql/GNUmakefile b/src/char_sql/GNUmakefile
deleted file mode 100644
index 0f25010d8..000000000
--- a/src/char_sql/GNUmakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-all: char-server_sql
-sql: char-server_sql
-
-COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o ../common/utils.o ../common/nullpo.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/nullpo.h
-
-char-server_sql: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o strlib.o itemdb.o $(COMMON_OBJ)
-	$(CC) -o ../../$@ $^ $(LIB_S)
-
-char.o: char.c char.h strlib.h itemdb.h ../common/showmsg.h
-inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h ../common/mmo.h char.h ../common/socket.h ../common/showmsg.h
-int_party.o: int_party.c int_party.h inter.h ../common/mmo.h char.h ../common/socket.h ../common/timer.h ../common/db.h ../common/showmsg.h
-int_guild.o: int_guild.c int_guild.h inter.h ../common/mmo.h char.h ../common/socket.h ../common/db.h ../common/showmsg.h
-int_storage.o: int_storage.c int_storage.h char.h itemdb.h ../common/showmsg.h
-int_pet.o: int_pet.c int_pet.h inter.h char.h ../common/mmo.h ../common/socket.h ../common/db.h ../common/showmsg.h
-strlib.o: strlib.c strlib.h ../common/showmsg.h
-itemdb.o: itemdb.c itemdb.h ../common/db.h ../common/mmo.h ../common/showmsg.h
-
-clean:
-	rm -f *.o ../../char-server_sql
\ No newline at end of file
diff --git a/src/char_sql/Makefile b/src/char_sql/Makefile
index 0f25010d8..1741b5ab6 100644
--- a/src/char_sql/Makefile
+++ b/src/char_sql/Makefile
@@ -1,20 +1,20 @@
 all: char-server_sql
 sql: char-server_sql
 
-COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o ../common/utils.o ../common/nullpo.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/nullpo.h
+COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o ../common/obj/db.o ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o ../common/obj/strlib.o
+COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h
 
-char-server_sql: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o strlib.o itemdb.o $(COMMON_OBJ)
+char-server_sql: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o itemdb.o $(COMMON_OBJ)
 	$(CC) -o ../../$@ $^ $(LIB_S)
 
-char.o: char.c char.h strlib.h itemdb.h ../common/showmsg.h
+char.o: char.c char.h ../common/strlib.h itemdb.h ../common/showmsg.h
 inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h ../common/mmo.h char.h ../common/socket.h ../common/showmsg.h
 int_party.o: int_party.c int_party.h inter.h ../common/mmo.h char.h ../common/socket.h ../common/timer.h ../common/db.h ../common/showmsg.h
 int_guild.o: int_guild.c int_guild.h inter.h ../common/mmo.h char.h ../common/socket.h ../common/db.h ../common/showmsg.h
 int_storage.o: int_storage.c int_storage.h char.h itemdb.h ../common/showmsg.h
 int_pet.o: int_pet.c int_pet.h inter.h char.h ../common/mmo.h ../common/socket.h ../common/db.h ../common/showmsg.h
-strlib.o: strlib.c strlib.h ../common/showmsg.h
 itemdb.o: itemdb.c itemdb.h ../common/db.h ../common/mmo.h ../common/showmsg.h
+$(COMMON_OBJ): $(COMMON_H)
 
 clean:
-	rm -f *.o ../../char-server_sql
\ No newline at end of file
+	rm -f *.o ../../char-server_sql
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 91bc604a3..d672bc0eb 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -18,8 +18,6 @@
 #include <netdb.h>
 #endif
 
-#include "../common/utils.h"
-#include "../common/nullpo.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <netinet/in.h>
@@ -35,15 +33,18 @@
 #include <stdarg.h>
 
 #include "char.h"
-#include "strlib.h"
+#include "../common/utils.h"
+#include "../common/strlib.h"
 #include "itemdb.h"
 #include "inter.h"
+#include "db.h"
+#include "malloc.h"
 
 #ifdef MEMWATCH
 #include "memwatch.h"
 #endif
 
-#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
+static struct dbt *char_db_;
 
 char char_db[256] = "char";
 char cart_db[256] = "cart_inventory";
@@ -65,22 +66,18 @@ char guild_storage_db[256] = "guild_storage";
 char party_db[256] = "party";
 char pet_db[256] = "pet";
 char login_db[256] = "login";
+char friend_db[256] = "friends";
+int db_use_sqldbs;
 
 char login_db_account_id[32] = "account_id";
 char login_db_level[32] = "level";
 
 int lowest_gm_level = 1;
 
-int user_count_timer;
-
-unsigned char *SQL_CONF_NAME = "conf/inter_athena.conf";
+char *SQL_CONF_NAME = "conf/inter_athena.conf";
 
 struct mmo_map_server server[MAX_MAP_SERVERS];
 int server_fd[MAX_MAP_SERVERS];
-int server_freezeflag[MAX_MAP_SERVERS]; // Map-server anti-freeze system. Counter. 5 ok, 4...0 freezed
-
-int anti_freeze_enable = 0;
-int ANTI_FREEZE_INTERVAL = 6;
 
 int login_fd, char_fd;
 char userid[24];
@@ -89,17 +86,21 @@ char server_name[20];
 char wisp_server_name[24] = "Server";
 int login_ip_set_ = 0;
 char login_ip_str[128];
-int login_ip;
+in_addr_t login_ip;
 int login_port = 6900;
 int char_ip_set_ = 0;
 char char_ip_str[128];
-int char_ip;
+int bind_ip_set_ = 0;
+char bind_ip_str[128];
+in_addr_t char_ip;
 int char_port = 6121;
 int char_maintenance;
 int char_new;
 int name_ignoring_case = 0; // Allow or not identical name for characters but with a different case by [Yor]
 int char_name_option = 0; // Option to know which letters/symbols are authorised in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor]
 char char_name_letters[1024] = ""; // list of letters/symbols used to authorise or not a name of a character. by [Yor]
+int char_per_account = 0; //Maximum charas per account (default unlimited) [Sirius]
+
 
 int log_char = 1;	// loggin char or not [devil]
 int log_inter = 1;	// loggin inter or not [devil]
@@ -132,10 +133,11 @@ int auth_fifo_pos = 0;
 
 int check_ip_flag = 1; // It's to check IP of a player between char-server and other servers (part of anti-hacking system)
 
-//int char_id_count = 150000; // no longer needed, use of MIN_CHAR_ID instead [Ajarn]
+//int char_id_count = 150000; //removed by [Sirius] for new charcreate issue (auto_increment @sql)
 struct mmo_charstatus *char_dat;
 int char_num,char_max;
 int max_connect_user = 0;
+int gm_allow_level = 99;
 int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
 int start_zeny = 500;
 int start_weapon = 1201;
@@ -154,49 +156,77 @@ int GM_num = 0;
 
 int console = 0;
 
-char prev_query[65535];
+#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
 
-char servers_connected = 0;
+//-------------------------------------------------
+// Set Character online/offline [Wizputer]
+//-------------------------------------------------
 
-// GM Database
-struct dbt *gm_db;
+void set_char_online(int char_id, int account_id) {
+    if ( char_id != 99 ) {
+        sprintf(tmp_sql, "UPDATE `%s` SET `online`='1' WHERE `char_id`='%d'",char_db,char_id);
+		if (mysql_query(&mysql_handle, tmp_sql)) {
+			printf("DB server Error (set char online)- %s\n", mysql_error(&mysql_handle));
+		}
+    }
 
-//----------------------------------------------
-//SQL Commands ( Original by Clownisius ) [Edit: Wizputer]
-//----------------------------------------------
+    if (login_fd <= 0 || session[login_fd]->eof)
+		return;
+	WFIFOW(login_fd,0) = 0x272b;
+	WFIFOL(login_fd,2) = account_id;
+	WFIFOSET(login_fd,6);
 
-void sql_query(char* query,char function[32]) {
-	if(mysql_query(&mysql_handle, query)){
-		printf("---------- SQL error report ----------\n");
-		printf("MySQL Server Error: %s\n", mysql_error(&mysql_handle));
-		printf("Query: %s\n", query);
-		printf("In function: %s \n", function);
-		printf("\nPrevious query: %s\n", prev_query);
-//		if (strcmp(mysql_error(&mysql_handle),"CR_COMMANDS_OUT_OF_SYNC") !=0) printf(" - =  Shutting down Char Server  = - \n\n");
-		printf("-------- End SQL Error Report --------\n");
-//		printf("Uncontrolled param: %s",&mysql_handle);
-//		if (strcmp(mysql_error(&mysql_handle),"CR_COMMANDS_OUT_OF_SYNC") !=0) exit(1);
+}
+
+void set_all_offline(void) {
+	sprintf(tmp_sql, "SELECT `account_id` FROM `%s` WHERE `online`='1'",char_db);
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select all online)- %s\n", mysql_error(&mysql_handle));
 	}
+	sql_res = mysql_store_result(&mysql_handle);
+	if (sql_res) {
+	    while((sql_row = mysql_fetch_row(sql_res))) {
+	        if ( login_fd > 0 ) {
+	            printf("send user offline: %d\n",atoi(sql_row[0]));
+	            WFIFOW(login_fd,0) = 0x272c;
+	            WFIFOL(login_fd,2) = atoi(sql_row[0]);
+	            WFIFOSET(login_fd,6);
+            }
+       }
+    }
 
-	strcpy(prev_query,query);
+   	mysql_free_result(sql_res);
+    sprintf(tmp_sql,"UPDATE `%s` SET `online`='0' WHERE `online`='1'", char_db);
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (set_all_offline)- %s\n", mysql_error(&mysql_handle));
+	}
 
 }
 
-//-----------------------------------------------------
-// Function to suppress control characters in a string.
-//-----------------------------------------------------
-int remove_control_chars(unsigned char *str) {
-	int i;
-	int change = 0;
+void set_char_offline(int char_id, int account_id) {
+    struct mmo_charstatus *cp;
 
-	for(i = 0; i < strlen(str); i++) {
-		if (str[i] < 32) {
-			str[i] = '_';
-			change = 1;
+    if ( char_id == 99 )
+        sprintf(tmp_sql,"UPDATE `%s` SET `online`='0' WHERE `account_id`='%d'", char_db, account_id);
+	else {
+		cp = (struct mmo_charstatus*)numdb_search(char_db_,char_id);
+		if (cp != NULL) {
+			aFree(cp);
+			numdb_erase(char_db_,char_id);
 		}
+
+		sprintf(tmp_sql,"UPDATE `%s` SET `online`='0' WHERE `char_id`='%d'", char_db, char_id);
+
+		if (mysql_query(&mysql_handle, tmp_sql))
+			printf("DB server Error (set_char_offline)- %s\n", mysql_error(&mysql_handle));
 	}
 
-	return change;
+   if (login_fd <= 0 || session[login_fd]->eof)
+	return;
+
+   WFIFOW(login_fd,0) = 0x272c;
+   WFIFOL(login_fd,2) = account_id;
+   WFIFOSET(login_fd,6);
 }
 
 //----------------------------------------------------------------------
@@ -204,161 +234,214 @@ int remove_control_chars(unsigned char *str) {
 // and returns its level (or 0 if it isn't a GM account or if not found)
 //----------------------------------------------------------------------
 // Removed since nothing GM related goes on in the char server [CLOWNISIUS]
+int isGM(int account_id) {
+	int i;
 
-unsigned char isGM(int account_id) {
-    unsigned char *level;
-
-   	level = numdb_search(gm_db, account_id);
-	if (level == NULL)
-		return 0;
-
-	return *level;
-}
-
-static int gmdb_final(void *key,void *data,va_list ap) {
-	unsigned char *level;
-
-	nullpo_retr(0, level=data);
-
-	free(level);
-
+	for(i = 0; i < GM_num; i++)
+		if (gm_account[i].account_id == account_id)
+			return gm_account[i].level;
 	return 0;
 }
 
-void do_final_gmdb(void) {
-	if(gm_db){
-		numdb_final(gm_db,gmdb_final);
-		gm_db=NULL;
+void read_gm_account(void) {
+	if (gm_account != NULL)
+		aFree(gm_account);
+	GM_num = 0;
+
+	sprintf(tmp_lsql, "SELECT `%s`,`%s` FROM `%s` WHERE `%s`>='%d'",login_db_account_id,login_db_level,login_db,login_db_level,lowest_gm_level);
+	if (mysql_query(&lmysql_handle, tmp_lsql)) {
+		printf("DB server Error (select %s to Memory)- %s\n",login_db,mysql_error(&lmysql_handle));
+	}
+	lsql_res = mysql_store_result(&lmysql_handle);
+	if (lsql_res) {
+		gm_account = (struct gm_account*)aCalloc(sizeof(struct gm_account) * mysql_num_rows(lsql_res), 1);
+		while ((lsql_row = mysql_fetch_row(lsql_res))) {
+			gm_account[GM_num].account_id = atoi(lsql_row[0]);
+			gm_account[GM_num].level = atoi(lsql_row[1]);
+			GM_num++;
+		}
 	}
-}
-
-int read_gm_accounts(int fd, int len) {
-    GM_num = RFIFOW(fd,2);
-
-	if(len < (6+5*GM_num))
-	    return -1;
 
-    int i=0,account_id=0;
-    unsigned char *level;
-
-    if (gm_db)
-		do_final_gmdb();
+	mysql_free_result(lsql_res);
+	mapif_send_gmaccounts();
+}
 
-	gm_db = numdb_init();
+// Insert friends list
+int insert_friends(int char_id){
+	int i;
+	char *tmp_p = tmp_sql;
 
-	WFIFOW(fd,0) = 0x2b99;
-	WFIFOW(fd,2) = GM_num;
+	tmp_p += sprintf(tmp_p, "REPLACE INTO `%s` (`id`, `account_id`",friend_db);
 
-	if(GM_num) {
-	    for(i=0;i<GM_num;i++) {
-	        level = malloc(sizeof(unsigned char));
+	for (i=0;i<20;i++)
+		tmp_p += sprintf(tmp_p, ", `friend_id%d`, `name%d`", i, i);
 
-	        *level = RFIFOB(fd,(10+5*(GM_num-1)));
-	        account_id = RFIFOW(fd,(6+5*(GM_num-1)));
+	tmp_p += sprintf(tmp_p, ") VALUES (NULL, '%d'", char_id);
 
-	        numdb_insert(gm_db, account_id, level);
+	for (i=0;i<20;i++)
+		tmp_p += sprintf(tmp_p, ", '0', ''");
 
-	        WFIFOL(fd,6+5*i) = account_id;
-            WFIFOB(fd,10+5*i) = *level;
-	    }
-	}
+	tmp_p += sprintf(tmp_p, ")");
 
-    WFIFOSET(fd,6+5*i);
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (insert `friend`)- %s\n", mysql_error(&mysql_handle));
+         	return 0;
+         }
+return 1;
+}
 
-    return 0;
+int compare_item(struct item *a, struct item *b) {
+  return (
+	  (a->id == b->id) &&
+	  (a->nameid == b->nameid) &&
+	  (a->amount == b->amount) &&
+	  (a->equip == b->equip) &&
+	  (a->identify == b->identify) &&
+	  (a->refine == b->refine) &&
+	  (a->attribute == b->attribute) &&
+	  (a->card[0] == b->card[0]) &&
+	  (a->card[1] == b->card[1]) &&
+	  (a->card[2] == b->card[2]) &&
+	  (a->card[3] == b->card[3]));
 }
 
 //=====================================================================================================
 int mmo_char_tosql(int char_id, struct mmo_charstatus *p){
-	int i=0;
-	int eqcount=1;
-	char temp_str[32];
+	int i=0,party_exist,guild_exist;
+//	int eqcount=1;
+//	int noteqcount=1;
+	int count = 0;
+	int diff = 0;
+	char temp_str[1024];
+	char *tmp_p = tmp_sql;
+	struct mmo_charstatus *cp;
+	struct itemtmp mapitem[MAX_GUILD_STORAGE];	
 
-	struct itemtemp mapitem;
 	if (char_id!=p->char_id) return 0;
 
-	save_flag = p->char_id;
+	cp = (struct mmo_charstatus*)numdb_search(char_db_,char_id);
 
-	#ifdef DEBUG
+	if (cp == NULL) {
+		cp = (struct mmo_charstatus *) aMalloc(sizeof(struct mmo_charstatus));
+    		memset(cp, 0, sizeof(struct mmo_charstatus));
+		numdb_insert(char_db_, char_id,cp);
+	}
+
+	save_flag = p->char_id;
 	printf("(\033[1;32m%d\033[0m) %s \trequest save char data - ",char_id,char_dat[0].name);
-	#endif
 
-	sql_query("START TRANSACTION","mmo_char_tosql");
+//for(testcount=1;testcount<50;testcount++){//---------------------------test count--------------------
+//	printf("test count : %d\n", testcount);
+//	eqcount=1;
+//	noteqcount=1;
+//	dbeqcount=1;
+//	dbnoteqcount=1;
+//-----------------------------------------------------------------------------------------------------
 
 //=========================================map  inventory data > memory ===============================
+	diff = 0;
+
 	//map inventory data
 	for(i=0;i<MAX_INVENTORY;i++){
+			if (!compare_item(&p->inventory[i], &cp->inventory[i]))
+				diff = 1;
 		if(p->inventory[i].nameid>0){
-			mapitem.equip[eqcount].flag=0;
-			mapitem.equip[eqcount].id = p->inventory[i].id;
-			mapitem.equip[eqcount].nameid=p->inventory[i].nameid;
-			mapitem.equip[eqcount].amount = p->inventory[i].amount;
-			mapitem.equip[eqcount].equip = p->inventory[i].equip;
-			mapitem.equip[eqcount].identify = p->inventory[i].identify;
-			mapitem.equip[eqcount].refine = p->inventory[i].refine;
-			mapitem.equip[eqcount].attribute = p->inventory[i].attribute;
-			mapitem.equip[eqcount].card[0] = p->inventory[i].card[0];
-			mapitem.equip[eqcount].card[1] = p->inventory[i].card[1];
-			mapitem.equip[eqcount].card[2] = p->inventory[i].card[2];
-			mapitem.equip[eqcount].card[3] = p->inventory[i].card[3];
-			eqcount++;
+			mapitem[count].flag=0;
+			mapitem[count].id = p->inventory[i].id;
+			mapitem[count].nameid=p->inventory[i].nameid;
+			mapitem[count].amount = p->inventory[i].amount;
+			mapitem[count].equip = p->inventory[i].equip;
+			mapitem[count].identify = p->inventory[i].identify;
+			mapitem[count].refine = p->inventory[i].refine;
+			mapitem[count].attribute = p->inventory[i].attribute;
+			mapitem[count].card[0] = p->inventory[i].card[0];
+			mapitem[count].card[1] = p->inventory[i].card[1];
+			mapitem[count].card[2] = p->inventory[i].card[2];
+			mapitem[count].card[3] = p->inventory[i].card[3];
+			count++;
 		}
 	}
-
-	memitemdata_to_sql2(mapitem, eqcount, p->char_id,TABLE_INVENTORY);
-
-    #ifdef DEBUG
-	printf("Char [%s] - Save item data to SQL!\n",p->name);
-	#endif
+	//printf("- Save item data to MySQL!\n");
+	if (diff)
+		  memitemdata_to_sql(mapitem, count, p->char_id,TABLE_INVENTORY);
 
 //=========================================map  cart data > memory ====================================
-	eqcount=1;
+//	eqcount=1;
+//	noteqcount=1;
+	count = 0;
+	diff = 0;
 
 	//map cart data
 	for(i=0;i<MAX_CART;i++){
+	        if (!compare_item(&p->cart[i], &cp->cart[i]))
+		        diff = 1;
 		if(p->cart[i].nameid>0){
-			mapitem.equip[eqcount].flag=0;
-			mapitem.equip[eqcount].id = p->cart[i].id;
-			mapitem.equip[eqcount].nameid=p->cart[i].nameid;
-			mapitem.equip[eqcount].amount = p->cart[i].amount;
-			mapitem.equip[eqcount].equip = p->cart[i].equip;
-			mapitem.equip[eqcount].identify = p->cart[i].identify;
-			mapitem.equip[eqcount].refine = p->cart[i].refine;
-			mapitem.equip[eqcount].attribute = p->cart[i].attribute;
-			mapitem.equip[eqcount].card[0] = p->cart[i].card[0];
-			mapitem.equip[eqcount].card[1] = p->cart[i].card[1];
-			mapitem.equip[eqcount].card[2] = p->cart[i].card[2];
-			mapitem.equip[eqcount].card[3] = p->cart[i].card[3];
-			eqcount++;
+			mapitem[count].flag=0;
+			mapitem[count].id = p->cart[i].id;
+			mapitem[count].nameid=p->cart[i].nameid;
+			mapitem[count].amount = p->cart[i].amount;
+			mapitem[count].equip = p->cart[i].equip;
+			mapitem[count].identify = p->cart[i].identify;
+			mapitem[count].refine = p->cart[i].refine;
+			mapitem[count].attribute = p->cart[i].attribute;
+			mapitem[count].card[0] = p->cart[i].card[0];
+			mapitem[count].card[1] = p->cart[i].card[1];
+			mapitem[count].card[2] = p->cart[i].card[2];
+			mapitem[count].card[3] = p->cart[i].card[3];
+			count++;
 		}
 	}
 
-	memitemdata_to_sql2(mapitem, eqcount, p->char_id,TABLE_CART);
+	//printf("- Save cart data to MySQL!\n");
+	if (diff)
+	    memitemdata_to_sql(mapitem, count, p->char_id,TABLE_CART);
 
-	#ifdef DEBUG
-    printf("Char [%s] - Save cart data to SQL!\n",p->name);
-    #endif
+//=====================================================================================================
 
+	if ((p->base_exp != cp->base_exp) || (p->class_ != cp->class_) ||
+	    (p->base_level != cp->base_level) || (p->job_level != cp->job_level) ||
+	    (p->job_exp != cp->job_exp) || (p->zeny != cp->zeny) ||
+	    (p->last_point.x != cp->last_point.x) || (p->last_point.y != cp->last_point.y) ||
+	    (p->max_hp != cp->max_hp) || (p->hp != cp->hp) ||
+	    (p->max_sp != cp->max_sp) || (p->sp != cp->sp) ||
+	    (p->status_point != cp->status_point) || (p->skill_point != cp->skill_point) ||
+	    (p->str != cp->str) || (p->agi != cp->agi) || (p->vit != cp->vit) ||
+	    (p->int_ != cp->int_) || (p->dex != cp->dex) || (p->luk != cp->luk) ||
+	    (p->option != cp->option) || (p->karma != cp->karma) || (p->manner != cp->manner) ||
+	    (p->party_id != cp->party_id) || (p->guild_id != cp->guild_id) ||
+	    (p->pet_id != cp->pet_id) || (p->hair != cp->hair) || (p->hair_color != cp->hair_color) ||
+	    (p->clothes_color != cp->clothes_color) || (p->weapon != cp->weapon) ||
+	    (p->shield != cp->shield) || (p->head_top != cp->head_top) ||
+	    (p->head_mid != cp->head_mid) || (p->head_bottom != cp->head_bottom) ||
+	    (p->partner_id != cp->partner_id) || (p->father != cp->father) ||
+	    (p->mother != cp->mother) || (p->child != cp->child)) {
+
+//}//---------------------------test count------------------------------
 	//check party_exist
-	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `party_id` = '%d'",party_db, p->party_id);
-	sql_query(tmp_sql,"mmo_char_tosql");
-
-	if((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res)))
-	    if(!atoi(sql_row[0]))
-	        p->party_id=0;
-
+	party_exist=0;
+	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `party_id` = '%d'",party_db, p->party_id); // TBR
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+	}
+	sql_res = mysql_store_result(&mysql_handle);
+	sql_row = mysql_fetch_row(sql_res);
+	if (sql_row) party_exist = atoi(sql_row[0]);
 	mysql_free_result(sql_res);
 
 	//check guild_exist
-	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `guild_id` = '%d'",guild_db, p->guild_id);
-	sql_query(tmp_sql,"mmo_char_tosql");
-
-	if((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res)))
-	    if(!atoi(sql_row[0]))
-	        p->guild_id=0;
-
+	guild_exist=0;
+	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `guild_id` = '%d'",guild_db, p->guild_id); // TBR
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+	}
+	sql_res = mysql_store_result(&mysql_handle);
+	sql_row = mysql_fetch_row(sql_res);
+	if (sql_row) guild_exist = atoi(sql_row[0]);
 	mysql_free_result(sql_res);
 
+	if (guild_exist==0) p->guild_id=0;
+	if (party_exist==0) p->party_id=0;
+
 	//sql query
 	//`char`( `char_id`,`account_id`,`char_num`,`name`,`class`,`base_level`,`job_level`,`base_exp`,`job_exp`,`zeny`, //9
 	//`str`,`agi`,`vit`,`int`,`dex`,`luk`, //15
@@ -373,8 +456,8 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus *p){
 		"`str`='%d',`agi`='%d',`vit`='%d',`int`='%d',`dex`='%d',`luk`='%d',"
 		"`option`='%d',`karma`='%d',`manner`='%d',`party_id`='%d',`guild_id`='%d',`pet_id`='%d',"
 		"`hair`='%d',`hair_color`='%d',`clothes_color`='%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',`partner_id`='%d' WHERE  `account_id`='%d' AND `char_id` = '%d'",
-		char_db, p->class, p->base_level, p->job_level,
+		"`last_map`='%s',`last_x`='%d',`last_y`='%d',`save_map`='%s',`save_x`='%d',`save_y`='%d',`partner_id`='%d', `father`='%d', `mother`='%d', `child`='%d' WHERE  `account_id`='%d' AND `char_id` = '%d'",
+		char_db, p->class_, p->base_level, p->job_level,
 		p->base_exp, p->job_exp, p->zeny,
 		p->max_hp, p->hp, p->max_sp, p->sp, p->status_point, p->skill_point,
 		p->str, p->agi, p->vit, p->int_, p->dex, p->luk,
@@ -382,351 +465,252 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus *p){
 		p->hair, p->hair_color, p->clothes_color,
 		p->weapon, p->shield, p->head_top, p->head_mid, p->head_bottom,
 		p->last_point.map, p->last_point.x, p->last_point.y,
-		p->save_point.map, p->save_point.x, p->save_point.y, p->partner_id, p->account_id, p->char_id
+		p->save_point.map, p->save_point.x, p->save_point.y, p->partner_id, p->father, p->mother,
+		p->child, p->account_id, p->char_id
 	);
 
-	sql_query(tmp_sql,"mmo_char_tosql");
+	if(mysql_query(&mysql_handle, tmp_sql)) {
+			printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle));
+	}
 
-	#ifdef DEBUG
-	printf("Char [%s] - Saved Char data to SQL!\n",p->name);
-	#endif
+	}
 
-	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",memo_db,char_id);
-	sql_query(tmp_sql,"mmo_char_tosql");
+	diff = 0;
 
-	sprintf(tmp_sql,"INSERT INTO `%s`(`char_id`,`map`,`x`,`y`) VALUES ",memo_db);
 	for(i=0;i<10;i++){
-	    if(i)
- 	        sprintf(tmp_sql,"%s,",tmp_sql);
+	  if((strcmp(p->memo_point[i].map,cp->memo_point[i].map) == 0) && (p->memo_point[i].x == cp->memo_point[i].x) && (p->memo_point[i].y == cp->memo_point[i].y))
+	    continue;
+	  diff = 1;
+	  break;
+	}
 
-		if(p->memo_point[i].map[0])
-			sprintf(tmp_sql,"%s('%d', '%s', '%d', '%d')",tmp_sql,
-				char_id, p->memo_point[i].map, p->memo_point[i].x, p->memo_point[i].y);
+	if (diff) {
+	//printf("- Save memo data to MySQL!\n");
+	//`memo` (`memo_id`,`char_id`,`map`,`x`,`y`)
+	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",memo_db, p->char_id);
+	if(mysql_query(&mysql_handle, tmp_sql)) {
+			printf("DB server Error (delete `memo`)- %s\n", mysql_error(&mysql_handle));
 	}
 
-	sql_query(tmp_sql,"mmo_char_tosql");
+	//insert here.
+	for(i=0;i<10;i++){
+		if(p->memo_point[i].map[0]){
+			sprintf(tmp_sql,"INSERT INTO `%s`(`char_id`,`map`,`x`,`y`) VALUES ('%d', '%s', '%d', '%d')",
+				memo_db, char_id, p->memo_point[i].map, p->memo_point[i].x, p->memo_point[i].y);
+			if(mysql_query(&mysql_handle, tmp_sql))
+				printf("DB server Error (insert `memo`)- %s\n", mysql_error(&mysql_handle));
+		}
+	}
+	}
 
-	#ifdef DEBUG
-	printf("Char [%s] - Saved memo data to SQL!\n",p->name);
-	#endif
+	diff = 0;
+	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
 
-	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",skill_db,char_id);
-	sql_query(tmp_sql,"mmo_char_tosql");
+            if((p->skill[i].id != cp->skill[i].id) || (p->skill[i].lv != cp->skill[i].lv) ||
+                (p->skill[i].flag != cp->skill[i].flag)) {
+                diff = 1;
+                break;
+            }
+        }
 
-	sprintf(tmp_sql,"INSERT INTO `%s`(`char_id`, `id`, `lv`) VALUES ",skill_db);
+	if (diff) {
+	//printf("- Save skill data to MySQL!\n");
+	//`skill` (`char_id`, `id`, `lv`)
+	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",skill_db, p->char_id);
+	if(mysql_query(&mysql_handle, tmp_sql)) {
+			printf("DB server Error (delete `skill`)- %s\n", mysql_error(&mysql_handle));
+	}
+	//printf("- Insert skill \n");
+	//insert here.
 	for(i=0;i<MAX_SKILL;i++){
 		if(p->skill[i].id){
 			if (p->skill[i].id && p->skill[i].flag!=1) {
-			    if(i)
- 	               sprintf(tmp_sql,"%s,",tmp_sql);
-
-				sprintf(tmp_sql,"%s('%d', '%d','%d')",tmp_sql,
-					char_id, p->skill[i].id, (p->skill[i].flag==0)?p->skill[i].lv:p->skill[i].flag-2);
+				sprintf(tmp_sql,"INSERT INTO `%s`(`char_id`, `id`, `lv`) VALUES ('%d', '%d','%d')",
+					skill_db, char_id, p->skill[i].id, (p->skill[i].flag==0)?p->skill[i].lv:p->skill[i].flag-2);
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+					printf("DB server Error (insert `skill`)- %s\n", mysql_error(&mysql_handle));
+				}
 			}
 		}
 	}
+	}
 
-	sql_query(tmp_sql,"mmo_char_tosql");
-
-	#ifdef DEBUG
-	printf("Char [%s] - Save skill data to SQL!\n",p->name);
-	#endif
+	diff = 0;
+	for(i=0;i<p->global_reg_num;i++) {
+	  if ((p->global_reg[i].str == NULL) && (cp->global_reg[i].str == NULL))
+	    continue;
+	  if (((p->global_reg[i].str == NULL) != (cp->global_reg[i].str == NULL)) ||
+	      (p->global_reg[i].value != cp->global_reg[i].value) ||
+	      strcmp(p->global_reg[i].str, cp->global_reg[i].str) != 0) {
+	    diff = 1;
+	    break;
+	  }
+	}
 
-	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d' AND `type`='3'",reg_db,char_id);
-	sql_query(tmp_sql,"mmo_char_tosql");
+	if (diff) {
+	//printf("- Save global_reg_value data to MySQL!\n");
+	//`global_reg_value` (`char_id`, `str`, `value`)
+	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `type`=3 AND `char_id`='%d'",reg_db, p->char_id);
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+			printf("DB server Error (delete `global_reg_value`)- %s\n", mysql_error(&mysql_handle));
+	}
 
-	sprintf(tmp_sql,"INSERT INTO `%s`(`char_id`, `str`, `value`) VALUES ",reg_db);
+	//insert here.
 	for(i=0;i<p->global_reg_num;i++){
 		if (p->global_reg[i].str) {
 			if(p->global_reg[i].value !=0){
-			    if(i)
- 	               sprintf(tmp_sql,"%s,",tmp_sql);
-
-                sprintf(tmp_sql,"%s('%d', '%s','%d')",tmp_sql,
-				        char_id, jstrescapecpy(temp_str,(unsigned char*)p->global_reg[i].str), p->global_reg[i].value);
+					sprintf(tmp_sql,"INSERT INTO `%s` (`char_id`, `str`, `value`) VALUES ('%d', '%s','%d')",
+					         reg_db, char_id, jstrescapecpy(temp_str,p->global_reg[i].str), p->global_reg[i].value);
+					if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error (insert `global_reg_value`)- %s\n", mysql_error(&mysql_handle));
+					}
 			}
 		}
 	}
+	}
 
-	sql_query(tmp_sql,"mmo_char_tosql");
-
-	sql_query("COMMIT","mmo_char_tosql");
-
-	#ifdef DEBUG
-	printf("Char [%s] - Save global reg data to SQL!\n",p->name);
-	printf("Char [%s] - Saving char is done.\n",p->name);
-	#endif
+	// Friends list
+	// account_id, friend_id0, name0, ...
+	#if 0
+		tmp_p += sprintf(tmp_p, "REPLACE INTO `%s` (`id`, `account_id`",friend_db);
 
-	save_flag = 0;
+		diff = 0;
 
-	return 0;
-}
+		for (i=0;i<20;i++)
+			tmp_p += sprintf(tmp_p, ", `friend_id%d`, `name%d`", i, i);
 
-int memitemdata_to_sql2(struct itemtemp mapitem, int eqcount, int char_id, int tableswitch){
-	//equ
-	int i;
-	char tablename[16];
-	char selectoption[16];
+		tmp_p += sprintf(tmp_p, ") VALUES (NULL, '%d'", char_id);
 
-	switch (tableswitch){
-	case TABLE_INVENTORY:
-		sprintf(tablename,"%s",inventory_db);
-		sprintf(selectoption,"char_id");
-		break;
-	case TABLE_CART:
-		sprintf(tablename,"%s",cart_db);
-		sprintf(selectoption,"char_id");
-		break;
-	case TABLE_STORAGE:
-		sprintf(tablename,"%s",storage_db);
-		sprintf(selectoption,"account_id");
-		break;
-	case TABLE_GUILD_STORAGE:
-		sprintf(tablename,"%s",guild_storage_db);
-		sprintf(selectoption,"guild_id");
-		break;
-	}
-
-	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `%s`='%d'",tablename,selectoption,char_id);
-	sql_query(tmp_sql,"memitemdata_to_sql");
-
-	//==============================================Memory data > SQL ===============================
+		for (i=0;i<20;i++) {
+			tmp_p += sprintf(tmp_p, ", '%d', '%s'", p->friend_id[i], p->friend_name[i]);
+			if ((p->friend_id[i] != cp->friend_id[i]) ||
+				strcmp(p->friend_name[i], cp->friend_name[i]))
+			  diff = 1;
+		}
 
-	sprintf(tmp_sql,"INSERT INTO `%s` (`%s`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`card0`,`card1`,`card2`,`card3`) VALUES ",tablename,selectoption);
+		tmp_p += sprintf(tmp_p, ")");
+	#else	// [Dino9021]
+		tmp_p += sprintf(tmp_p, "UPDATE `%s` SET ",friend_db);
 
-    for(i=1;i<eqcount;i++){
-		if(mapitem.equip[i].flag == 1) break;
+		diff = 0;
+		
+		for (i=0;i<20;i++) {
+			if (i>0)
+				tmp_p += sprintf(tmp_p, ", ");
 
-	    if(i!=1)
-	        sprintf(tmp_sql,"%s,",tmp_sql);
+			tmp_p += sprintf(tmp_p, "`friend_id%d`='%d', `name%d`='%s'", i, p->friend_id[i], i, p->friend_name[i]);
 
-		sprintf(tmp_sql,"%s('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d')",tmp_sql,char_id,
-				mapitem.equip[i].nameid, mapitem.equip[i].amount, mapitem.equip[i].equip, mapitem.equip[i].identify,
-                mapitem.equip[i].refine,mapitem.equip[i].attribute, mapitem.equip[i].card[0],mapitem.equip[i].card[1],
-                mapitem.equip[i].card[2],mapitem.equip[i].card[3]);
+			if ((p->friend_id[i] != cp->friend_id[i]) || strcmp(p->friend_name[i], cp->friend_name[i]))
+				diff = 1;
+		}
 
-                mapitem.equip[i].flag=1;
-	}
+		tmp_p += sprintf(tmp_p, " where account_id='%d';", char_id);
+	#endif
 
-	sql_query(tmp_sql,"memitemdata_to_sql");
+	if (diff)
+	  mysql_query(&mysql_handle, tmp_sql);
 
-	#ifdef DEBUG
-	printf("Char [%d] - Saved Eqip Item Data to SQL!\n",char_id);
-	#endif
+	printf("saving char is done.\n");
+	save_flag = 0;
 
+	memcpy(cp, p, sizeof(struct mmo_charstatus));
 
-    return 0;
+	return 0;
 }
 
-int memitemdata_to_sql(struct itemtemp mapitem, int eqcount, int noteqcount, int char_id, int tableswitch){
-	//equ
-	int i, j;
-	int dbeqcount = 1;
-	int dbnoteqcount = 1;
-	struct itemtemp dbitem;
-	char tablename[16];
+// [Ilpalazzo-sama]
+int memitemdata_to_sql(struct itemtmp mapitem[], int count, int char_id, int tableswitch)
+{
+	int i, flag, id;
+	char *tablename;
 	char selectoption[16];
 
-	switch (tableswitch){
+	switch (tableswitch) {
 	case TABLE_INVENTORY:
-		sprintf(tablename,"%s",inventory_db);
+		tablename = inventory_db; // no need for sprintf here as *_db are char*.
 		sprintf(selectoption,"char_id");
 		break;
 	case TABLE_CART:
-		sprintf(tablename,"%s",cart_db);
+		tablename = cart_db;
 		sprintf(selectoption,"char_id");
 		break;
 	case TABLE_STORAGE:
-		sprintf(tablename,"%s",storage_db);
+		tablename = storage_db;
 		sprintf(selectoption,"account_id");
 		break;
 	case TABLE_GUILD_STORAGE:
-		sprintf(tablename,"%s",guild_storage_db);
+		tablename = guild_storage_db;
 		sprintf(selectoption,"guild_id");
 		break;
+	default:
+		printf("Invalid table name!\n");
+		return 1;
 	}
 	//printf("Working Table : %s \n",tablename);
 
 	//=======================================mysql database data > memory===============================================
-
 	sprintf(tmp_sql, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3` "
-		"FROM `%s` WHERE `%s`='%d'",tablename ,selectoption ,char_id);
+		"FROM `%s` WHERE `%s`='%d'", tablename, selectoption, char_id);
 	if (mysql_query(&mysql_handle, tmp_sql)) {
 		printf("DB server Error (select `%s` to Memory)- %s\n",tablename ,mysql_error(&mysql_handle));
+		return 1;
 	}
 	sql_res = mysql_store_result(&mysql_handle);
 	if (sql_res) {
-		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++){
-			if (itemdb_isequip(atoi(sql_row[1]))==1){
-				dbitem.equip[dbeqcount].flag=0;
-				dbitem.equip[dbeqcount].id = atoi(sql_row[0]);
-				dbitem.equip[dbeqcount].nameid = atoi(sql_row[1]);
-				dbitem.equip[dbeqcount].amount = atoi(sql_row[2]);
-				dbitem.equip[dbeqcount].equip = atoi(sql_row[3]);
-				dbitem.equip[dbeqcount].identify = atoi(sql_row[4]);
-				dbitem.equip[dbeqcount].refine = atoi(sql_row[5]);
-				dbitem.equip[dbeqcount].attribute = atoi(sql_row[6]);
-				dbitem.equip[dbeqcount].card[0] = atoi(sql_row[7]);
-				dbitem.equip[dbeqcount].card[1] = atoi(sql_row[8]);
-				dbitem.equip[dbeqcount].card[2] = atoi(sql_row[9]);
-				dbitem.equip[dbeqcount].card[3] = atoi(sql_row[10]);
-				dbeqcount++;
-			}else {
-				dbitem.notequip[dbnoteqcount].flag=0;
-				dbitem.notequip[dbnoteqcount].id = atoi(sql_row[0]);
-				dbitem.notequip[dbnoteqcount].nameid = atoi(sql_row[1]);
-				dbitem.notequip[dbnoteqcount].amount = atoi(sql_row[2]);
-				dbitem.notequip[dbnoteqcount].equip = atoi(sql_row[3]);
-				dbitem.notequip[dbnoteqcount].identify = atoi(sql_row[4]);
-				dbitem.notequip[dbnoteqcount].refine = atoi(sql_row[5]);
-				dbitem.notequip[dbnoteqcount].attribute = atoi(sql_row[6]);
-				dbitem.notequip[dbnoteqcount].card[0] = atoi(sql_row[7]);
-				dbitem.notequip[dbnoteqcount].card[1] = atoi(sql_row[8]);
-				dbitem.notequip[dbnoteqcount].card[2] = atoi(sql_row[9]);
-				dbitem.notequip[dbnoteqcount].card[3] = atoi(sql_row[10]);
-				dbnoteqcount++;
-			}
-		}
-		mysql_free_result(sql_res);
-	}
-
-	//==============================================Memory data > SQL ===============================
-	//======================================Equip ITEM=======================================
-	if((eqcount==1) && (dbeqcount==1)){//printf("%s Equip Empty\n",tablename);
-	//item empty
-	} else {
-
-		for(i=1;i<eqcount;i++){
-			for(j=1;j<dbeqcount;j++){
-				if(mapitem.equip[i].flag==1) break;
-				if(!(dbitem.equip[j].flag==1)){
-					if(mapitem.equip[i].nameid==dbitem.equip[j].nameid){
-						if ((mapitem.equip[i].equip==dbitem.equip[j].equip) && (mapitem.equip[i].identify==dbitem.equip[j].identify) && (mapitem.equip[i].amount==dbitem.equip[j].amount) &&
-
-						    (mapitem.equip[i].refine==dbitem.equip[j].refine) && (mapitem.equip[i].attribute==dbitem.equip[j].attribute) && (mapitem.equip[i].card[0]==dbitem.equip[j].card[0]) &&
-						    (mapitem.equip[i].card[1]==dbitem.equip[j].card[1]) && (mapitem.equip[i].card[2]==dbitem.equip[j].card[2]) && (mapitem.equip[i].card[3]==dbitem.equip[j].card[3])) {
-							mapitem.equip[i].flag = 1;
-							dbitem.equip[j].flag = 1;
-							//printf("the same item : %d , equip : %d , i : %d , flag :  %d\n", mapitem.equip[i].nameid,mapitem.equip[i].equip , i, mapitem.equip[i].flag); //DEBUG-STRING
-						} else {
+		while ((sql_row = mysql_fetch_row(sql_res))) {
+			flag = 0;
+			id = atoi(sql_row[0]);
+			for(i = 0; i < count; i++) {
+				if(mapitem[i].flag == 1)
+					continue;
+				if(mapitem[i].nameid == atoi(sql_row[1])) { // produced items fixup
+					if((mapitem[i].equip == atoi(sql_row[3])) &&
+						(mapitem[i].identify == atoi(sql_row[4])) &&
+						(mapitem[i].amount == atoi(sql_row[2])) &&
+						(mapitem[i].refine == atoi(sql_row[5])) &&
+						(mapitem[i].attribute == atoi(sql_row[6])) &&
+						(mapitem[i].card[0] == atoi(sql_row[7])) &&
+						(mapitem[i].card[1] == atoi(sql_row[8])) &&
+						(mapitem[i].card[2] == atoi(sql_row[9])) &&
+						(mapitem[i].card[3] == atoi(sql_row[10]))) {
+						//printf("the same item : %d , equip : %d , i : %d , flag :  %d\n", mapitem.equip[i].nameid,mapitem.equip[i].equip , i, mapitem.equip[i].flag); //DEBUG-STRING
+					} else {
+//==============================================Memory data > SQL ===============================
+						if(itemdb_isequip(mapitem[i].nameid) || (mapitem[i].card[0] == atoi(sql_row[7]))) {
 							sprintf(tmp_sql,"UPDATE `%s` SET `equip`='%d', `identify`='%d', `refine`='%d',"
-							"`attribute`='%d', `card0`='%d', `card1`='%d', `card2`='%d', `card3`='%d', `amount`='%d' WHERE `id`='%d' LIMIT 1",
-							tablename, mapitem.equip[i].equip, mapitem.equip[i].identify, mapitem.equip[i].refine,mapitem.equip[i].attribute, mapitem.equip[i].card[0],
-							mapitem.equip[i].card[1], mapitem.equip[i].card[2], mapitem.equip[i].card[3], mapitem.equip[i].amount, dbitem.equip[j].id);
-							//printf("%s\n",tmp_sql);
+								"`attribute`='%d', `card0`='%d', `card1`='%d', `card2`='%d', `card3`='%d', `amount`='%d' WHERE `id`='%d' LIMIT 1",
+								tablename, mapitem[i].equip, mapitem[i].identify, mapitem[i].refine, mapitem[i].attribute, mapitem[i].card[0],
+								mapitem[i].card[1], mapitem[i].card[2], mapitem[i].card[3], mapitem[i].amount, id);
 							if(mysql_query(&mysql_handle, tmp_sql))
 								printf("DB server Error (UPdate `equ %s`)- %s\n", tablename, mysql_error(&mysql_handle));
-							mapitem.equip[i].flag=1;
-							dbitem.equip[j].flag=1;
-							//printf("not the same item : %d ; i : %d ; flag :  %d\n", mapitem.equip[i].nameid, i, mapitem.equip[i].flag);
 						}
+						//printf("not the same item : %d ; i : %d ; flag :  %d\n", mapitem.equip[i].nameid, i, mapitem.equip[i].flag);
 					}
+					flag = mapitem[i].flag = 1;
+					break;
 				}
 			}
-		}
-
-		//printf("dbeqcount = %d\n",dbeqcount);
-
-		for(i=1;i<dbeqcount;i++){
-			//printf("dbitem.equip[i].flag = %d , dbitem.equip[i].id = %d\n",dbitem.equip[i].flag,dbitem.equip[i].id);
-			if (!(dbitem.equip[i].flag == 1)) {
-				sprintf(tmp_sql,"DELETE from `%s` where `id`='%d'",tablename , dbitem.equip[i].id);
-				//printf("%s", tmp_sql);
-				if(mysql_query(&mysql_handle, tmp_sql))
-					printf("DB server Error (DELETE `equ %s`)- %s\n", tablename ,mysql_error(&mysql_handle));
+			if(!flag) {
+				sprintf(tmp_sql,"DELETE from `%s` where `id`='%d'", tablename, id);
+					if(mysql_query(&mysql_handle, tmp_sql))
+						printf("DB server Error (DELETE `equ %s`)- %s\n", tablename, mysql_error(&mysql_handle));
 			}
 		}
-		for(i=1;i<eqcount;i++){
-			if(!(mapitem.equip[i].flag==1)){
-				sprintf(tmp_sql,"INSERT INTO `%s`(`%s`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)"
-				" VALUES ( '%d','%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-				tablename, selectoption,  char_id, mapitem.equip[i].nameid, mapitem.equip[i].amount, mapitem.equip[i].equip, mapitem.equip[i].identify, mapitem.equip[i].refine,
-				mapitem.equip[i].attribute, mapitem.equip[i].card[0], mapitem.equip[i].card[1], mapitem.equip[i].card[2], mapitem.equip[i].card[3]);
-				//printf("%s", tmp_sql);
-				if(mysql_query(&mysql_handle, tmp_sql))
-					printf("DB server Error (INSERT `equ %s`)- %s\n",tablename ,mysql_error(&mysql_handle));
-			}
-		}
-
-		//======================================DEBUG=================================================
-
-//		gettimeofday(&tv,NULL);
-//		strftime(tmpstr,24,"%Y-%m-%d %H:%M:%S",localtime(&(tv.tv_sec)));
-//		printf("\n\n");
-//		printf("Working Table Name : EQU %s,  Count : map %3d | db %3d \n",tablename ,eqcount ,dbeqcount);
-//		printf("*********************************************************************************\n");
-//		printf("======================================MAP===================Char ID %10d===\n",char_id);
-//		printf("==flag ===name ===equip===ident===amoun===attri===card0===card1===card2===card3==\n");
-//		for(j=1;j<eqcount;j++)
-//			printf("| %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d |\n", mapitem.equip[j].flag,mapitem.equip[j].nameid, mapitem.equip[j].equip, mapitem.equip[j].identify, mapitem.equip[j].refine,mapitem.equip[j].attribute, mapitem.equip[j].card[0], mapitem.equip[j].card[1], mapitem.equip[j].card[2], mapitem.equip[j].card[3]);
-//		printf("======================================DB=========================================\n");
-//		printf("==flag ===name ===equip===ident===refin===attri===card0===card1===card2===card3==\n");
-//		for(j=1;j<dbeqcount;j++)
-//			printf("| %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d |\n", dbitem.equip[j].flag ,dbitem.equip[j].nameid, dbitem.equip[j].equip, dbitem.equip[j].identify, dbitem.equip[j].amount,dbitem.equip[j].attribute, dbitem.equip[j].card[0], dbitem.equip[j].card[1], dbitem.equip[j].card[2], dbitem.equip[j].card[3]);
-//		printf("=================================================================================\n");
-//		printf("=================================================Data Time %s===\n", tmpstr);
-//		printf("=================================================================================\n");
-
+		mysql_free_result(sql_res);
 	}
 
-	//======================================DEBUG==================================================
-
-		//=============================Not Equip ITEM==========================================
-	if((noteqcount==1) && (dbnoteqcount==1)){
-		//printf("%s Not Equip Empty\n",tablename);
-	//item empty
-	} else {
-
-		for(i=1;i<noteqcount;i++){
-			for(j=1;j<dbnoteqcount;j++){
-				if(mapitem.notequip[i].flag==1) break;
-				if(!(dbitem.notequip[j].flag==1)){
-					if(mapitem.notequip[i].nameid==dbitem.notequip[j].nameid){
-						if ((mapitem.notequip[i].amount==dbitem.notequip[j].amount) && (mapitem.notequip[i].equip==dbitem.notequip[j].equip) && (mapitem.notequip[i].identify==dbitem.notequip[j].identify)
-						&& (mapitem.notequip[i].attribute==dbitem.notequip[j].attribute))
-						{	mapitem.notequip[i].flag=1;
-							dbitem.notequip[j].flag=1;
-							//printf("the same item : %d ; i : %d ; flag :  %d\n", mapitem.notequip[i].nameid, i, mapitem.notequip[i].flag); //DEBUG-STRING
-						}
-						else{
-							sprintf(tmp_sql,"UPDATE `%s` SET `amount`='%d', `equip`='%d', `identify`='%d',"
-							"`attribute`='%d' WHERE `%s`='%d' AND `nameid`='%d'",
-							tablename, mapitem.notequip[i].amount, mapitem.notequip[i].equip, mapitem.notequip[i].identify, mapitem.notequip[i].attribute,
-							selectoption, char_id, mapitem.notequip[i].nameid);
-							//printf("%s",tmp_sql);
-							if(mysql_query(&mysql_handle, tmp_sql))
-								printf("DB server Error (UPdate `notequ %s`)- %s\n",tablename ,mysql_error(&mysql_handle));
-
-							mapitem.notequip[i].flag=1;
-							dbitem.notequip[j].flag=1;
-						}
-					}
-				}
-			}
-		}
-
-		//printf("dbnoteqcount = %d\n",dbnoteqcount);
-
-		for(i=1;i<dbnoteqcount;i++){
-			//printf("dbitem.notequip[i].flag = %d , dbitem.notequip[i].id = %d\n",dbitem.notequip[i].flag,dbitem.notequip[i].id);
-			if(!(dbitem.notequip[i].flag==1)){
-				sprintf(tmp_sql,"DELETE from `%s` where `id`='%d'", tablename, dbitem.notequip[i].id);
-				//printf("%s", tmp_sql);
-				if(mysql_query(&mysql_handle, tmp_sql))
-					printf("DB server Error (DELETE `notequ %s`)- %s\n", tablename ,mysql_error(&mysql_handle));
-			}
-		}
-		for(i=1;i<noteqcount;i++){
-			if(!(mapitem.notequip[i].flag==1)){
-				sprintf(tmp_sql,"INSERT INTO `%s`( `%s`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)"
-				" VALUES ('%d','%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-				tablename ,selectoption , char_id, mapitem.notequip[i].nameid, mapitem.notequip[i].amount, mapitem.notequip[i].equip, mapitem.notequip[i].identify, mapitem.notequip[i].refine,
-				mapitem.notequip[i].attribute, mapitem.notequip[i].card[0], mapitem.notequip[i].card[1], mapitem.notequip[i].card[2], mapitem.notequip[i].card[3]);
-				//printf("%s", tmp_sql);
-				if(mysql_query(&mysql_handle, tmp_sql))
-					printf("DB server Error (INSERT `notequ %s`)- %s\n", tablename, mysql_error(&mysql_handle));
-			}
+	for(i = 0; i < count; i++) {
+		if(!mapitem[i].flag) {
+			sprintf(tmp_sql,"INSERT INTO `%s`(`%s`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3` )"
+				" VALUES ( '%d','%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d' )",
+				tablename, selectoption,  char_id, mapitem[i].nameid, mapitem[i].amount, mapitem[i].equip, mapitem[i].identify, mapitem[i].refine,
+				mapitem[i].attribute, mapitem[i].card[0], mapitem[i].card[1], mapitem[i].card[2], mapitem[i].card[3]);
+			if(mysql_query(&mysql_handle, tmp_sql))
+				printf("DB server Error (INSERT `equ %s`)- %s\n", tablename, mysql_error(&mysql_handle));
 		}
+	}
 
 		//======================================DEBUG=================================================
 
@@ -747,21 +731,23 @@ int memitemdata_to_sql(struct itemtemp mapitem, int eqcount, int noteqcount, int
 //		printf("=================================================Data Time %s===\n", tmpstr);
 //		printf("=================================================================================\n");
 //
-	}
+
 	return 0;
 }
-
 //=====================================================================================================
 int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, int online){
-	int i=0, n=0;
+	int i, n;
+	char *tmp_p = tmp_sql;
+	struct mmo_charstatus *cp;
+
+	cp = (struct mmo_charstatus*)numdb_search(char_db_,char_id);
+	if (cp != NULL)
+	  aFree(cp);
 
 	memset(p, 0, sizeof(struct mmo_charstatus));
 
 	p->char_id = char_id;
-
-	#ifdef DEBUG
-	printf("Loading Char [%d]... ",char_id);
-	#endif
+	printf("Loaded: ");
 	//`char`( `char_id`,`account_id`,`char_num`,`name`,`class`,`base_level`,`job_level`,`base_exp`,`job_exp`,`zeny`, //9
 	//`str`,`agi`,`vit`,`int`,`dex`,`luk`, //15
 	//`max_hp`,`hp`,`max_sp`,`sp`,`status_point`,`skill_point`, //21
@@ -770,15 +756,23 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, int online){
 	//`last_map`,`last_x`,`last_y`,`save_map`,`save_x`,`save_y`)
 	//splite 2 parts. cause veeeery long SQL syntax
 
-	sprintf(tmp_sql, "SELECT * FROM `%s` WHERE `char_id` = '%d'",char_db, char_id);
+	sprintf(tmp_sql, "SELECT `char_id`,`account_id`,`char_num`,`name`,`class`,`base_level`,`job_level`,`base_exp`,`job_exp`,`zeny`,"
+		"`str`,`agi`,`vit`,`int`,`dex`,`luk`, `max_hp`,`hp`,`max_sp`,`sp`,`status_point`,`skill_point` FROM `%s` WHERE `char_id` = '%d'",char_db, char_id); // TBR
 
-	sql_query(tmp_sql,"mmo_char_fromsql");
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select `char`)- %s\n", mysql_error(&mysql_handle));
+	}
+
+	sql_res = mysql_store_result(&mysql_handle);
 
-	if ((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res))) {
+	if (sql_res) {
+		sql_row = mysql_fetch_row(sql_res);
+
+		p->char_id = char_id;
 		p->account_id = atoi(sql_row[1]);
 		p->char_num = atoi(sql_row[2]);
 		strcpy(p->name, sql_row[3]);
-		p->class = atoi(sql_row[4]);
+		p->class_ = atoi(sql_row[4]);
 		p->base_level = atoi(sql_row[5]);
 		p->job_level = atoi(sql_row[6]);
 		p->base_exp = atoi(sql_row[7]);
@@ -796,43 +790,57 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, int online){
 		p->sp = atoi(sql_row[19]);
 		p->status_point = atoi(sql_row[20]);
 		p->skill_point = atoi(sql_row[21]);
-		p->option = atoi(sql_row[22]);
-        p->karma = atoi(sql_row[23]);
-        p->manner = atoi(sql_row[24]);
-        p->party_id = atoi(sql_row[25]);
-        p->guild_id = atoi(sql_row[26]);
-        p->pet_id = atoi(sql_row[27]);
-		p->hair = atoi(sql_row[28]);
-        p->hair_color = atoi(sql_row[29]);
-        p->clothes_color = atoi(sql_row[30]);
-        p->weapon = atoi(sql_row[31]);
-        p->shield = atoi(sql_row[32]);
-		p->head_top = atoi(sql_row[33]);
-        p->head_mid = atoi(sql_row[34]);
-        p->head_bottom = atoi(sql_row[35]);
-		strcpy(p->last_point.map,sql_row[36]);
-        p->last_point.x = atoi(sql_row[37]);
-        p->last_point.y = atoi(sql_row[38]);
-        strcpy(p->save_point.map,sql_row[39]);
-        p->save_point.x = atoi(sql_row[40]);
-        p->save_point.y = atoi(sql_row[41]);
-		p->partner_id = atoi(sql_row[42]);
+		//free mysql result.
+		mysql_free_result(sql_res);
+	} else
+		printf("char1 - failed\n");	//Error?! ERRRRRR WHAT THAT SAY!?
+	printf("(\033[1;32m%d\033[0m)\033[1;32m%s\033[0m\t[",p->char_id,p->name);
+	printf("char1 ");
+
+	sprintf(tmp_sql, "SELECT `option`,`karma`,`manner`,`party_id`,`guild_id`,`pet_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` FROM `%s` WHERE `char_id` = '%d'",char_db, char_id); // TBR
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select `char2`)- %s\n", mysql_error(&mysql_handle));
+	}
+
+	sql_res = mysql_store_result(&mysql_handle);
+	if (sql_res) {
+		sql_row = mysql_fetch_row(sql_res);
+
+
+		p->option = atoi(sql_row[0]);	p->karma = atoi(sql_row[1]);	p->manner = atoi(sql_row[2]);
+			p->party_id = atoi(sql_row[3]);	p->guild_id = atoi(sql_row[4]);	p->pet_id = atoi(sql_row[5]);
+
+		p->hair = atoi(sql_row[6]);	p->hair_color = atoi(sql_row[7]);	p->clothes_color = atoi(sql_row[8]);
+		p->weapon = atoi(sql_row[9]);	p->shield = atoi(sql_row[10]);
+		p->head_top = atoi(sql_row[11]);	p->head_mid = atoi(sql_row[12]);	p->head_bottom = atoi(sql_row[13]);
+		strcpy(p->last_point.map,sql_row[14]); p->last_point.x = atoi(sql_row[15]);	p->last_point.y = atoi(sql_row[16]);
+		strcpy(p->save_point.map,sql_row[17]); p->save_point.x = atoi(sql_row[18]);	p->save_point.y = atoi(sql_row[19]);
+		p->partner_id = atoi(sql_row[20]); p->father = atoi(sql_row[21]); p->mother = atoi(sql_row[22]); p->child = atoi(sql_row[23]);
 
 		//free mysql result.
 		mysql_free_result(sql_res);
-#ifdef DEBUG
-        printf("Loading of char [%d] Completed!\n",char_id);
-	} else {
-		printf("Loading of char [%d] FAILED!\n",char_id);	//Error?! ERRRRRR WHAT THAT SAY!?
-#endif
-    }
+	} else
+		printf("char2 - failed\n");	//Error?! ERRRRRR WHAT THAT SAY!?
+
+	if (p->last_point.x == 0 || p->last_point.y == 0 || p->last_point.map[0] == '\0')
+		memcpy(&p->last_point, &start_point, sizeof(start_point));
+
+	if (p->save_point.x == 0 || p->save_point.y == 0 || p->save_point.map[0] == '\0')
+		memcpy(&p->save_point, &start_point, sizeof(start_point));
+
+	printf("char2 ");
 
 	//read memo data
 	//`memo` (`memo_id`,`char_id`,`map`,`x`,`y`)
-	sprintf(tmp_sql, "SELECT `map`,`x`,`y` FROM `%s` WHERE `char_id`='%d'",memo_db, char_id);
-	sql_query(tmp_sql,"mmo_char_fromsql");
+	sprintf(tmp_sql, "SELECT `map`,`x`,`y` FROM `%s` WHERE `char_id`='%d'",memo_db, char_id); // TBR
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select `memo`)- %s\n", mysql_error(&mysql_handle));
+	}
+	sql_res = mysql_store_result(&mysql_handle);
 
-	if ((sql_res = mysql_store_result(&mysql_handle))) {
+	if (sql_res) {
 		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++){
 			strcpy (p->memo_point[i].map,sql_row[0]);
 			p->memo_point[i].x=atoi(sql_row[1]);
@@ -841,83 +849,87 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, int online){
 		}
 		mysql_free_result(sql_res);
 	}
-#ifdef DEBUG
-	printf("Char [%s] - Memo Loaded\n",p->name);
-#endif
+	printf("memo ");
 
 	//read inventory
 	//`inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)
-	sprintf(tmp_sql, "SELECT * FROM `%s` WHERE `char_id`='%d'",inventory_db, char_id);
-	sql_query(tmp_sql,"mmo_char_fromsql");
-
-	if ((sql_res = mysql_store_result(&mysql_handle))) {
+	sprintf(tmp_sql, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`"
+		"FROM `%s` WHERE `char_id`='%d'",inventory_db, char_id); // TBR
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select `inventory`)- %s\n", mysql_error(&mysql_handle));
+	}
+	sql_res = mysql_store_result(&mysql_handle);
+	if (sql_res) {
 		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++){
-			p->inventory[i].id = atoi(sql_row[1]);
-			p->inventory[i].nameid = atoi(sql_row[2]);
-			p->inventory[i].amount = atoi(sql_row[3]);
-			p->inventory[i].equip = atoi(sql_row[4]);
-			p->inventory[i].identify = atoi(sql_row[5]);
-			p->inventory[i].refine = atoi(sql_row[6]);
-			p->inventory[i].attribute = atoi(sql_row[7]);
-			p->inventory[i].card[0] = atoi(sql_row[8]);
-			p->inventory[i].card[1] = atoi(sql_row[9]);
-			p->inventory[i].card[2] = atoi(sql_row[10]);
-			p->inventory[i].card[3] = atoi(sql_row[11]);
+			p->inventory[i].id = atoi(sql_row[0]);
+			p->inventory[i].nameid = atoi(sql_row[1]);
+			p->inventory[i].amount = atoi(sql_row[2]);
+			p->inventory[i].equip = atoi(sql_row[3]);
+			p->inventory[i].identify = atoi(sql_row[4]);
+			p->inventory[i].refine = atoi(sql_row[5]);
+			p->inventory[i].attribute = atoi(sql_row[6]);
+			p->inventory[i].card[0] = atoi(sql_row[7]);
+			p->inventory[i].card[1] = atoi(sql_row[8]);
+			p->inventory[i].card[2] = atoi(sql_row[9]);
+			p->inventory[i].card[3] = atoi(sql_row[10]);
 		}
 		mysql_free_result(sql_res);
 	}
-#ifdef DEBUG
-	printf("Char [%s] - Inventory Loaded\n",p->name);
-#endif
+	printf("inventory ");
+
 
 	//read cart.
 	//`cart_inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)
-	sprintf(tmp_sql, "SELECT * FROM `%s` WHERE `char_id`='%d'",cart_db, char_id);
-	sql_query(tmp_sql,"mmo_char_fromsql");
-
-	if ((sql_res = mysql_store_result(&mysql_handle))) {
+	sprintf(tmp_sql, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`"
+		"FROM `%s` WHERE `char_id`='%d'",cart_db, char_id); // TBR
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select `cart_inventory`)- %s\n", mysql_error(&mysql_handle));
+	}
+	sql_res = mysql_store_result(&mysql_handle);
+	if (sql_res) {
 		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++){
-			p->cart[i].id = atoi(sql_row[1]);
-			p->cart[i].nameid = atoi(sql_row[2]);
-			p->cart[i].amount = atoi(sql_row[3]);
-			p->cart[i].equip = atoi(sql_row[4]);
-			p->cart[i].identify = atoi(sql_row[5]);
-			p->cart[i].refine = atoi(sql_row[6]);
-			p->cart[i].attribute = atoi(sql_row[7]);
-			p->cart[i].card[0] = atoi(sql_row[8]);
-			p->cart[i].card[1] = atoi(sql_row[9]);
-			p->cart[i].card[2] = atoi(sql_row[10]);
-			p->cart[i].card[3] = atoi(sql_row[11]);
+			p->cart[i].id = atoi(sql_row[0]);
+			p->cart[i].nameid = atoi(sql_row[1]);
+			p->cart[i].amount = atoi(sql_row[2]);
+			p->cart[i].equip = atoi(sql_row[3]);
+			p->cart[i].identify = atoi(sql_row[4]);
+			p->cart[i].refine = atoi(sql_row[5]);
+			p->cart[i].attribute = atoi(sql_row[6]);
+			p->cart[i].card[0] = atoi(sql_row[7]);
+			p->cart[i].card[1] = atoi(sql_row[8]);
+			p->cart[i].card[2] = atoi(sql_row[9]);
+			p->cart[i].card[3] = atoi(sql_row[10]);
 		}
 		mysql_free_result(sql_res);
 	}
-#ifdef DEBUG
-	printf("Char [%s] - Cart Inventory Loaded\n",p->name);
-#endif
+	printf("cart ");
 
 	//read skill
 	//`skill` (`char_id`, `id`, `lv`)
-	sprintf(tmp_sql, "SELECT `id`, `lv` FROM `%s` WHERE `char_id`='%d'",skill_db, char_id);
-	sql_query(tmp_sql,"mmo_char_fromsql");
-
-	if ((sql_res = mysql_store_result(&mysql_handle))) {
+	sprintf(tmp_sql, "SELECT `id`, `lv` FROM `%s` WHERE `char_id`='%d'",skill_db, char_id); // TBR
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select `skill`)- %s\n", mysql_error(&mysql_handle));
+	}
+	sql_res = mysql_store_result(&mysql_handle);
+	if (sql_res) {
 		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++){
-		    n = atoi(sql_row[0]);
-			p->skill[n].id = n;
+			n = atoi(sql_row[0]);
+			p->skill[n].id = n; //memory!? shit!.
 			p->skill[n].lv = atoi(sql_row[1]);
 		}
 		mysql_free_result(sql_res);
 	}
-#ifdef DEBUG
-	printf("Char [%s] - Skills Loaded\n",p->name);
-#endif
+	printf("skill ");
 
 	//global_reg
 	//`global_reg_value` (`char_id`, `str`, `value`)
-	sprintf(tmp_sql, "SELECT `str`, `value` FROM `%s` WHERE `type`=3 AND `char_id`='%d'",reg_db, char_id);
-	sql_query(tmp_sql,"mmo_char_fromsql");
-
-	if ((sql_res = mysql_store_result(&mysql_handle))) {
+	sprintf(tmp_sql, "SELECT `str`, `value` FROM `%s` WHERE `type`=3 AND `char_id`='%d'",reg_db, char_id); // TBR
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select `global_reg_value`)- %s\n", mysql_error(&mysql_handle));
+	}
+	i = 0;
+	sql_res = mysql_store_result(&mysql_handle);
+	if (sql_res) {
 		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++){
 			strcpy (p->global_reg[i].str, sql_row[0]);
 			p->global_reg[i].value = atoi (sql_row[1]);
@@ -925,76 +937,152 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, int online){
 		mysql_free_result(sql_res);
 	}
 	p->global_reg_num=i;
-#ifdef DEBUG
-	printf("Char [%s] - Global Reg Loaded\n",p->name);
-#endif
+
+	//Friends List Load
+
+	for(i=0;i<20;i++) {
+		p->friend_id[i] = 0;
+		p->friend_name[i][0] = '\0';
+	}
+
+	tmp_p += sprintf(tmp_p, "SELECT `id`, `account_id`");
+
+	for(i=0;i<20;i++)
+		tmp_p += sprintf(tmp_p, ", `friend_id%d`, `name%d`", i, i);
+
+	tmp_p += sprintf(tmp_p, " FROM `%s` WHERE `account_id`='%d' ", friend_db, char_id); // TBR
+
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (select `friends list`)- %s\n", mysql_error(&mysql_handle));
+	}
+
+	sql_res = mysql_store_result(&mysql_handle);
+	sql_row = mysql_fetch_row(sql_res);
+
+	i=mysql_num_rows(sql_res);
+
+	// debugg
+	//printf("mysql: %d\n",i);
+
+	// Create an entry for the character if it doesnt already have one
+	if(!i) {
+
+		insert_friends(char_id);
+
+	} else {
+
+		if (sql_res) {
+			for(i=0;i<20;i++) {
+				p->friend_id[i] = atoi(sql_row[i*2 +2]);
+				sprintf(p->friend_name[i], "%s", sql_row[i*2 +3]);
+			}
+			mysql_free_result(sql_res);
+		}
+	}
+
+	printf("friends ");
+
+	//-- end friends list load --
 
 	if (online) {
-		sprintf(tmp_sql, "UPDATE `%s` SET `online`='%d' WHERE `char_id`='%d'",char_db,online,char_id);
-		sql_query(tmp_sql,"mmo_char_fromsql");
+		set_char_online(char_id,p->account_id);
 	}
-#ifdef DEBUG
-	printf("Char [%d][%s] - Loading Complete\n",char_id,p->name);
-#endif
 
+	printf("char data load success]\n");	//ok. all data load successfuly!
+
+	cp = (struct mmo_charstatus *) aMalloc(sizeof(struct mmo_charstatus));
+    	memcpy(cp, p, sizeof(struct mmo_charstatus));
+	numdb_insert(char_db_, char_id,cp);
 
 	return 1;
 }
 //==========================================================================================================
 int mmo_char_sql_init(void) {
-	int i=0;
-	#ifdef DEBUG
-	int cid=0;
-	#endif
+	int charcount;
+
+        char_db_=numdb_init();
 
+	printf("init start.......\n");
 	// memory initialize
 	// no need to set twice size in this routine. but some cause segmentation error. :P
-	#ifdef DEBUG
-	printf("Initializing char memory...(%d byte)\n",sizeof(struct mmo_charstatus)*2);
-	#endif
-
+	printf("initializing char memory...(%d byte)\n",sizeof(struct mmo_charstatus)*2);
 	CREATE(char_dat, struct mmo_charstatus, 2);
+
 	memset(char_dat, 0, sizeof(struct mmo_charstatus)*2);
+/*	Initialized in inter.c already [Wizputer]
+	// DB connection initialized
+	// for char-server session only
+	mysql_init(&mysql_handle);
+	printf("Connect DB server....(char server)\n");
+	if(!mysql_real_connect(&mysql_handle, char_server_ip, char_server_id, char_server_pw, char_server_db ,char_server_port, (char *)NULL, 0)) {
+		// SQL connection pointer check
+		printf("%s\n",mysql_error(&mysql_handle));
+		exit(1);
+	} else {
+		printf("connect success! (char server)\n");
+	}
 
+*/       /*   Removed .. not needed now :P
 	sprintf(tmp_sql , "SELECT count(*) FROM `%s`", char_db);
-	sql_query(tmp_sql,"mmo_char_sql_init");
-
-	if((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res))) {
-	    i = atoi (sql_row[0]);
-	    #ifdef DEBUG
-	    printf("Total number of chars in DB [%d]\n",i);
-	    #endif
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error - %s\n", mysql_error(&mysql_handle));
 	}
+	sql_res = mysql_store_result(&mysql_handle) ;
+	sql_row = mysql_fetch_row(sql_res);
+	printf("total char data -> '%s'.......\n",sql_row[0]);
+	i = atoi (sql_row[0]);
+	mysql_free_result(sql_res);
 
-    mysql_free_result(sql_res);
-
-	// Because it's no longer needed, I made it debug. Some people may still want to know the highest
-	// char_id. It has no functional purpose though. [Ajarn]
-	#ifdef DEBUG
-	if (i != 0) {
+	if (i !=0) {
 		sprintf(tmp_sql , "SELECT max(`char_id`) FROM `%s`", char_db);
-		sql_query(tmp_sql,"mmo_char_sql_init");
-
-		if((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res)))
-		    cid = atoi (sql_row[0]);
+		if (mysql_query(&mysql_handle, tmp_sql)) {
+			printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+		}
+		sql_res = mysql_store_result(&mysql_handle) ;
+		sql_row = mysql_fetch_row(sql_res);
+		char_id_count = atoi (sql_row[0]);
 
 		mysql_free_result(sql_res);
-	}
-	printf("Highest Char ID [%d]\n",cid);
-	#endif
+	} else
+		printf("set char_id_count: %d.......\n",char_id_count);
+         */
+         sprintf(tmp_sql, "SELECT `char_id` FROM `%s`", char_db);
+         if(mysql_query(&mysql_handle, tmp_sql)){
+         	//fail :(
+                 printf("SQL Error (in select the charid .. (all)): %s", mysql_error(&mysql_handle));
+         }else{
+         	sql_res = mysql_store_result(&mysql_handle);
+                 if(sql_res){
+                        charcount = mysql_num_rows(sql_res);
+                 	printf("total char data -> '%d'.......\n", charcount);
+                 	mysql_free_result(sql_res);
+                 }else{
+                 	printf("total char data -> '0'.......\n");
+                 }
+	}
+	
+	if(char_per_account == 0){
+	  printf("Chars per Account: 'Unlimited'.......\n");
+        }else{
+          printf("Chars per Account: '%d'.......\n", char_per_account);
+        }
 
-	if (i == 0) {
-		// If there is no characters in the SQL DB, make sure the starting id will be MIN_CHAR_ID
-		// Remove once main.sql has this to begin with and it's a standard to have it be this way
-		// (thus saving a check) [Ajarn]
-		sprintf(tmp_sql , "ALTER TABLE `%s` AUTO_INCREMENT = %d", char_db, MIN_CHAR_ID-1);
-		sql_query(tmp_sql,"mmo_char_sql_init");
-	}
+	//sprintf(tmp_sql , "REPLACE INTO `%s` SET `online`=0", char_db);   //OLD QUERY ! BUGGED
+	sprintf(tmp_sql, "UPDATE `%s` SET `online` = '0'", char_db);//fixed the on start 0 entrys!
+	if (mysql_query(&mysql_handle, tmp_sql))
+		printf("DB server Error - %s\n", mysql_error(&mysql_handle));
 
+	//sprintf(tmp_sql , "REPLACE INTO `%s` SET `online`=0", guild_member_db); //OLD QUERY ! BUGGED
+        sprintf(tmp_sql, "UPDATE `%s` SET `online` = '0'", guild_member_db);//fixed the 0 entrys in start ..
+	if (mysql_query(&mysql_handle, tmp_sql))
+		printf("DB server Error - %s\n", mysql_error(&mysql_handle));
 
-	#ifdef DEBUG
-	printf("Init finsihed\n");
-	#endif
+	//sprintf(tmp_sql , "REPLACE INTO `%s` SET `connect_member`=0", guild_db); //OLD QUERY BUGGED!
+	sprintf(tmp_sql, "UPDATE `%s` SET `connect_member` = '0'", guild_db);//fixed the 0 entrys in start.....
+	if (mysql_query(&mysql_handle, tmp_sql))
+		printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+
+	printf("init end.......\n");
 
 	return 0;
 }
@@ -1004,105 +1092,246 @@ int mmo_char_sql_init(void) {
 int make_new_char_sql(int fd, unsigned char *dat) {
 	struct char_session_data *sd;
 	char t_name[100];
-	int i, cid;
-
-	//aphostropy error check! - fixed!
-	jstrescapecpy(t_name, dat);
-
-	#ifdef DEBUG
-	printf("Making new char [%s]\n",dat);
-	#endif
+	int i, char_id, temp;
 
-	sd = session[fd]->session_data;
 
+	//aphostropy error check! - fixed!
+	jstrescapecpy(t_name, (char*)dat);
+
+	sd = (struct char_session_data*)session[fd]->session_data;
+        
+        printf("[CHAR] Add - ");
+        
+	//check for charcount (maxchars) :)
+	if(char_per_account != 0){
+          sprintf(tmp_sql, "SELECT `account_id` FROM `%s` WHERE `account_id` = '%d'", char_db, sd->account_id);
+          if(mysql_query(&mysql_handle, tmp_sql)){
+            printf("fail, SQL Error: %s !!FAIL!!\n", tmp_sql);
+          }
+          sql_res = mysql_store_result(&mysql_handle);
+          if(sql_res){
+            //ok 
+            temp = mysql_num_rows(sql_res);
+            if(temp >= char_per_account){
+              //hehe .. limit exceeded :P
+              printf("fail (aid: %d), charlimit exceeded.\n", sd->account_id);
+              mysql_free_result(sql_res);
+              return -2;
+            }
+            mysql_free_result(sql_res);          
+          }
+	}
+	
 	// Check Authorised letters/symbols in the name of the character
 	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
-		for (i = 0; i < strlen(dat); i++)
+		for (i = 0; i < strlen((const char*)dat); i++)
 			if (strchr(char_name_letters, dat[i]) == NULL)
-				return -1;
+				return -2;
 	} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
-		for (i = 0; i < strlen(dat); i++)
+		for (i = 0; i < strlen((const char*)dat); i++)
 			if (strchr(char_name_letters, dat[i]) != NULL)
-				return -1;
+				return -2;
 	} // else, all letters/symbols are authorised (except control char removed before)
 
+
 	//check stat error
 	if ((dat[24]+dat[25]+dat[26]+dat[27]+dat[28]+dat[29]!=5*6 ) ||
-	    (dat[30] >= 9) || (dat[33] <= 0) || (dat[33] >= 20) ||
+	    (dat[30] >= 9) ||
+	    (dat[33] <= 0) || (dat[33] >= 20) ||
 	    (dat[31] >= 9)) {
 
 		// check individual stat value
 		for(i = 24; i <= 29; i++) {
 			if (dat[i] < 1 || dat[i] > 9) {
-				return -1;
+				printf("fail (aid: %d), stats error(bot cheat?!)\n", sd->account_id);
+        		return -2;
 			}
 		}
 
+		if (log_char) {
+			// char.log to charlog
+			sprintf(tmp_sql,"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 error", sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
+			//query
+			mysql_query(&mysql_handle, tmp_sql);
+		}
+		//printf("make new char error %d-%d %s %d, %d, %d, %d, %d, %d %d, %d" RETCODE,
+		//	fd, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
+		
+                printf("fail (aid: %d), stats error(bot cheat?!)\n", sd->account_id);
+		return -2;
+	}
+
+	if (log_char) {
 		// char.log to charlog
-		sprintf(tmp_sql,"INSERT DELAYED INTO `%s` (`time`, `char_msg`,`account_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
+		sprintf(tmp_sql,"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 error", sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
+			charlog_db,"make new char", sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
 		//query
-		sql_query(tmp_sql,"amke_new_char_sql");
-
-		#ifdef DEBUG
-		printf("Make new char error %d-%d %s %d, %d, %d, %d, %d, %d %d, %d" RETCODE,
-			fd, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
-		#endif
+		if (mysql_query(&mysql_handle, tmp_sql)) {
+			printf("fail(log error), SQL error: %s\n", mysql_error(&mysql_handle));
+		}
+	}
+	//printf("make new char %d-%d %s %d, %d, %d, %d, %d, %d - %d, %d" RETCODE,
+	//	fd, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
 
+	//Check Name (already in use?)
+	sprintf(tmp_sql, "SELECT `name` FROM `%s` WHERE `name` = '%s'",char_db, t_name);
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("fail (namecheck!), SQL error: %s\n", mysql_error(&mysql_handle));
+		return -2;
+	}
+	sql_res = mysql_store_result(&mysql_handle);
+	if(sql_res){
+	  temp = mysql_num_rows(sql_res);
+	
+	  if (temp > 0) {
+		mysql_free_result(sql_res);
+		printf("fail, charname already in use\n");
 		return -1;
+          }
+	mysql_free_result(sql_res);
 	}
 
-	// char.log to charlog
-	sprintf(tmp_sql,"INSERT DELAYED 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, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
-	//query
-	sql_query(tmp_sql,"make_new_char_sql");
-
-	#ifdef DEBUG
-	printf("make new char %d-%d %s %d, %d, %d, %d, %d, %d - %d, %d" RETCODE,
-		fd, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[33], dat[31]);
-	#endif
-
 	// check char slot.
-	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d'",char_db, sd->account_id, dat[30]);
-	sql_query(tmp_sql,"make_new_char_sql");
-
-	if((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res))) {
-	    if (atoi(sql_row[0]) > 0) {
-	        mysql_free_result(sql_res);
-	        return -1;
-        } else
-		    mysql_free_result(sql_res);
+	sprintf(tmp_sql, "SELECT `account_id`, `char_num` FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d'",char_db, sd->account_id, dat[30]);
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("fail (charslot check), SQL error: %s\n", mysql_error(&mysql_handle));
 	}
+	sql_res = mysql_store_result(&mysql_handle);
+	
+	if(sql_res){
+	  temp = mysql_num_rows(sql_res);
 
+	  if (temp > 0) {
+		mysql_free_result(sql_res);
+		printf("fail (aid: %d, slot: %d), slot already in use\n", sd->account_id, dat[30]);
+		return -2;
+          } 
+	  mysql_free_result(sql_res);
+        }
+  	
 	//char_id_count++;
 
-    // make new char.
-    sprintf(tmp_sql,"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 , dat[30] , t_name, start_zeny, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29],
-			(40 * (100 + dat[26])/100) , (40 * (100 + dat[26])/100 ),  (11 * (100 + dat[27])/100), (11 * (100 + dat[27])/100), dat[33], dat[31],
-        start_point.map,start_point.x,start_point.y, start_point.map,start_point.x,start_point.y);
+	// make new char.
+         /*
+	sprintf(tmp_sql,"INSERT INTO `%s` (`char_id`,`account_id`,`char_num`,`name`,`zeny`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`max_hp`,`hp`,`max_sp`,`sp`,`hair`,`hair_color`)"
+		" VALUES ('%d', '%d', '%d', '%s', '%d',  '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d','%d', '%d','%d', '%d')",
+		 char_db, char_id_count, sd->account_id , dat[30] , t_name, start_zeny, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29],
+		(40 * (100 + dat[26])/100) , (40 * (100 + dat[26])/100 ),  (11 * (100 + dat[27])/100), (11 * (100 + dat[27])/100), dat[33], dat[31]);
 	if (mysql_query(&mysql_handle, tmp_sql)) {
-		printf("DB server Error (insert new char into `char`)- %s\n", mysql_error(&mysql_handle));
-		return -1;
+		printf("DB server Error (insert `char`)- %s\n", mysql_error(&mysql_handle));
 	}
 
-	cid = mysql_last_insert_id(sql_res);
-
 	//`inventory` (`id`,`char_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `card0`, `card1`, `card2`, `card3`)
-	sprintf(tmp_sql,"INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `equip`, `identify`) VALUES ('%d', '%d', '%d', '%d', '%d'),('%d', '%d', '%d', '%d', '%d')",
-			inventory_db, cid, 1201,1,0x02,1,cid,2301,1,0x10,1); //add Knife and Cotton Shirt
-	sql_query(tmp_sql,"make_new_char_sql");
+	sprintf(tmp_sql,"INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `equip`, `identify`) VALUES ('%d', '%d', '%d', '%d', '%d')",
+		inventory_db, char_id_count, 1201,1,0x02,1); //add Knife
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (insert `inventory`)- %s\n", mysql_error(&mysql_handle));
+	}
+
+	sprintf(tmp_sql,"INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `equip`, `identify`) VALUES ('%d', '%d', '%d', '%d', '%d')",
+		inventory_db, char_id_count, 2301,1,0x10,1); //add Cotton Shirt
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (insert `inventory`)- %s\n", mysql_error(&mysql_handle));
+	}
+	// respawn map and start point set
+	sprintf(tmp_sql,"UPDATE `%s` SET `last_map`='%s',`last_x`='%d',`last_y`='%d',`save_map`='%s',`save_x`='%d',`save_y`='%d'  WHERE  `char_id` = '%d'",
+		char_db, start_point.map,start_point.x,start_point.y, start_point.map,start_point.x,start_point.y, char_id_count);
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle));
+	}
+
+
+	// Insert friends list
+	insert_friends(char_id_count);
+           */
+
+         //New Querys [Sirius]
+         //Insert the char to the 'chardb' ^^
+         sprintf(tmp_sql, "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 , dat[30] , t_name, start_zeny, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], (40 * (100 + dat[26])/100) , (40 * (100 + dat[26])/100 ),  (11 * (100 + dat[27])/100), (11 * (100 + dat[27])/100), dat[33], dat[31], start_point.map, start_point.x, start_point.y, start_point.map, start_point.x, start_point.y);
+         if(mysql_query(&mysql_handle, tmp_sql)){
+         	printf("failed (insert in chardb), SQL error: %s\n", mysql_error(&mysql_handle));
+         	return -2; //No, stop the procedure!
+         }
+
+         //Now we need the charid from sql!
+         sprintf(tmp_sql, "SELECT `char_id` FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' AND `name` = '%s'", char_db, sd->account_id , dat[30] , t_name);
+         if(mysql_query(&mysql_handle, tmp_sql)){
+         	printf("failed (get char_id), SQL error: %s\n", mysql_error(&mysql_handle));
+               	//delete the char ..(no trash in DB!)
+                 sprintf(tmp_sql, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' AND `name` = '%s'", char_db, sd->account_id, dat[30], t_name);
+                 mysql_query(&mysql_handle, tmp_sql);
+                 return -2; //XD end of the (World? :P) .. charcreate (denied)
+         }else{
+         	//query ok -> get the data!
+                 sql_res = mysql_store_result(&mysql_handle);
+                 if(sql_res){
+                 	sql_row = mysql_fetch_row(sql_res);
+                         char_id = atoi(sql_row[0]); //char id :)
+                         mysql_free_result(sql_res);
+                         if(char_id <= 0){
+                         	printf("failed (get char id..) CHARID wrong!\n");
+                                 sprintf(tmp_sql, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' AND `name` = '%s'", char_db, sd->account_id, dat[30], t_name);
+                                 mysql_query(&mysql_handle, tmp_sql);
+                                 return -2; //charcreate denied ..
+                         }
+                 }else{
+                 	//prevent to crash (if its false, and we want to free -> segfault :)
+                 	printf("failed (get char id.. res), SQL error: %s\n", mysql_error(&mysql_handle));
+	                sprintf(tmp_sql, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' AND `name` = '%s'", char_db, sd->account_id, dat[30], t_name);
+	                mysql_query(&mysql_handle, tmp_sql);
+                         return -2; //end ...... -> charcreate failed :)
+                 }
+         }
+
+         //Give the char the default items
+         //knife
+	sprintf(tmp_sql,"INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `equip`, `identify`) VALUES ('%d', '%d', '%d', '%d', '%d')", inventory_db, char_id, 1201,1,0x02,1); //add Knife
+	if (mysql_query(&mysql_handle, tmp_sql)){
+		printf("fail (insert in inventory  the 'knife'), SQL error: %s\n", mysql_error(&mysql_handle));
+	        sprintf(tmp_sql, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' AND `name` = '%s'", char_db, sd->account_id, dat[30], t_name);
+	        mysql_query(&mysql_handle, tmp_sql);
+                 return -2;//end XD
+         }
+         //cotton shirt
+	sprintf(tmp_sql,"INSERT INTO `%s` (`char_id`,`nameid`, `amount`, `equip`, `identify`) VALUES ('%d', '%d', '%d', '%d', '%d')", inventory_db, char_id, 2301,1,0x10,1); //add Cotton Shirt
+	if (mysql_query(&mysql_handle, tmp_sql)){
+		printf("fail (insert in inventroxy the 'cotton shirt'), SQL error: %s\n", mysql_error(&mysql_handle));
+	        sprintf(tmp_sql, "DELETE FROM `%s` WHERE `account_id` = '%d' AND `char_num` = '%d' AND `name` = '%s'", char_db, sd->account_id, dat[30], t_name);
+	        mysql_query(&mysql_handle, tmp_sql);
+                 sprintf(tmp_sql, "DELETE FROM `%s` WHERE `char_id` = '%d'", inventory_db, char_id);
+                 mysql_query(&mysql_handle, tmp_sql);
+                 return -2; //end....
+         }
+
+         if(!insert_friends(char_id)){
+          	printf("fail (friendlist entrys..)\n");
+                 sprintf(tmp_sql, "DELETE FROM `%s` WHERE `char_id` = '%d'", char_db, char_id);
+                 mysql_query(&mysql_handle, tmp_sql);
+                 sprintf(tmp_sql, "DELETE FROM `%s` WHERE `char_id` = '%d'", inventory_db, char_id);
+                 mysql_query(&mysql_handle, tmp_sql);
+                 return -2; //end.. charcreate failed
+         }
+
+	//printf("making new char success - id:(\033[1;32m%d\033[0m\tname:\033[1;32%s\033[0m\n", char_id, t_name);
+	printf("success, aid: %d, cid: %d, slot: %d, name: %s\n", sd->account_id, char_id, dat[30], t_name);
+	return char_id;
+}
+
+//==========================================================================================================
+
+void mmo_char_sync(void){
+	printf("mmo_char_sync() - nothing to do\n");
+}
 
-	#ifdef DEBUG
-    printf("Make new char success - id:(\033[1;32m%d\033[0m\tname:\033[1;32%s\033[0m\n", cid, t_name);
-    #endif
+// to do
+///////////////////////////
 
-	return cid;
+int mmo_char_sync_timer(int tid, unsigned int tick, int id, int data) {
+	printf("mmo_char_sync_timer() tic - no works to do\n");
+	return 0;
 }
 
 int count_users(void) {
@@ -1110,7 +1339,7 @@ int count_users(void) {
 
 	if (login_fd > 0 && session[login_fd]){
 		users = 0;
-		for(i = 0; i < MAX_MAP_SERVERS && i < servers_connected; i++) {
+		for(i = 0; i < MAX_MAP_SERVERS; i++) {
 			if (server_fd[i] >= 0) {
 				users += server[i].users;
 			}
@@ -1120,52 +1349,40 @@ int count_users(void) {
 	return 0;
 }
 
-int send_users_tologin(int tid, unsigned int tick, int id, int data) {
-	int users = count_users();
-	char buf[16];
-
-	if (login_fd > 0 && session[login_fd]) {
-		// send number of user to login server
-		WFIFOW(login_fd,0) = 0x2714;
-		WFIFOL(login_fd,2) = users;
-		WFIFOSET(login_fd,6);
-	}
-	// send number of players to all map-servers
-	WBUFW(buf,0) = 0x2b00;
-	WBUFL(buf,2) = users;
-	mapif_sendall(buf, 6);
-
-	return 0;
-}
-
-
-
 int mmo_char_send006b(int fd, struct char_session_data *sd) {
 	int i, j, found_num = 0;
 	struct mmo_charstatus *p = NULL;
-
+// hehe. commented other. anyway there's no need to use older version.
+// if use older packet version just uncomment that!
+//#ifdef NEW_006b
 	const int offset = 24;
+//#else
+//	int offset = 4;
+//#endif
 
-	#ifdef DEBUG
-	printf("Send Chars (account:%d)\n",sd->account_id);
-	#endif
+	printf("mmo_char_send006b start.. (account:%d)\n",sd->account_id);
+//	printf("offset -> %d...\n",offset);
+
+    set_char_online(99,sd->account_id);
 
 	//search char.
 	sprintf(tmp_sql, "SELECT `char_id` FROM `%s` WHERE `account_id` = '%d'",char_db, sd->account_id);
-	sql_query(tmp_sql,"mmo_char_send006b");
-
-	if ((sql_res = mysql_store_result(&mysql_handle))) {
+	if (mysql_query(&mysql_handle, tmp_sql)) {
+		printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+	}
+	sql_res = mysql_store_result(&mysql_handle);
+	if (sql_res) {
 		found_num = mysql_num_rows(sql_res);
-
-		#ifdef DEBUG
 		printf("number of chars: %d\n", found_num);
-		#endif
-
-		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++)
+		i = 0;
+		while((sql_row = mysql_fetch_row(sql_res))) {
 			sd->found_char[i] = atoi(sql_row[0]);
+			i++;
+		}
+		mysql_free_result(sql_res);
 	}
 
-	mysql_free_result(sql_res);
+//	printf("char fetching end (total: %d)....\n", found_num);
 
 	for(i = found_num; i < 9; i++)
 		sd->found_char[i] = -1;
@@ -1174,9 +1391,7 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) {
 	WFIFOW(fd, 0) = 0x6b;
 	WFIFOW(fd, 2) = offset + found_num * 106;
 
-	#ifdef DEBUG
 	printf("(\033[1;13m%d\033[0m) Request Char Data:\n",sd->account_id);
-	#endif
 
 	for(i = 0; i < found_num; i++) {
 		mmo_char_fromsql(sd->found_char[i], char_dat, 0);
@@ -1204,9 +1419,15 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) {
 		WFIFOW(fd,j+46) = (p->sp > 0x7fff) ? 0x7fff : p->sp;
 		WFIFOW(fd,j+48) = (p->max_sp > 0x7fff) ? 0x7fff : p->max_sp;
 		WFIFOW(fd,j+50) = DEFAULT_WALK_SPEED; // p->speed;
-		WFIFOW(fd,j+52) = p->class;
+		WFIFOW(fd,j+52) = p->class_;
 		WFIFOW(fd,j+54) = p->hair;
-		WFIFOW(fd,j+56) = p->weapon;
+
+		// pecopeco knights/crusaders crash fix
+		if (p->class_ == 13 || p->class_ == 21 ||
+			p->class_ == 4014 || p->class_ == 4022)
+			WFIFOW(fd,j+56) = 0;
+		else WFIFOW(fd,j+56) = p->weapon;
+
 		WFIFOW(fd,j+58) = p->base_level;
 		WFIFOW(fd,j+60) = p->skill_point;
 		WFIFOW(fd,j+62) = p->head_bottom;
@@ -1228,246 +1449,22 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) {
 	}
 
 	WFIFOSET(fd,WFIFOW(fd,2));
-
-	#ifdef DEBUG
-	printf("Sent [%d] Chars to [%d]\n",found_num,sd->account_id);
-	#endif
-
+//	printf("mmo_char_send006b end..\n");
 	return 0;
 }
 
-int reply_login_request(int fd, int len) {
-    if (len < 3)
-        return -1;
-
-	if (RFIFOB(fd, 2)) {
-		printf("Can not connect to login-server.\n");
-		printf("The server communication passwords (default s1/p1) is probably invalid.\n");
-		printf("Also, please make sure your login db has the username/password present and the sex of the account is S.\n");
-		printf("If you changed the communication passwords, change them back at map_athena.conf and char_athena.conf\n");
-		return -1;
-	}else {
-		printf("Connected to login-server (connection #%d).\n", fd);
-		// if no map-server already connected, display a message...
-		if(!servers_connected)
-			printf("Awaiting maps from map-server.\n");
-
-		// send USER COUNT PING to login server.
-		#ifdef DEBUG
-		printf("Add timer: (send_users_tologin)\n");
-		#endif
-
-		user_count_timer = add_timer_interval(gettick() + 10, send_users_tologin, 0, 0, 5 * 1000);
-	}
-
-	RFIFOSKIP(fd, 3);
-
-	return 0;
-}
-
-int send_chars(int fd, int len) {
-	if(len<51)
-		return -1;
-
-	int i;
-	struct char_session_data *sd;
-
-	for(i = 0; i < fd_max; i++) {
-		if (session[i] && (sd = session[i]->session_data) && sd->account_id == RFIFOL(fd,2)) {
-			if (RFIFOB(fd,6) != 0) {
-				WFIFOW(i,0) = 0x6c;
-				WFIFOB(i,2) = 0x42;
-				WFIFOSET(i,3);
-			} else if (max_connect_user == 0 || count_users() < max_connect_user) {
-			    sd->connect_until_time = (time_t)RFIFOL(fd,47);
-				// send characters to player
-				mmo_char_send006b(i, sd);
-			} else {
-				// refuse connection: too much online players
-				WFIFOW(i,0) = 0x6c;
-				WFIFOW(i,2) = 0;
-				WFIFOSET(i,3);
-			}
-		}
-	}
-	RFIFOSKIP(fd,51);
-
-	return 0;
-}
-
-int connect_until_reply(int fd, int len) {
-	if (len < 50)
-		return -1;
-
-	int i;
-	struct char_session_data *sd;
-
-	for(i = 0; i < fd_max; i++) {
-		if (session[i] && (sd = session[i]->session_data)) {
-			if (sd->account_id == RFIFOL(fd,2)) {
-			   sd->connect_until_time = (time_t)RFIFOL(fd,46);
-			   break;
-			}
-		}
-	}
-
-	RFIFOSKIP(fd,50);
-
-	return 0;
-}
-
-// changesex reply (modified by [Yor])
-int change_sex_reply(int fd, int len) {
-	if (len < 7)
-		return -1;
-
-	int acc, sex, i;
-	unsigned char buf[16];
-	struct char_session_data *sd;
-
-	acc = RFIFOL(fd,2);
-	sex = RFIFOB(fd,6);
-	RFIFOSKIP(fd, 7);
-
-	if (acc > 0) {
-		sprintf(tmp_sql, "SELECT `char_id`,`class`,`skill_point` FROM `%s` WHERE `account_id` = '%d'",char_db, acc);
-		sql_query(tmp_sql,"change_sex_reply");
-
-		if ((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res))) {
-			int char_id, jobclass, skill_point, char_class;
-
-			char_id = atoi(sql_row[0]);
-			jobclass = atoi(sql_row[1]);
-			skill_point = atoi(sql_row[2]);
-			char_class = jobclass;
-
-			if (jobclass == 19 || jobclass == 20 ||
-			    jobclass == 4020 || jobclass == 4021 ||
-			    jobclass == 4042 || jobclass == 4043) {
-
-		        // job modification
-		        if (jobclass == 19 || jobclass == 20) {
-					char_class = (sex) ? 19 : 20;
-				} else if (jobclass == 4020 || jobclass == 4021) {
-					char_class = (sex) ? 4020 : 4021;
-				} else if (jobclass == 4042 || jobclass == 4043) {
-					char_class = (sex) ? 4042 : 4043;
-				}
-
-				// remove specifical skills of classes 19,20 4020,4021 and 4042,4043
-				sprintf(tmp_sql, "SELECT `lv` FROM `%s` WHERE `char_id` = '%d' AND `id` >= '315' AND `id` <= '330'",skill_db, char_id);
-				sql_query(tmp_sql,"change_sex_reply");
-
-				if ((sql_res = mysql_store_result(&mysql_handle))) {
-					while(( sql_row = mysql_fetch_row(sql_res))) {
-						skill_point += atoi(sql_row[0]);
-					}
-				}
-
-				sprintf(tmp_sql, "DELETE FROM `%s` WHERE `char_id` = '%d' AND `id` >= '315' AND `id` <= '330'",skill_db, char_id);
-				sql_query(tmp_sql,"change_sex_reply");
-
-				// to avoid any problem with equipment and invalid sex, equipment is unequiped.
-				sprintf(tmp_sql, "UPDATE `%s` SET `equip` = '0' WHERE `char_id` = '%d'",inventory_db, char_id);
-				sql_query(tmp_sql,"change_sex_reply");
-
-				sprintf(tmp_sql, "UPDATE `%s` SET `class`='%d' , `skill_point`='%d' , `weapon`='0' , `shield='0' , `head_top`='0' , `head_mid`='0' , `head_bottom`='0' WHERE `char_id` = '%d'",char_db, char_class, skill_point, char_id);
-				sql_query(tmp_sql,"change_sex_reply");
-			}
-		}
-
-		// disconnect player if online on char-server
-		for(i = 0; i < fd_max; i++) {
-			if (session[i] && (sd = session[i]->session_data)) {
-				if (sd->account_id == acc) {
-					session[i]->eof = 1;
-					break;
-				}
-			}
-		}
-
-		WBUFW(buf,0) = 0x2b0d;
-		WBUFL(buf,2) = acc;
-		WBUFB(buf,6) = sex;
-		mapif_sendall(buf, 7);
-    }
-
-    return 0;
-}
-
-int account_reg2(int fd, int len) {
-    if (len < 4 || len < RFIFOW(fd,2))
-        return -1;
-
-	struct global_reg reg[ACCOUNT_REG2_NUM];
-	unsigned char buf[4096];
-	int j, p, acc;
-
-	acc = RFIFOL(fd,4);
-
-	for(p = 8, j = 0; p < RFIFOW(fd,2) && j < ACCOUNT_REG2_NUM; p += 36, j++) {
-		memcpy(reg[j].str, RFIFOP(fd,p), 32);
-		reg[j].value = RFIFOL(fd,p+32);
-	}
-
-	// set_account_reg2(acc,j,reg);
-	// 同垢ログインを禁止していれば送る必要は無い
-	memcpy(buf,RFIFOP(fd,0), RFIFOW(fd,2));
-	WBUFW(buf,0) = 0x2b11;
-	mapif_sendall(buf, WBUFW(buf,2));
-	RFIFOSKIP(fd, RFIFOW(fd,2));
-
-	#ifdef DEBUG
-	printf("char: save_account_reg_reply\n");
-	#endif
-
-	return 0;
-}
-
-// State change of account/ban notification (from login-server) by [Yor]
-int change_state_reply(int fd, int len) {
-    if (len < 11)
-		return -1;
-
+int parse_tologin(int fd) {
 	int i;
 	struct char_session_data *sd;
 
-	// send to all map-servers to disconnect the player
-	unsigned char buf[16];
-	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
-	for(i = 0; i < fd_max; i++) {
-		if (session[i] && (sd = session[i]->session_data)) {
-			if (sd->account_id == RFIFOL(fd,2)) {
-				session[i]->eof = 1;
-				break;
-			}
-		}
-	}
-
-	RFIFOSKIP(fd,11);
-
-	return 0;
-}
-
-int parse_tologin(int fd) {
-	int len,res = 0;
-
 	// only login-server can have an access to here.
 	// so, if it isn't the login-server, we disconnect the session.
 	//session eof check!
 	if(fd != login_fd)
 		session[fd]->eof = 1;
-
 	if(session[fd]->eof) {
 		if (fd == login_fd) {
 			printf("Char-server can't connect to login-server (connection #%d).\n", fd);
-			delete_timer(user_count_timer,send_users_tologin);
 			login_fd = -1;
 		}
 		close(fd);
@@ -1475,570 +1472,826 @@ int parse_tologin(int fd) {
 		return 0;
 	}
 
+	sd = (struct char_session_data*)session[fd]->session_data;
+
 	// hehe. no need to set user limite on SQL version. :P
 	// but char limitation is good way to maintain server. :D
-	len = RFIFOREST(fd);
-	while(len >= 2 && res == 0) {
-	    #ifdef DEBUG
-		printf("parse_tologin : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd, 0));
-		#endif
+	while(RFIFOREST(fd) >= 2) {
+//		printf("parse_tologin : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd, 0));
 
 		switch(RFIFOW(fd, 0)){
-		case 0x2711: res = reply_login_request(fd,len); break;
-		case 0x2713: res = send_chars(fd,len);          break;
-		case 0x2717: res = connect_until_reply(fd,len); break;
-		case 0x2723: res = change_sex_reply(fd,len);    break;
-		case 0x2729: res = account_reg2(fd,len);        break;
-		case 0x2731: res = change_state_reply(fd,len);  break;
-		case 0x2732: res = read_gm_accounts(fd,len);    break;
-
-		default:
-			printf("set eof.\n");
-			session[fd]->eof = 1;
-			return 0;
-		}
-
-		len = RFIFOREST(fd);
-	}
-
-	RFIFOFLUSH(fd);
-
-	return 0;
-}
-
-//--------------------------------
-// Map-server anti-freeze system
-//--------------------------------
-int map_anti_freeze_system(int tid, unsigned int tick, int id, int data) {
-	int i;
+		case 0x2711:
+			if (RFIFOREST(fd) < 3)
+				return 0;
+			if (RFIFOB(fd, 2)) {
+				//printf("connect login server error : %d\n", RFIFOB(fd, 2));
+				printf("Can not connect to login-server.\n");
+				printf("The server communication passwords (default s1/p1) is probably invalid.\n");
+				printf("Also, please make sure your login db has the username/password present and the sex of the account is S.\n");
+				printf("If you changed the communication passwords, change them back at map_athena.conf and char_athena.conf\n");
+				return 0;
+				//exit(1); //fixed for server shutdown.
+			}else {
+				printf("Connected to login-server (connection #%d).\n", fd);
+                set_all_offline();
+				// if no map-server already connected, display a message...
+				for(i = 0; i < MAX_MAP_SERVERS; i++)
+					if (server_fd[i] >= 0 && server[i].map[0][0]) // if map-server online and at least 1 map
+						break;
+				if (i == MAX_MAP_SERVERS)
+					printf("Awaiting maps from map-server.\n");
+			}
+			RFIFOSKIP(fd, 3);
+			break;
 
-	for(i = 0; i < MAX_MAP_SERVERS; i++) {
-		if (server_fd[i] >= 0) {// if map-server is online
-			printf("map_anti_freeze_system: server #%d, flag: %d.\n", i, server_freezeflag[i]);
-			if (server_freezeflag[i]-- < 1) {// Map-server anti-freeze system. Counter. 5 ok, 4...0 freezed
-				printf("Map-server anti-freeze system: char-server #%d is frozen -> disconnection.\n", i);
-				session[server_fd[i]]->eof = 1;
-				sprintf(tmp_sql, "DELETE FROM `ragsrvinfo` WHERE `index`='%d'", server_fd[i]);
-				if (mysql_query(&mysql_handle, tmp_sql)) {
-				    printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+		case 0x2713:
+			if(RFIFOREST(fd)<51)
+				return 0;
+			for(i = 0; i < fd_max; i++) {
+				if (session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->account_id == RFIFOL(fd,2)) {
+					if (RFIFOB(fd,6) != 0) {
+						WFIFOW(i,0) = 0x6c;
+						WFIFOB(i,2) = 0x42;
+						WFIFOSET(i,3);
+					} else if (max_connect_user == 0 || count_users() < max_connect_user) {
+//						if (max_connect_user == 0)
+//							printf("max_connect_user (unlimited) -> accepted.\n");
+//						else
+//							printf("count_users(): %d < max_connect_user (%d) -> accepted.\n", count_users(), max_connect_user);
+						sd->connect_until_time = (time_t)RFIFOL(fd,47);
+						// send characters to player
+						mmo_char_send006b(i, sd);
+					} else if(isGM(sd->account_id) >= gm_allow_level) {
+						sd->connect_until_time = (time_t)RFIFOL(fd,47);
+						// send characters to player
+						mmo_char_send006b(i, sd);
+					} else {
+						// refuse connection: too much online players
+//						printf("count_users(): %d < max_connect_use (%d) -> fail...\n", count_users(), max_connect_user);
+						WFIFOW(i,0) = 0x6c;
+						WFIFOW(i,2) = 0;
+						WFIFOSET(i,3);
+					}
 				}
 			}
-		}
-	}
-
-	return 0;
-}
-
-int recv_map_names(int fd, int len, unsigned char id) {
-    if (len < 4 || len < RFIFOW(fd,2))
-        return -1;
-
-    memset(server[id].map, 0, sizeof(server[id].map));
-
-	int j = 0,i;
-	unsigned char buf[16384];
-	int x;
-
-    for(i = 4; i < RFIFOW(fd,2); i += 16) {
-	    memcpy(server[id].map[j], RFIFOP(fd,i), 16);
-//				printf("set map %d.%d : %s\n", id, j, server[id].map[j]);
-		j++;
-	}
-
-    i = server[id].ip;
-
-	unsigned char *p = (unsigned char *)&server[id].ip;
-
-	printf("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
-	       id, j, p[0], p[1], p[2], p[3], server[id].port);
-
-
-	WFIFOW(fd,0) = 0x2afb;
-	WFIFOB(fd,2) = 0;
-	memcpy(WFIFOP(fd,3), wisp_server_name, 24); // name for wisp to player
-	WFIFOSET(fd,27);
-
-
-	if (j == 0) {
-		printf("WARNING: Map-Server %d have NO maps.\n", id);
-	} else {
-		// Transmitting maps information to the other map-servers
-		WBUFW(buf,0) = 0x2b04;
-		WBUFW(buf,2) = j * 16 + 10;
-		WBUFL(buf,4) = server[id].ip;
-		WBUFW(buf,8) = server[id].port;
-		memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 16);
-		mapif_sendallwos(fd, buf, WBUFW(buf,2));
-	}
-
-	// Transmitting the maps of the other map-servers to the new map-server
-	for(x = 0; x < MAX_MAP_SERVERS; x++) {
-		if (server_fd[x] >= 0 && x != id) {
-			WFIFOW(fd,0) = 0x2b04;
-			WFIFOL(fd,4) = server[x].ip;
-			WFIFOW(fd,8) = server[x].port;
+			RFIFOSKIP(fd,51);
+			break;
 
-			j = 0;
+		case 0x2717:
+			if (RFIFOREST(fd) < 50)
+				return 0;
+			for(i = 0; i < fd_max; i++) {
+				if (session[i] && (sd = (struct char_session_data*)session[i]->session_data)) {
+					if (sd->account_id == RFIFOL(fd,2)) {
+					sd->connect_until_time = (time_t)RFIFOL(fd,46);
+					break;
+					}
+				}
+			}
+			RFIFOSKIP(fd,50);
+			break;
 
-			for(i = 0; i < MAX_MAP_PER_SERVER; i++)
-				if (server[x].map[i][0])
-					memcpy(WFIFOP(fd,10+(j++)*16), server[x].map[i], 16);
+		// login-server alive packet
+		case 0x2718:
+			if (RFIFOREST(fd) < 2)
+				return 0;
+			RFIFOSKIP(fd,2);
+			break;
 
-			if (j > 0) {
-				WFIFOW(fd,2) = j * 16 + 10;
-				WFIFOSET(fd,WFIFOW(fd,2));
+		// Receiving authentification from Freya-type login server (to avoid char->login->char)
+		case 0x2719:
+			if (RFIFOREST(fd) < 18)
+				return 0;
+			// to conserv a maximum of authentification, search if account is already authentified and replace it
+			// that will reduce multiple connection too
+			for(i = 0; i < AUTH_FIFO_SIZE; i++)
+				if (auth_fifo[i].account_id == RFIFOL(fd,2))
+					break;
+			// if not found, use next value
+			if (i == AUTH_FIFO_SIZE) {
+				if (auth_fifo_pos >= AUTH_FIFO_SIZE)
+					auth_fifo_pos = 0;
+				i = auth_fifo_pos;
+				auth_fifo_pos++;
 			}
-		}
-	}
-
-	RFIFOSKIP(fd,RFIFOW(fd,2));
+			//printf("auth_fifo set (auth #%d) - account: %d, secure: %08x-%08x\n", i, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
+			auth_fifo[i].account_id = RFIFOL(fd,2);
+			auth_fifo[i].char_id = 0;
+			auth_fifo[i].login_id1 = RFIFOL(fd,6);
+			auth_fifo[i].login_id2 = RFIFOL(fd,10);
+			auth_fifo[i].delflag = 2; // 0: auth_fifo canceled/void, 2: auth_fifo received from login/map server in memory, 1: connection authentified
+			auth_fifo[i].char_pos = 0;
+			auth_fifo[i].connect_until_time = 0; // unlimited/unknown time by default (not display in map-server)
+			auth_fifo[i].ip = RFIFOL(fd,14);
+			//auth_fifo[i].map_auth = 0;
+			RFIFOSKIP(fd,18);
+			break;
 
-	printf("Map-server %d loading complete.\n", id);
+/*		case 0x2721:	// gm reply. I don't want to support this function.
+			printf("0x2721:GM reply\n");
+		  {
+			int oldacc, newacc;
+			unsigned char buf[64];
+			if (RFIFOREST(fd) < 10)
+				return 0;
+			oldacc = RFIFOL(fd, 2);
+			newacc = RFIFOL(fd, 6);
+			RFIFOSKIP(fd, 10);
+			if (newacc > 0) {
+				for(i=0;i<char_num;i++){
+					if(char_dat[i].account_id==oldacc)
+						char_dat[i].account_id=newacc;
+				}
+			}
+			WBUFW(buf,0)=0x2b0b;
+			WBUFL(buf,2)=oldacc;
+			WBUFL(buf,6)=newacc;
+			mapif_sendall(buf,10);
+//			printf("char -> map\n");
+		  }
+			break;
+*/
+		case 0x2723:	// changesex reply (modified by [Yor])
+			if (RFIFOREST(fd) < 7)
+				return 0;
+		  {
+			int acc, sex;
+			unsigned char buf[16];
+
+			acc = RFIFOL(fd,2);
+			sex = RFIFOB(fd,6);
+			RFIFOSKIP(fd, 7);
+			if (acc > 0) {
+				sprintf(tmp_sql, "SELECT `char_id`,`class`,`skill_point` FROM `%s` WHERE `account_id` = '%d'",char_db, acc);
+				if (mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error (select `char`)- %s\n", mysql_error(&mysql_handle));
+				}
+				sql_res = mysql_store_result(&mysql_handle);
+
+				if (sql_res) {
+						int char_id, jobclass, skill_point, class_;
+						sql_row = mysql_fetch_row(sql_res);
+						char_id = atoi(sql_row[0]);
+						jobclass = atoi(sql_row[1]);
+						skill_point = atoi(sql_row[2]);
+						class_ = jobclass;
+						if (jobclass == 19 || jobclass == 20 ||
+						    jobclass == 4020 || jobclass == 4021 ||
+						    jobclass == 4042 || jobclass == 4043) {
+							// job modification
+							if (jobclass == 19 || jobclass == 20) {
+								class_ = (sex) ? 19 : 20;
+							} else if (jobclass == 4020 || jobclass == 4021) {
+								class_ = (sex) ? 4020 : 4021;
+							} else if (jobclass == 4042 || jobclass == 4043) {
+								class_ = (sex) ? 4042 : 4043;
+							}
+							// remove specifical skills of classes 19,20 4020,4021 and 4042,4043
+							sprintf(tmp_sql, "SELECT `lv` FROM `%s` WHERE `char_id` = '%d' AND `id` >= '315' AND `id` <= '330'",skill_db, char_id);
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error (select `char`)- %s\n", mysql_error(&mysql_handle));
+							}
+							sql_res = mysql_store_result(&mysql_handle);
+							if (sql_res) {
+								while(( sql_row = mysql_fetch_row(sql_res))) {
+									skill_point += atoi(sql_row[0]);
+								}
+							}
+							sprintf(tmp_sql, "DELETE FROM `%s` WHERE `char_id` = '%d' AND `id` >= '315' AND `id` <= '330'",skill_db, char_id);
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error (select `char`)- %s\n", mysql_error(&mysql_handle));
+							}
+						}
+						// to avoid any problem with equipment and invalid sex, equipment is unequiped.
+						sprintf(tmp_sql, "UPDATE `%s` SET `equip` = '0' WHERE `char_id` = '%d'",inventory_db, char_id);
+						if (mysql_query(&mysql_handle, tmp_sql)) {
+							printf("DB server Error (select `char`)- %s\n", mysql_error(&mysql_handle));
+						}
+						sprintf(tmp_sql, "UPDATE `%s` SET `class`='%d' , `skill_point`='%d' , `weapon`='0' , `shield='0' , `head_top`='0' , `head_mid`='0' , `head_bottom`='0' WHERE `char_id` = '%d'",char_db, class_, skill_point, char_id);
+						if (mysql_query(&mysql_handle, tmp_sql)) {
+							printf("DB server Error (select `char`)- %s\n", mysql_error(&mysql_handle));
+						}
+					}
+				}
+				// disconnect player if online on char-server
+				for(i = 0; i < fd_max; i++) {
+					if (session[i] && (sd = (struct char_session_data*)session[i]->session_data)) {
+						if (sd->account_id == acc) {
+							session[i]->eof = 1;
+							break;
+						}
+					}
+				}
 
-	servers_connected++;
+			WBUFW(buf,0) = 0x2b0d;
+			WBUFL(buf,2) = acc;
+			WBUFB(buf,6) = sex;
 
-	return 0;
-}
+			mapif_sendall(buf, 7);
+		  }
+			break;
 
-int auth_request(int fd, int len) {
-    if (len < 22)
-		return -1;
+		// account_reg2変更通知
+		case 0x2729:
+			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+				return 0;
+		  {
+			struct global_reg reg[ACCOUNT_REG2_NUM];
+			unsigned char buf[4096];
+			int j, p, acc;
+			acc = RFIFOL(fd,4);
+			for(p = 8, j = 0; p < RFIFOW(fd,2) && j < ACCOUNT_REG2_NUM; p += 36, j++) {
+				memcpy(reg[j].str, RFIFOP(fd,p), 32);
+				reg[j].value = RFIFOL(fd,p+32);
+			}
+			// set_account_reg2(acc,j,reg);
+			// 同垢ログインを禁止していれば送る必要は無い
+			memcpy(buf,RFIFOP(fd,0), RFIFOW(fd,2));
+			WBUFW(buf,0) = 0x2b11;
+			mapif_sendall(buf, WBUFW(buf,2));
+			RFIFOSKIP(fd, RFIFOW(fd,2));
+//			printf("char: save_account_reg_reply\n");
+		  }
+			break;
 
-    int i;
+		// State change of account/ban notification (from login-server) by [Yor]
+		case 0x2731:
+			if (RFIFOREST(fd) < 11)
+				return 0;
+			// send to all map-servers to disconnect the player
+		  {
+			unsigned char buf[16];
+			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
+			for(i = 0; i < fd_max; i++) {
+				if (session[i] && (sd = (struct char_session_data*)session[i]->session_data)) {
+					if (sd->account_id == RFIFOL(fd,2)) {
+						session[i]->eof = 1;
+						break;
+					}
+				}
+			}
+			RFIFOSKIP(fd,11);
+			break;
 
-    #ifdef DEBUG
-	printf("(AUTH request) auth_fifo search %d %d %d\n", RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
-	#endif
+		// Receive GM accounts [Freya login server packet by Yor]
+		case 0x2733:
+		// add test here to remember that the login-server is Freya-type
+		// sprintf (login_server_type, "Freya");
+			if (RFIFOREST(fd) < 7)
+				return 0;
+			{
+				int new_level = 0;
+				for(i = 0; i < GM_num; i++)
+					if (gm_account[i].account_id == RFIFOL(fd,2)) {
+						if (gm_account[i].level != (int)RFIFOB(fd,6)) {
+							gm_account[i].level = (int)RFIFOB(fd,6);
+							new_level = 1;
+						}
+						break;
+					}
+				// if not found, add it
+				if (i == GM_num) {
+					// limited to 4000, because we send information to char-servers (more than 4000 GM accounts???)
+					// int (id) + int (level) = 8 bytes * 4000 = 32k (limit of packets in windows)
+					if (((int)RFIFOB(fd,6)) > 0 && GM_num < 4000) {
+						if (GM_num == 0) {
+							gm_account = (struct gm_account*)aMalloc(sizeof(struct gm_account));
+						} else {
+							gm_account = (struct gm_account*)aRealloc(gm_account, sizeof(struct gm_account) * (GM_num + 1));						
+						}
+						gm_account[GM_num].account_id = RFIFOL(fd,2);
+						gm_account[GM_num].level = (int)RFIFOB(fd,6);
+						new_level = 1;
+						GM_num++;
+						if (GM_num >= 4000)
+							printf("***WARNING: 4000 GM accounts found. Next GM accounts are not readed.\n");
+					}
+				}
+				if (new_level == 1) {
+					printf("From login-server: receiving a GM account information (%d: level %d).\n", RFIFOL(fd,2), (int)RFIFOB(fd,6));
+					mapif_send_gmaccounts();
 
-	for(i = 0; i < AUTH_FIFO_SIZE; i++) {
-		if (auth_fifo[i].account_id == RFIFOL(fd,2) &&
-		    auth_fifo[i].char_id == RFIFOL(fd,6) &&
-		    auth_fifo[i].login_id1 == RFIFOL(fd,10) &&
-#if CMP_AUTHFIFO_LOGIN2 != 0
-		    // here, it's the only area where it's possible that we doesn't know login_id2 (map-server asks just after 0x72 packet, that doesn't given the value)
-		    (auth_fifo[i].login_id2 == RFIFOL(fd,14) || RFIFOL(fd,14) == 0) && // relate to the versions higher than 18
-#endif
-		    (!check_ip_flag || auth_fifo[i].ip == RFIFOL(fd,18)) &&
-		    !auth_fifo[i].delflag) {
-
-			auth_fifo[i].delflag = 1;
-			WFIFOW(fd,0) = 0x2afd;
-			WFIFOW(fd,2) = 16 + sizeof(struct mmo_charstatus);
-			WFIFOL(fd,4) = RFIFOL(fd,2);
-			WFIFOL(fd,8) = auth_fifo[i].login_id2;
-			WFIFOL(fd,12) = (unsigned long)auth_fifo[i].connect_until_time;
-			mmo_char_fromsql(auth_fifo[i].char_id, char_dat, 1);
-			char_dat[0].sex = auth_fifo[i].sex;
-			memcpy(WFIFOP(fd,16), &char_dat[0], sizeof(struct mmo_charstatus));
-			WFIFOSET(fd, WFIFOW(fd,2));
-
-			#ifdef DEBUG
-            printf("auth_fifo search success (auth #%d, account %d, character: %d).\n", i, RFIFOL(fd,2), RFIFOL(fd,6));
-            #endif
+					//create_online_files(); // not change online file for only 1 player (in next timer, that will be done
+					// send gm acccounts level to map-servers
+				}
+			}
+			RFIFOSKIP(fd,7);
+			break;
 
+		default:
+			printf("set eof.\n");
+			session[fd]->eof = 1;
 			return 0;
 		}
 	}
 
-	if (i == AUTH_FIFO_SIZE) {
-		WFIFOW(fd,0) = 0x2afe;
-		WFIFOL(fd,2) = RFIFOL(fd,2);
-		WFIFOSET(fd,6);
-
-		#ifdef DEBUG
-		printf("(AUTH request) auth_fifo search error!\n");
-		#endif
-	}
-
-	RFIFOSKIP(fd,22);
-
-	return 0;
-}
-
-int set_map_users(int fd, int len, unsigned char id) {
-	if (len < 6 || len < RFIFOW(fd,2))
-		return -1;
-
-	if (RFIFOW(fd,4) != server[id].users)
-		printf("map user: %d\n", RFIFOW(fd,4));
-
-	server[id].users = RFIFOW(fd,4);
-
-	if(anti_freeze_enable)
-		server_freezeflag[id] = 5; // Map anti-freeze system. Counter. 5 ok, 4...0 freezed
-
-	RFIFOSKIP(fd,RFIFOW(fd,2));
+	RFIFOFLUSH(fd);
 
 	return 0;
 }
 
-int save_char(int fd, int len) {
-	if (len < 4 || len < RFIFOW(fd,2))
-		return -1;
+int parse_frommap(int fd) {
+	int i = 0, j = 0;
+	int id;
 
-	//check account
-	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'",char_db, RFIFOL(fd,4),RFIFOL(fd,8));
-	sql_query(tmp_sql,"save_char");
+	// Sometimes fd=0, and it will cause server crash. Don't know why. :(
+	if (fd <= 0) {
+		printf("parse_frommap error fd=0\n");
+		return 0;
+	}
 
-	if ((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res)))
-		if (atoi(sql_row[0]) == 1) {
-			memcpy(&char_dat[0], RFIFOP(fd,12), sizeof(struct mmo_charstatus));
-			mmo_char_tosql(RFIFOL(fd,8), char_dat);
+	for(id = 0; id < MAX_MAP_SERVERS; id++)
+		if (server_fd[id] == fd)
+			break;
+	if(id == MAX_MAP_SERVERS)
+		session[fd]->eof = 1;
+	if(session[fd]->eof) {
+		if (id < MAX_MAP_SERVERS) {
+			memset(&server[id], 0, sizeof(struct mmo_map_server));
+			printf("Map-server %d (session #%d) has disconnected.\n", id, fd);
+			sprintf(tmp_sql, "DELETE FROM `ragsrvinfo` WHERE `index`='%d'", server_fd[id]);
+			if (mysql_query(&mysql_handle, tmp_sql)) {
+				printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+			}
+			server_fd[id] = -1;
 		}
+		close(fd);
+		delete_session(fd);
+		return 0;
+	}
 
-	mysql_free_result(sql_res);
-
-
-	RFIFOSKIP(fd,RFIFOW(fd,2));
-
-	return 0;
-}
-
-int request_char_select(int fd, int len) {
-	if (len < 18)
-		return -1;
-
-	if (auth_fifo_pos >= AUTH_FIFO_SIZE)
-		auth_fifo_pos = 0;
-
-	#ifdef DEBUG
-	printf("(charselect) auth_fifo set %d - account_id:%08x login_id1:%08x\n", auth_fifo_pos, RFIFOL(fd, 2), RFIFOL(fd, 6));
-	#endif
-
-	auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd, 2);
-	auth_fifo[auth_fifo_pos].char_id = 0;
-	auth_fifo[auth_fifo_pos].login_id1 = RFIFOL(fd, 6);
-	auth_fifo[auth_fifo_pos].login_id2 = RFIFOL(fd,10);
-	auth_fifo[auth_fifo_pos].delflag = 2;
-	auth_fifo[auth_fifo_pos].char_pos = 0;
-	auth_fifo[auth_fifo_pos].connect_until_time = 0; // unlimited/unknown time by default (not display in map-server)
-	auth_fifo[auth_fifo_pos].ip = RFIFOL(fd,14);
-	auth_fifo_pos++;
-
-    WFIFOW(fd, 0) = 0x2b03;
-	WFIFOL(fd, 2) = RFIFOL(fd, 2);
-	WFIFOB(fd, 6) = 0;
-	WFIFOSET(fd, 7);
-
-	RFIFOSKIP(fd, 18);
-
-	return 0;
-}
-
-int request_change_map(int fd, int len) {
-    if (len < 49)
-		return -1;
-
-	if (auth_fifo_pos >= AUTH_FIFO_SIZE)
-		auth_fifo_pos = 0;
-
-	WFIFOW(fd, 0) = 0x2b06;
-	memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 42);
-
-	#ifdef DEBUG
-	printf("(map change) auth_fifo set %d - account_id:%08x login_id1:%08x\n", auth_fifo_pos, RFIFOL(fd, 2), RFIFOL(fd, 6));
-	#endif
+	while(RFIFOREST(fd) >= 2) {
+//		printf("parse_frommap : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd,0));
 
-	auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd, 2);
-	auth_fifo[auth_fifo_pos].login_id1 = RFIFOL(fd, 6);
-	auth_fifo[auth_fifo_pos].login_id2 = RFIFOL(fd,10);
-	auth_fifo[auth_fifo_pos].char_id = RFIFOL(fd,14);
-	auth_fifo[auth_fifo_pos].delflag = 0;
-	auth_fifo[auth_fifo_pos].sex = RFIFOB(fd,44);
-	auth_fifo[auth_fifo_pos].ip = RFIFOL(fd,45);
+		switch(RFIFOW(fd, 0)) {
 
-	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", char_db, RFIFOL(fd,2), RFIFOL(fd,14));
-	sql_query(tmp_sql,"request_map_change");
+		// map-server alive packet
+		case 0x2718:
+			if (RFIFOREST(fd) < 2)
+				return 0;
+			RFIFOSKIP(fd,2);
+			break;
 
-    if ((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res))) {
+		case 0x2af7:
+			RFIFOSKIP(fd,2);
+			read_gm_account();
+			break;
 
-		auth_fifo[auth_fifo_pos].char_pos = auth_fifo[auth_fifo_pos].char_id;
-		auth_fifo_pos++;
+		// mapserver -> map names recv.
+		case 0x2afa:
+			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 += 16) {
+				memcpy(server[id].map[j], RFIFOP(fd,i), 16);
+//				printf("set map %d.%d : %s\n", id, j, server[id].map[j]);
+				j++;
+			}
+			i = server[id].ip;
+			{
+				unsigned char *p = (unsigned char *)&server[id].ip;
+				printf("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
+				       id, j, p[0], p[1], p[2], p[3], server[id].port);
+				printf("Map-server %d loading complete.\n", id);
+				set_all_offline();
+			}
+			WFIFOW(fd,0) = 0x2afb;
+			WFIFOB(fd,2) = 0;
+			memcpy(WFIFOP(fd,3), wisp_server_name, 24); // name for wisp to player
+			WFIFOSET(fd,27);
+			{
+				unsigned char buf[16384];
+				int x;
+				if (j == 0) {
+					printf("WARNING: Map-Server %d have NO maps.\n", id);
+				// Transmitting maps information to the other map-servers
+				} else {
+					WBUFW(buf,0) = 0x2b04;
+					WBUFW(buf,2) = j * 16 + 10;
+					WBUFL(buf,4) = server[id].ip;
+					WBUFW(buf,8) = server[id].port;
+					memcpy(WBUFP(buf,10), RFIFOP(fd,4), j * 16);
+					mapif_sendallwos(fd, buf, WBUFW(buf,2));
+				}
+				// Transmitting the maps of the other map-servers to the new map-server
+				for(x = 0; x < MAX_MAP_SERVERS; x++) {
+					if (server_fd[x] >= 0 && x != id) {
+						WFIFOW(fd,0) = 0x2b04;
+						WFIFOL(fd,4) = server[x].ip;
+						WFIFOW(fd,8) = server[x].port;
+						j = 0;
+						for(i = 0; i < MAX_MAP_PER_SERVER; i++)
+							if (server[x].map[i][0])
+								memcpy(WFIFOP(fd,10+(j++)*16), server[x].map[i], 16);
+						if (j > 0) {
+							WFIFOW(fd,2) = j * 16 + 10;
+							WFIFOSET(fd,WFIFOW(fd,2));
+						}
+					}
+				}
+			}
+			RFIFOSKIP(fd,RFIFOW(fd,2));
+			break;
 
-		WFIFOL(fd,6) = 0;
-    }
+		// auth request
+		case 0x2afc:
+			if (RFIFOREST(fd) < 22)
+				return 0;
+//			printf("(AUTH request) auth_fifo search %d %d %d\n", RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
+			for(i = 0; i < AUTH_FIFO_SIZE; i++) {
+				if (auth_fifo[i].account_id == RFIFOL(fd,2) &&
+				    auth_fifo[i].char_id == RFIFOL(fd,6) &&
+				    auth_fifo[i].login_id1 == RFIFOL(fd,10) &&
+#if CMP_AUTHFIFO_LOGIN2 != 0
+				    // here, it's the only area where it's possible that we doesn't know login_id2 (map-server asks just after 0x72 packet, that doesn't given the value)
+				    (auth_fifo[i].login_id2 == RFIFOL(fd,14) || RFIFOL(fd,14) == 0) && // relate to the versions higher than 18
+#endif
+				    (!check_ip_flag || auth_fifo[i].ip == RFIFOL(fd,18)) &&
+				    !auth_fifo[i].delflag) {
+					auth_fifo[i].delflag = 1;
+					WFIFOW(fd,0) = 0x2afd;
+					WFIFOW(fd,2) = 16 + sizeof(struct mmo_charstatus);
+					WFIFOL(fd,4) = RFIFOL(fd,2);
+					WFIFOL(fd,8) = auth_fifo[i].login_id2;
+					WFIFOL(fd,12) = (unsigned long)auth_fifo[i].connect_until_time;
+					mmo_char_fromsql(auth_fifo[i].char_id, char_dat, 1);
+					char_dat[0].sex = auth_fifo[i].sex;
+					memcpy(WFIFOP(fd,16), &char_dat[0], sizeof(struct mmo_charstatus));
+					WFIFOSET(fd, WFIFOW(fd,2));
+					//printf("auth_fifo search success (auth #%d, account %d, character: %d).\n", i, RFIFOL(fd,2), RFIFOL(fd,6));
+					break;
+				}
+			}
+			if (i == AUTH_FIFO_SIZE) {
+				WFIFOW(fd,0) = 0x2afe;
+				WFIFOL(fd,2) = RFIFOL(fd,2);
+				WFIFOSET(fd,6);
+//				printf("(AUTH request) auth_fifo search error!\n");
+			}
+			RFIFOSKIP(fd,22);
+			break;
 
-    if (atoi(sql_row[0]) == 0)
-		WFIFOW(fd,6) = 1;
+		// set MAP user
+		case 0x2aff:
+			if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))
+				return 0;
+			if (RFIFOW(fd,4) != server[id].users)
+				printf("[UserCount]: %d (Server: %d)\n", RFIFOW(fd,4), id);
+			server[id].users = RFIFOW(fd,4);
+			RFIFOSKIP(fd,RFIFOW(fd,2));
+			break;
 
-	WFIFOSET(fd,44);
-	RFIFOSKIP(fd,49);
+		// char saving
+		case 0x2b01:
+			i = 0;
+			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+				return 0;
+			//check account
+			sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'",char_db, RFIFOL(fd,4),RFIFOL(fd,8)); // TBR
+			if (mysql_query(&mysql_handle, tmp_sql)) {
+				printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+			}
+			sql_res = mysql_store_result(&mysql_handle);
+			if (sql_res) {
+				sql_row = mysql_fetch_row(sql_res);
+				if (sql_row)
+					i = atoi(sql_row[0]);
+			}
+			mysql_free_result(sql_res);
 
-	mysql_free_result(sql_res);
+			if (i == 1) {
+				memcpy(&char_dat[0], RFIFOP(fd,12), sizeof(struct mmo_charstatus));
+				mmo_char_tosql(RFIFOL(fd,8), char_dat);
+				//save to DB
+			}
+			RFIFOSKIP(fd,RFIFOW(fd,2));
+			break;
 
-	return 0;
-}
+		// req char selection
+		case 0x2b02:
+			if (RFIFOREST(fd) < 18)
+				return 0;
 
-int char_name_check(int fd, int len) {
-    if (len < 6)
-        return -1;
+			if (auth_fifo_pos >= AUTH_FIFO_SIZE)
+				auth_fifo_pos = 0;
+
+//			printf("(charselect) auth_fifo set %d - account_id:%08x login_id1:%08x\n", auth_fifo_pos, RFIFOL(fd, 2), RFIFOL(fd, 6));
+			auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd, 2);
+			auth_fifo[auth_fifo_pos].char_id = 0;
+			auth_fifo[auth_fifo_pos].login_id1 = RFIFOL(fd, 6);
+			auth_fifo[auth_fifo_pos].login_id2 = RFIFOL(fd,10);
+			auth_fifo[auth_fifo_pos].delflag = 2;
+			auth_fifo[auth_fifo_pos].char_pos = 0;
+			auth_fifo[auth_fifo_pos].connect_until_time = 0; // unlimited/unknown time by default (not display in map-server)
+			auth_fifo[auth_fifo_pos].ip = RFIFOL(fd,14);
+			auth_fifo_pos++;
+
+			WFIFOW(fd, 0) = 0x2b03;
+			WFIFOL(fd, 2) = RFIFOL(fd, 2);
+			WFIFOB(fd, 6) = 0;
+			WFIFOSET(fd, 7);
+
+			RFIFOSKIP(fd, 18);
+			break;
 
-    WFIFOW(fd,0) = 0x2b09;
-	WFIFOL(fd,2) = RFIFOL(fd,2);
+		// request "change map server"
+		case 0x2b05:
+			if (RFIFOREST(fd) < 49)
+				return 0;
 
-	sprintf(tmp_sql, "SELECT `name` FROM `%s` WHERE `char_id`='%d'", char_db, RFIFOL(fd,2));
-	sql_query(tmp_sql,"char_name_check");
+			if (auth_fifo_pos >= AUTH_FIFO_SIZE)
+				auth_fifo_pos = 0;
+
+			WFIFOW(fd, 0) = 0x2b06;
+			memcpy(WFIFOP(fd,2), RFIFOP(fd,2), 42);
+//			printf("(map change) auth_fifo set %d - account_id:%08x login_id1:%08x\n", auth_fifo_pos, RFIFOL(fd, 2), RFIFOL(fd, 6));
+			printf("[MapChange] ");
+			auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd, 2);
+			auth_fifo[auth_fifo_pos].login_id1 = RFIFOL(fd, 6);
+			auth_fifo[auth_fifo_pos].login_id2 = RFIFOL(fd,10);
+			auth_fifo[auth_fifo_pos].char_id = RFIFOL(fd,14);
+			auth_fifo[auth_fifo_pos].delflag = 0;
+			auth_fifo[auth_fifo_pos].sex = RFIFOB(fd,44);
+			auth_fifo[auth_fifo_pos].ip = RFIFOL(fd,45);
+
+			sprintf(tmp_sql, "SELECT `char_id`, `name` FROM `%s` WHERE `account_id` = '%d' AND `char_id`='%d'", char_db, RFIFOL(fd,2), RFIFOL(fd,14));
+			if (mysql_query(&mysql_handle, tmp_sql)) {
+				printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+			}
+			sql_res = mysql_store_result(&mysql_handle);
+			if(sql_res){
+				i = atoi(sql_row[0]);
+				printf("aid: %d, cid: %d, name: %s", RFIFOL(fd,2), atoi(sql_row[0]), sql_row[1]);
+				mysql_free_result(sql_res);
+				auth_fifo[auth_fifo_pos].char_pos = auth_fifo[auth_fifo_pos].char_id;
+				auth_fifo_pos++;
+				WFIFOL(fd,6) = 0;
+			}else{
+				printf("Error, aborted\n");
+				return 0;
+			}
+			
+			if(i == 0){
+				WFIFOW(fd, 6) = 0;
+			}
+			
+			WFIFOSET(fd, 44);
+			RFIFOSKIP(fd, 49);
+			printf(" done.\n");			
+			/*
+			if (( sql_row = mysql_fetch_row(sql_res))) {
+				i = atoi(sql_row[0]);
+				mysql_free_result(sql_res);
+
+				auth_fifo[auth_fifo_pos].char_pos = auth_fifo[auth_fifo_pos].char_id;
+				auth_fifo_pos++;
+
+				WFIFOL(fd,6) = 0;
+				break;
+			}
+			if (i == 0)
+				WFIFOW(fd,6) = 1;
 
-	if((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res)))
-		memcpy(WFIFOP(fd,6), sql_row[0], 24);
-	else
-		memcpy(WFIFOP(fd,6), unknown_char_name, 24);
+			WFIFOSET(fd,44);
+			RFIFOSKIP(fd,49);
+			break;
+			*/
 
-	mysql_free_result(sql_res);
+		break;
+		
+		// char name check
+		case 0x2b08:
+			if (RFIFOREST(fd) < 6)
+				return 0;
 
-	WFIFOSET(fd,30);
+			sprintf(tmp_sql, "SELECT `name` FROM `%s` WHERE `char_id`='%d'", char_db, RFIFOL(fd,2));
+			if (mysql_query(&mysql_handle, tmp_sql)) {
+				printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+			}
+			sql_res = mysql_store_result(&mysql_handle);
 
-    RFIFOSKIP(fd,6);
+			sql_row = mysql_fetch_row(sql_res);
 
-    return 0;
-}
+			WFIFOW(fd,0) = 0x2b09;
+			WFIFOL(fd,2) = RFIFOL(fd,2);
 
-int account_reg(int fd, int len) {
-	if (len < 4 || len < RFIFOW(fd,2))
-	    return -1;
+			if (sql_row)
+				memcpy(WFIFOP(fd,6), sql_row[0], 24);
+			else
+				memcpy(WFIFOP(fd,6), unknown_char_name, 24);
+			mysql_free_result(sql_res);
 
-	struct global_reg reg[ACCOUNT_REG2_NUM];
-	int j,p,acc;
-	acc=RFIFOL(fd,4);
-	for(p=8,j=0;p<RFIFOW(fd,2) && j<ACCOUNT_REG2_NUM;p+=36,j++){
-		memcpy(reg[j].str,RFIFOP(fd,p),32);
-		reg[j].value=RFIFOL(fd,p+32);
-	}
+			WFIFOSET(fd,30);
 
-	// set_account_reg2(acc,j,reg);
-	// loginサーバーへ送る
-	if (login_fd > 0) { // don't send request if no login-server
-		WFIFOW(login_fd, 0) = 0x2728;
-		memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0), RFIFOW(fd,2));
-		WFIFOSET(login_fd, WFIFOW(login_fd,2));
-	}
+			RFIFOSKIP(fd,6);
+			break;
 
-	// ワールドへの同垢ログインがなければmapサーバーに送る必要はない
-	//memcpy(buf,RFIFOP(fd,0),RFIFOW(fd,2));
-	//WBUFW(buf,0)=0x2b11;
-	//mapif_sendall(buf,WBUFW(buf,2));
-	RFIFOSKIP(fd,RFIFOW(fd,2));
+/*		// I want become GM - fuck!
+		case 0x2b0a:
+			if(RFIFOREST(fd)<4)
+				return 0;
+			if(RFIFOREST(fd)<RFIFOW(fd,2))
+				return 0;
+			memcpy(WFIFOP(login_fd,2),RFIFOP(fd,2),RFIFOW(fd,2)-2);
+			WFIFOW(login_fd,0)=0x2720;
+			WFIFOSET(login_fd,RFIFOW(fd,2));
+//			printf("char : change gm -> login %d %s %d\n", RFIFOL(fd, 4), RFIFOP(fd, 8), RFIFOW(fd, 2));
+			RFIFOSKIP(fd, RFIFOW(fd, 2));
+			break;
+		*/
 
+		// account_reg保存要求
+		case 0x2b10:
+			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
+				return 0;
+		  {
+			struct global_reg reg[ACCOUNT_REG2_NUM];
+			int j,p,acc;
+			acc=RFIFOL(fd,4);
+			for(p=8,j=0;p<RFIFOW(fd,2) && j<ACCOUNT_REG2_NUM;p+=36,j++){
+				memcpy(reg[j].str,RFIFOP(fd,p),32);
+				reg[j].value=RFIFOL(fd,p+32);
+			}
+			// set_account_reg2(acc,j,reg);
+			// loginサーバーへ送る
+			if (login_fd > 0) { // don't send request if no login-server
+				WFIFOW(login_fd, 0) = 0x2728;
+				memcpy(WFIFOP(login_fd,0), RFIFOP(fd,0), RFIFOW(fd,2));
+				WFIFOSET(login_fd, WFIFOW(login_fd,2));
+			}
+			// ワールドへの同垢ログインがなければmapサーバーに送る必要はない
+			//memcpy(buf,RFIFOP(fd,0),RFIFOW(fd,2));
+			//WBUFW(buf,0)=0x2b11;
+			//mapif_sendall(buf,WBUFW(buf,2));
+			RFIFOSKIP(fd,RFIFOW(fd,2));
 //			printf("char: save_account_reg (from map)\n");
+		  }
+			break;
 
-    return 0;
-}
-
-// Map server send information to change an email of an account -> login-server
-int change_email_request(int fd, int len) {
-	if (len < 86)
-	    return -1;
-
-	if (login_fd > 0) { // don't send request if no login-server
-		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);
-
-    return 0;
-}
+		// Map server send information to change an email of an account -> login-server
+		case 0x2b0c:
+			if (RFIFOREST(fd) < 86)
+				return 0;
+			if (login_fd > 0) { // don't send request if no login-server
+				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;
 
-// Receiving from map-server a status change resquest. Transmission to login-server (by Yor)
-int status_change_request(int fd, int len) {
-    if (len < 44)
-		return -1;
+		// Receiving from map-server a status change resquest. Transmission to login-server (by Yor)
+		case 0x2b0e:
+			if (RFIFOREST(fd) < 44)
+				return 0;
+		  {
+			char character_name[24];
+			int acc = RFIFOL(fd,2); // account_id of who ask (-1 if nobody)
+			memcpy(character_name, RFIFOP(fd,6), 24);
+			character_name[sizeof(character_name) -1] = '\0';
+			// prepare answer
+			WFIFOW(fd,0) = 0x2b0f; // answer
+			WFIFOL(fd,2) = acc; // who want do operation
+			WFIFOW(fd,30) = RFIFOW(fd, 30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban
+			sprintf(tmp_sql, "SELECT `account_id`,`name` FROM `%s` WHERE `name` = '%s'",char_db, character_name);
+			if (mysql_query(&mysql_handle, tmp_sql)) {
+				printf("DB server Error (select `char`)- %s\n", mysql_error(&mysql_handle));
+			}
 
-	char character_name[24];
-	int acc = RFIFOL(fd,2); // account_id of who ask (-1 if nobody)
-
-	memcpy(character_name, RFIFOP(fd,6), 24);
-	character_name[sizeof(character_name) -1] = '\0';
-
-	// prepare answer
-	WFIFOW(fd,0) = 0x2b0f; // answer
-	WFIFOL(fd,2) = acc; // who want do operation
-	WFIFOW(fd,30) = RFIFOW(fd, 30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban
-
-	sprintf(tmp_sql, "SELECT `account_id`,`name` FROM `%s` WHERE `name` = '%s'",char_db, character_name);
-	sql_query(tmp_sql,"status_change_request");
-
-	if ((sql_res = mysql_store_result(&mysql_handle))) {
-	    if ((sql_row = mysql_fetch_row(sql_res))) {
-	         memcpy(WFIFOP(fd,6), sql_row[1], 24); // put correct name if found
-	         WFIFOW(fd,32) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-
-    	     switch(RFIFOW(fd, 30)) {
-				case 1: // block
-					if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd,0) = 0x2724;
-							WFIFOL(login_fd,2) = atoi(sql_row[0]); // account value
-							WFIFOL(login_fd,6) = 5; // status of the account
-							WFIFOSET(login_fd, 10);
-//							printf("char : status -> login: account %d, status: %d \n", char_dat[i].account_id, 5);
+			sql_res = mysql_store_result(&mysql_handle);
+
+			if (sql_res) {
+				if (mysql_num_rows(sql_res)) {
+					sql_row = mysql_fetch_row(sql_res);
+					memcpy(WFIFOP(fd,6), sql_row[1], 24); // put correct name if found
+					WFIFOW(fd,32) = 0; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+					switch(RFIFOW(fd, 30)) {
+					case 1: // block
+						if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
+							if (login_fd > 0) { // don't send request if no login-server
+								WFIFOW(login_fd,0) = 0x2724;
+								WFIFOL(login_fd,2) = atoi(sql_row[0]); // account value
+								WFIFOL(login_fd,6) = 5; // status of the account
+								WFIFOSET(login_fd, 10);
+//								printf("char : status -> login: account %d, status: %d \n", char_dat[i].account_id, 5);
+							} else
+								WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
 						} else
-							WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					} else
-						WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					break;
-				case 2: // ban
-					if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd, 0) = 0x2725;
-							WFIFOL(login_fd, 2) = atoi(sql_row[0]); // account value
-							WFIFOW(login_fd, 6) = RFIFOW(fd,32); // year
-							WFIFOW(login_fd, 8) = RFIFOW(fd,34); // month
-							WFIFOW(login_fd,10) = RFIFOW(fd,36); // day
-							WFIFOW(login_fd,12) = RFIFOW(fd,38); // hour
-							WFIFOW(login_fd,14) = RFIFOW(fd,40); // minute
-							WFIFOW(login_fd,16) = RFIFOW(fd,42); // second
-							WFIFOSET(login_fd,18);
-//							printf("char : status -> login: account %d, ban: %dy %dm %dd %dh %dmn %ds\n",
-//							       char_dat[i].account_id, (short)RFIFOW(fd,32), (short)RFIFOW(fd,34), (short)RFIFOW(fd,36), (short)RFIFOW(fd,38), (short)RFIFOW(fd,40), (short)RFIFOW(fd,42));
+							WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+						break;
+					case 2: // ban
+						if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
+							if (login_fd > 0) { // don't send request if no login-server
+								WFIFOW(login_fd, 0) = 0x2725;
+								WFIFOL(login_fd, 2) = atoi(sql_row[0]); // account value
+								WFIFOW(login_fd, 6) = RFIFOW(fd,32); // year
+								WFIFOW(login_fd, 8) = RFIFOW(fd,34); // month
+								WFIFOW(login_fd,10) = RFIFOW(fd,36); // day
+								WFIFOW(login_fd,12) = RFIFOW(fd,38); // hour
+								WFIFOW(login_fd,14) = RFIFOW(fd,40); // minute
+								WFIFOW(login_fd,16) = RFIFOW(fd,42); // second
+								WFIFOSET(login_fd,18);
+//								printf("char : status -> login: account %d, ban: %dy %dm %dd %dh %dmn %ds\n",
+//								       char_dat[i].account_id, (short)RFIFOW(fd,32), (short)RFIFOW(fd,34), (short)RFIFOW(fd,36), (short)RFIFOW(fd,38), (short)RFIFOW(fd,40), (short)RFIFOW(fd,42));
+							} else
+								WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
 						} else
-							WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					} else
-						WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					break;
-				case 3: // unblock
-					if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd,0) = 0x2724;
-							WFIFOL(login_fd,2) = atoi(sql_row[0]); // account value
-							WFIFOL(login_fd,6) = 0; // status of the account
-							WFIFOSET(login_fd, 10);
-//							printf("char : status -> login: account %d, status: %d \n", char_dat[i].account_id, 0);
+							WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+						break;
+					case 3: // unblock
+						if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
+							if (login_fd > 0) { // don't send request if no login-server
+								WFIFOW(login_fd,0) = 0x2724;
+								WFIFOL(login_fd,2) = atoi(sql_row[0]); // account value
+								WFIFOL(login_fd,6) = 0; // status of the account
+								WFIFOSET(login_fd, 10);
+//								printf("char : status -> login: account %d, status: %d \n", char_dat[i].account_id, 0);
+							} else
+								WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
 						} else
-							WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					} else
-						WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					break;
-				case 4: // unban
-					if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd, 0) = 0x272a;
-							WFIFOL(login_fd, 2) = atoi(sql_row[0]); // account value
-							WFIFOSET(login_fd, 6);
-//							printf("char : status -> login: account %d, unban request\n", char_dat[i].account_id);
+							WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+						break;
+					case 4: // unban
+						if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
+							if (login_fd > 0) { // don't send request if no login-server
+								WFIFOW(login_fd, 0) = 0x272a;
+								WFIFOL(login_fd, 2) = atoi(sql_row[0]); // account value
+								WFIFOSET(login_fd, 6);
+//								printf("char : status -> login: account %d, unban request\n", char_dat[i].account_id);
+							} else
+								WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
 						} else
-							WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					} else
-						WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					break;
-				case 5: // changesex
-					if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd, 0) = 0x2727;
-							WFIFOL(login_fd, 2) = atoi(sql_row[0]); // account value
-							WFIFOSET(login_fd, 6);
-//							printf("char : status -> login: account %d, change sex request\n", char_dat[i].account_id);
+							WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+						break;
+					case 5: // changesex
+						if (acc == -1 || isGM(acc) >= isGM(atoi(sql_row[0]))) {
+							if (login_fd > 0) { // don't send request if no login-server
+								WFIFOW(login_fd, 0) = 0x2727;
+								WFIFOL(login_fd, 2) = atoi(sql_row[0]); // account value
+								WFIFOSET(login_fd, 6);
+//								printf("char : status -> login: account %d, change sex request\n", char_dat[i].account_id);
+							} else
+								WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
 						} else
-							WFIFOW(fd,32) = 3; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					} else
-						WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-					break;
-			 }
-		} else {
-			// character name not found
-			memcpy(WFIFOP(fd,6), character_name, 24);
-			WFIFOW(fd,32) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
-		}
-
-        // send answer if a player ask, not if the server ask
-		if (acc != -1) {
-			WFIFOSET(fd, 34);
-		}
-	}
-
-	RFIFOSKIP(fd, 44);
-
-	return 0;
-}
-
-int recieve_rates(int fd, int len) {
-    if (len < 6 || len < RFIFOW(fd,8))
-		return -1;
-
-	sprintf(tmp_sql, "INSERT INTO `ragsrvinfo` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d',`motd`='%s'",
-	        fd, server_name, RFIFOW(fd,2), RFIFOW(fd,4), RFIFOW(fd,6), RFIFOP(fd,10));
-	sql_query(tmp_sql,"recieve_rates");
-
-	RFIFOSKIP(fd,RFIFOW(fd,8));
-
-	return 0;
-}
-
-int set_offline(int fd, int len) {
-	if (len < 6 )
-		return -1;
-
-	#ifdef DEBUG
-	printf("Setting [%d] char offline\n",RFIFOL(fd,2));
-	#endif
-
-	sprintf(tmp_sql,"UPDATE `%s` SET `online`='0' WHERE `char_id`='%d'", char_db, RFIFOL(fd,2));
-	sql_query(tmp_sql,"set_offline");
-
-	RFIFOSKIP(fd,6);
-
-	return 0;
-}
-
-int parse_frommap(int fd) {
-	int len,res=0;
-	unsigned char id;
-
-	// Sometimes fd=0, and it will cause server crash. Don't know why. :(
-	if (fd <= 0) {
-		printf("parse_frommap error fd=0\n");
-		return 0;
-	}
-
-	for(id = 0; id < MAX_MAP_SERVERS && id < servers_connected; id++)
-		if (server_fd[id] == fd)
+							WFIFOW(fd,32) = 2; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+						break;
+					}
+				} else {
+					// character name not found
+					memcpy(WFIFOP(fd,6), character_name, 24);
+					WFIFOW(fd,32) = 1; // answer: 0-login-server resquest done, 1-player not found, 2-gm level too low, 3-login-server offline
+				}
+				// send answer if a player ask, not if the server ask
+				if (acc != -1) {
+					WFIFOSET(fd, 34);
+				}
+			}
+		  }
+			RFIFOSKIP(fd, 44);
 			break;
 
-	if(id == MAX_MAP_SERVERS || !servers_connected)
-		session[fd]->eof = 1;
-
-	if(session[fd]->eof) {
-		if (servers_connected) {
-			memset(&server[id], 0, sizeof(struct mmo_map_server));
-
-			printf("Map-server %d (session #%d) has disconnected.\n", id, fd);
-
-			sprintf(tmp_sql, "DELETE FROM `ragsrvinfo` WHERE `index`='%d'", server_fd[id]);
-			sql_query(tmp_sql,"parse_frommap");
-
-			server_fd[id] = -1;
-
-			servers_connected--;
-		}
-		close(fd);
-		delete_session(fd);
-		return 0;
-	}
-
-	len = RFIFOREST(fd);
+		// Recieve rates [Wizputer]
+		case 0x2b16:
+			if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,8))
+				return 0;
+			sprintf(tmp_sql, "INSERT INTO `ragsrvinfo` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d',`motd`='%s'",
+			        fd, server_name, RFIFOW(fd,2), RFIFOW(fd,4), RFIFOW(fd,6), RFIFOP(fd,10));
+			if (mysql_query(&mysql_handle, tmp_sql)) {
+				printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+			}
+			RFIFOSKIP(fd,RFIFOW(fd,8));
+			break;
 
-	while(len >= 2 && res == 0) {
-	    #ifdef DEBUG
-		printf("parse_frommap : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd,0));
-		#endif
+		// Character disconnected set online 0 [Wizputer]
+		case 0x2b17:
+			if (RFIFOREST(fd) < 6 )
+				return 0;
+			//printf("Setting %d char offline\n",RFIFOL(fd,2));
+			set_char_offline(RFIFOL(fd,2),RFIFOL(fd,6));
+			RFIFOSKIP(fd,10);
+			break;
+		// Reset all chars to offline [Wizputer]
+		case 0x2b18:
+		    set_all_offline();
+			RFIFOSKIP(fd,2);
+			break;
+		// Character set online [Wizputer]
+		case 0x2b19:
+			if (RFIFOREST(fd) < 6 )
+				return 0;
+			//printf("Setting %d char online\n",RFIFOL(fd,2));
+			set_char_online(RFIFOL(fd,2),RFIFOL(fd,6));
+			RFIFOSKIP(fd,10);
+			break;
 
-		switch(RFIFOW(fd, 0)) {
-		case 0x2af7: res = read_gm_accounts(fd,len);      break;
-		case 0x2afa: res = recv_map_names(fd,len,id);     break;
-		case 0x2afc: res = auth_request(fd,len);          break;
-		case 0x2aff: res = set_map_users(fd,len,id);      break;
-		case 0x2b01: res = save_char(fd,len);	          break;
-		case 0x2b02: res = request_char_select(fd,len);   break;
-		case 0x2b05: res = request_change_map(fd,len);	  break;
-		case 0x2b08: res = char_name_check(fd,len);       break;
-		case 0x2b10: res = account_reg(fd,len);  		  break;
-		case 0x2b0c: res = change_email_request(fd,len);  break;
-		case 0x2b0e: res = status_change_request(fd,len); break;
-		case 0x2b16: res = recieve_rates(fd,len);         break;
-		case 0x2b17: res = set_offline(fd,len);			  break;
-
-        default:
+		default:
 			// inter server - packet
 			{
 				int r = inter_parse_frommap(fd);
@@ -2051,8 +2304,6 @@ int parse_frommap(int fd) {
 			session[fd]->eof = 1;
 			return 0;
 		}
-
-		len = RFIFOREST(fd);
 	}
 	return 0;
 }
@@ -2069,7 +2320,7 @@ int search_mapserver(char *map) {
 		temp_map[strchr(temp_map, '.') - temp_map + 1] = '\0'; // suppress the '.gat', but conserve the '.' to be sure of the name of the map
 
 	temp_map_len = strlen(temp_map);
-	for(i = 0; i < MAX_MAP_SERVERS && i < servers_connected; i++)
+	for(i = 0; i < MAX_MAP_SERVERS; i++)
 		if (server_fd[i] >= 0)
 			for (j = 0; server[i].map[j][0]; j++)
 				//printf("%s : %s = %d\n", server[i].map[j], map, strncmp(server[i].map[j], temp_map, temp_map_len));
@@ -2112,470 +2363,568 @@ int lan_ip_check(unsigned char *p){
 	return lancheck;
 }
 
-int client_request_connect(int fd, int len) {
-	if (len < 17)
-	    return -1;
-
-   	struct char_session_data *sd = session[fd]->session_data;
-   	int i;
+int parse_char(int fd) {
+	int i, ch = 0;
+	char email[40];
+	unsigned short cmd;
+	struct char_session_data *sd;
+	unsigned char *p = (unsigned char *) &session[fd]->client_addr.sin_addr;
 
-	#ifdef DEBUG
-   	printf("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
-   	#endif
+	sd = (struct char_session_data*)session[fd]->session_data;
 
-	if (sd == NULL) {
-		CREATE(session[fd]->session_data, struct char_session_data, 1);
-		sd = session[fd]->session_data;
-		sd->connect_until_time = 0; // unknow or illimited (not displaying on map-server)
+	if(login_fd < 0)
+		session[fd]->eof = 1;
+	if(session[fd]->eof) {
+		if (fd == login_fd)
+			login_fd = -1;
+		if (sd != NULL)
+			set_char_offline(99,sd->account_id);
+		close(fd);
+		delete_session(fd);
+		return 0;
 	}
 
-	sd->account_id = RFIFOL(fd, 2);
-	sd->login_id1 = RFIFOL(fd, 6);
-	sd->login_id2 = RFIFOL(fd, 10);
-	sd->sex = RFIFOB(fd, 16);
+	while(RFIFOREST(fd) >= 2) {
+		cmd = RFIFOW(fd,0);
+		// crc32のスキップ用
+		if(	sd==NULL			&&	// 未ログインor管理パケット
+			RFIFOREST(fd)>=4	&&	// 最低バイト数制限 ＆ 0x7530,0x7532管理パケ除去
+			RFIFOREST(fd)<=21	&&	// 最大バイト数制限 ＆ サーバーログイン除去
+			cmd!=0x20b	&&	// md5通知パケット除去
+			(RFIFOREST(fd)<6 || RFIFOW(fd,4)==0x65)	){	// 次に何かパケットが来てるなら、接続でないとだめ
+			RFIFOSKIP(fd,4);
+			cmd = RFIFOW(fd,0);
+			printf("parse_char : %d crc32 skipped\n",fd);
+			if(RFIFOREST(fd)==0)
+				return 0;
+		}
 
-	WFIFOL(fd, 0) = RFIFOL(fd, 2);
-	WFIFOSET(fd, 4);
+//		if(cmd<30000 && cmd!=0x187)
+//			printf("parse_char : %d %d %d\n",fd,RFIFOREST(fd),cmd);
 
-	for(i = 0; i < AUTH_FIFO_SIZE; i++) {
-		if(auth_fifo[i].account_id == sd->account_id &&
-		   auth_fifo[i].login_id1 == sd->login_id1 &&
-#if CMP_AUTHFIFO_LOGIN2 != 0
-		   auth_fifo[i].login_id2 == sd->login_id2 && // relate to the versions higher than 18
-#endif
-		   (!check_ip_flag || auth_fifo[i].ip == session[fd]->client_addr.sin_addr.s_addr) &&
-		   auth_fifo[i].delflag == 2) {
-		   auth_fifo[i].delflag = 1;
-
-		   if (max_connect_user == 0 || count_users() < max_connect_user) {
-		       if (login_fd > 0) { // don't send request if no login-server
-			       // request to login-server to obtain e-mail/time limit
-			       WFIFOW(login_fd,0) = 0x2716;
-			       WFIFOL(login_fd,2) = sd->account_id;
-			       WFIFOSET(login_fd,6);
-               }
-
-               // send characters to player
-               mmo_char_send006b(fd, sd);
-           } else {
-               // refuse connection (over populated)
-               WFIFOW(fd,0) = 0x6c;
-               WFIFOW(fd,2) = 0;
-               WFIFOSET(fd,3);
-           }
-
-           #ifdef DEBUG
-           printf("connection request> set delflag 1(o:2)- account_id:%d/login_id1:%d(fifo_id:%d)\n", sd->account_id, sd->login_id1, i);
-           #endif
-
-           break;
-       }
-	}
-	if (i == AUTH_FIFO_SIZE) {
-		if (login_fd > 0) { // don't send request if no login-server
-			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) = session[fd]->client_addr.sin_addr.s_addr;
-			WFIFOSET(login_fd,19);
-		} else { // if no login-server, we must refuse connection
-			WFIFOW(fd,0) = 0x6c;
-			WFIFOW(fd,2) = 0;
-			WFIFOSET(fd,3);
-		}
-	}
+		// 不正パケットの処理
+//		if (sd == NULL && cmd != 0x65 && cmd != 0x20b && cmd != 0x187 &&
+//					 cmd != 0x2af8 && cmd != 0x7530 && cmd != 0x7532)
+//			cmd = 0xffff;	// パケットダンプを表示させる
 
-	#ifdef DEBUG
-	if (isGM(RFIFOL(fd,2)))
-		printf("Account Logged On; Account ID: %d (GM level %d).\n", RFIFOL(fd,2), isGM(RFIFOL(fd,2)));
-	else
-		printf("Account Logged On; Account ID: %d.\n", RFIFOL(fd,2));
-	#endif
+		switch(cmd){
+		case 0x20b: //20040622 encryption ragexe correspondence
+			if (RFIFOREST(fd) < 19)
+				return 0;
+			RFIFOSKIP(fd,19);
+			break;
 
-	RFIFOSKIP(fd, 17);
+		case 0x65: // request to connect
+			printf("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
+			if (RFIFOREST(fd) < 17)
+				return 0;
+		  {
+/*removed from isGM setup
+			if (isGM(RFIFOL(fd,2)))
+				printf("Account Logged On; Account ID: %d (GM level %d).\n", RFIFOL(fd,2), isGM(RFIFOL(fd,2)));
+			else
+				printf("Account Logged On; Account ID: %d.\n", RFIFOL(fd,2));
+*/
+			if (sd == NULL) {
+				CREATE(session[fd]->session_data, struct char_session_data, 1);
+				sd = (struct char_session_data*)session[fd]->session_data;
+				sd->connect_until_time = 0; // unknow or illimited (not displaying on map-server)
+			}
+			sd->account_id = RFIFOL(fd, 2);
+			sd->login_id1 = RFIFOL(fd, 6);
+			sd->login_id2 = RFIFOL(fd, 10);
+			sd->sex = RFIFOB(fd, 16);
 
-	return 0;
-}
+			WFIFOL(fd, 0) = RFIFOL(fd, 2);
+			WFIFOSET(fd, 4);
 
-int char_select(int fd, int len, unsigned char *ip) {
-	if (len < 3)
-		return -1;
+			for(i = 0; i < AUTH_FIFO_SIZE; i++) {
+				if (auth_fifo[i].account_id == sd->account_id &&
+				    auth_fifo[i].login_id1 == sd->login_id1 &&
+#if CMP_AUTHFIFO_LOGIN2 != 0
+				    auth_fifo[i].login_id2 == sd->login_id2 && // relate to the versions higher than 18
+#endif
+				    (!check_ip_flag || auth_fifo[i].ip == session[fd]->client_addr.sin_addr.s_addr) &&
+				    auth_fifo[i].delflag == 2) {
+					auth_fifo[i].delflag = 1;
+
+				if (max_connect_user == 0 || count_users() < max_connect_user) {
+					if (login_fd > 0) { // don't send request if no login-server
+						// request to login-server to obtain e-mail/time limit
+						WFIFOW(login_fd,0) = 0x2716;
+						WFIFOL(login_fd,2) = sd->account_id;
+						WFIFOSET(login_fd,6);
+					}
+					// send characters to player
+					mmo_char_send006b(fd, sd);
+				} else {
+					// refuse connection (over populated)
+					WFIFOW(fd,0) = 0x6c;
+					WFIFOW(fd,2) = 0;
+					WFIFOSET(fd,3);
+				}
+//				printf("connection request> set delflag 1(o:2)- account_id:%d/login_id1:%d(fifo_id:%d)\n", sd->account_id, sd->login_id1, i);
+				break;
+				}
+			}
+			if (i == AUTH_FIFO_SIZE) {
+				if (login_fd > 0) { // don't send request if no login-server
+					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) = session[fd]->client_addr.sin_addr.s_addr;
+					WFIFOSET(login_fd,19);
+				} else { // if no login-server, we must refuse connection
+					WFIFOW(fd,0) = 0x6c;
+					WFIFOW(fd,2) = 0;
+					WFIFOSET(fd,3);
+				}
+			}
+		  }
+			RFIFOSKIP(fd, 17);
+			break;
 
-	int i;
-	struct char_session_data *sd = session[fd]->session_data;
+		case 0x66: // char select
+//			printf("0x66> request connect - account_id:%d/char_num:%d\n",sd->account_id,RFIFOB(fd, 2));
+			if (RFIFOREST(fd) < 3)
+				return 0;
 
-	#ifdef DEBUG
-	printf("0x66> request connect - account_id:%d/char_num:%d\n",sd->account_id,RFIFOB(fd, 2));
-	#endif
+                        if (sd == NULL)
+                          return 0;
 
-	sprintf(tmp_sql, "SELECT `char_id` FROM `%s` WHERE `account_id`='%d' AND `char_num`='%d'",char_db, sd->account_id, RFIFOB(fd, 2));
-	sql_query(tmp_sql,"char_select");
+			sprintf(tmp_sql, "SELECT `char_id` FROM `%s` WHERE `account_id`='%d' AND `char_num`='%d'",char_db, sd->account_id, RFIFOB(fd, 2));
+			if (mysql_query(&mysql_handle, tmp_sql)) {
+				printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+			}
+			sql_res = mysql_store_result(&mysql_handle);
 
-	if ((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res))) {
-		mmo_char_fromsql(atoi(sql_row[0]), char_dat, 0);
-		mysql_free_result(sql_res);
-	} else {
-		mysql_free_result(sql_res);
-		RFIFOSKIP(fd, 3);
-		return 0;
-	}
+			sql_row = mysql_fetch_row(sql_res);
 
-	sprintf(tmp_sql,"INSERT DELAYED INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
-			charlog_db, sd->account_id, RFIFOB(fd, 2), char_dat[0].name);
-	sql_query(tmp_sql,"char_select");
+			if (sql_row)
+				mmo_char_fromsql(atoi(sql_row[0]), char_dat, 1);
+			else {
+				mysql_free_result(sql_res);
+				RFIFOSKIP(fd, 3);
+				break;
+			}
 
-    #ifdef DEBUG
-	printf("(\033[1;64m%d\033[0m) char selected (\033[1;32m%d\033[0m) \033[1;32m%s\033[0m" RETCODE, sd->account_id, RFIFOB(fd, 2), char_dat[0].name);
-	#endif
+			if (log_char) {
+				sprintf(tmp_sql,"INSERT INTO `%s`(`time`, `account_id`,`char_num`,`name`) VALUES (NOW(), '%d', '%d', '%s')",
+					charlog_db, sd->account_id, RFIFOB(fd, 2), char_dat[0].name);
+				//query
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+					printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
+			}
+			printf("(\033[1;64m%d\033[0m) char selected (\033[1;32m%d\033[0m) \033[1;32m%s\033[0m" RETCODE, sd->account_id, RFIFOB(fd, 2), char_dat[0].name);
+
+			i = search_mapserver(char_dat[0].last_point.map);
+
+			// if map is not found, we check major cities
+			if (i < 0) {
+				if ((i = search_mapserver("prontera.gat")) >= 0) { // check is done without 'gat'.
+					memcpy(char_dat[0].last_point.map, "prontera.gat", 16);
+					char_dat[0].last_point.x = 273; // savepoint coordonates
+					char_dat[0].last_point.y = 354;
+				} else if ((i = search_mapserver("geffen.gat")) >= 0) { // check is done without 'gat'.
+					memcpy(char_dat[0].last_point.map, "geffen.gat", 16);
+					char_dat[0].last_point.x = 120; // savepoint coordonates
+					char_dat[0].last_point.y = 100;
+				} else if ((i = search_mapserver("morocc.gat")) >= 0) { // check is done without 'gat'.
+					memcpy(char_dat[0].last_point.map, "morocc.gat", 16);
+					char_dat[0].last_point.x = 160; // savepoint coordonates
+					char_dat[0].last_point.y = 94;
+				} else if ((i = search_mapserver("alberta.gat")) >= 0) { // check is done without 'gat'.
+					memcpy(char_dat[0].last_point.map, "alberta.gat", 16);
+					char_dat[0].last_point.x = 116; // savepoint coordonates
+					char_dat[0].last_point.y = 57;
+				} else if ((i = search_mapserver("payon.gat")) >= 0) { // check is done without 'gat'.
+					memcpy(char_dat[0].last_point.map, "payon.gat", 16);
+					char_dat[0].last_point.x = 87; // savepoint coordonates
+					char_dat[0].last_point.y = 117;
+				} else if ((i = search_mapserver("izlude.gat")) >= 0) { // check is done without 'gat'.
+					memcpy(char_dat[0].last_point.map, "izlude.gat", 16);
+					char_dat[0].last_point.x = 94; // savepoint coordonates
+					char_dat[0].last_point.y = 103;
+				} else {
+					int j;
+					// get first online server
+					i = 0;
+					for(j = 0; j < MAX_MAP_SERVERS; j++)
+						if (server_fd[j] >= 0 && server[j].map[0][0])  {
+							i = j;
+							printf("Map-server #%d found with a map: '%s'.\n", j, server[j].map[0]);
+							break;
+						}
+					// if no map-servers are connected, we send: server closed
+					if (j == MAX_MAP_SERVERS) {
+						WFIFOW(fd,0) = 0x81;
+						WFIFOL(fd,2) = 1; // 01 = Server closed
+						WFIFOSET(fd,3);
+						RFIFOSKIP(fd,3);
+						break;
+					}
+				}
+			}
+			WFIFOW(fd, 0) =0x71;
+			WFIFOL(fd, 2) =char_dat[0].char_id;
+			memcpy(WFIFOP(fd, 6), char_dat[0].last_point.map, 16);
+			//Lan check added by Kashy
+			if (lan_ip_check(p))
+				WFIFOL(fd, 22) = inet_addr(lan_map_ip);
+			else
+				WFIFOL(fd, 22) = server[i].ip;
+			WFIFOW(fd, 26) = server[i].port;
+			WFIFOSET(fd, 28);
+
+			if (auth_fifo_pos >= AUTH_FIFO_SIZE) {
+				auth_fifo_pos = 0;
+			}
+//			printf("auth_fifo set (auth_fifo_pos:%d) - account_id:%d char_id:%d login_id1:%d\n", auth_fifo_pos, sd->account_id, char_dat[0].char_id, sd->login_id1);
+			auth_fifo[auth_fifo_pos].account_id = sd->account_id;
+			auth_fifo[auth_fifo_pos].char_id = char_dat[0].char_id;
+			auth_fifo[auth_fifo_pos].login_id1 = sd->login_id1;
+			auth_fifo[auth_fifo_pos].login_id2 = sd->login_id2;
+			auth_fifo[auth_fifo_pos].delflag = 0;
+			//auth_fifo[auth_fifo_pos].char_pos = sd->found_char[ch];
+			auth_fifo[auth_fifo_pos].char_pos = 0;
+			auth_fifo[auth_fifo_pos].sex = sd->sex;
+			auth_fifo[auth_fifo_pos].connect_until_time = sd->connect_until_time;
+			auth_fifo[auth_fifo_pos].ip = session[fd]->client_addr.sin_addr.s_addr;
+			auth_fifo_pos++;
+//			printf("0x66> end\n");
+			RFIFOSKIP(fd, 3);
+			break;
 
-	i = search_mapserver(char_dat[0].last_point.map);
-
-	// if map is not found, we check major cities
-	if (i < 0) {
-		if ((i = search_mapserver("prontera.gat")) >= 0) { // check is done without 'gat'.
-			memcpy(char_dat[0].last_point.map, "prontera.gat", 16);
-			char_dat[0].last_point.x = 273; // savepoint coordonates
-			char_dat[0].last_point.y = 354;
-		} else if ((i = search_mapserver("geffen.gat")) >= 0) { // check is done without 'gat'.
-			memcpy(char_dat[0].last_point.map, "geffen.gat", 16);
-			char_dat[0].last_point.x = 120; // savepoint coordonates
-			char_dat[0].last_point.y = 100;
-		} else if ((i = search_mapserver("morocc.gat")) >= 0) { // check is done without 'gat'.
-			memcpy(char_dat[0].last_point.map, "morocc.gat", 16);
-			char_dat[0].last_point.x = 160; // savepoint coordonates
-			char_dat[0].last_point.y = 94;
-		} else if ((i = search_mapserver("alberta.gat")) >= 0) { // check is done without 'gat'.
-			memcpy(char_dat[0].last_point.map, "alberta.gat", 16);
-			char_dat[0].last_point.x = 116; // savepoint coordonates
-			char_dat[0].last_point.y = 57;
-		} else if ((i = search_mapserver("payon.gat")) >= 0) { // check is done without 'gat'.
-			memcpy(char_dat[0].last_point.map, "payon.gat", 16);
-			char_dat[0].last_point.x = 87; // savepoint coordonates
-			char_dat[0].last_point.y = 117;
-		} else if ((i = search_mapserver("izlude.gat")) >= 0) { // check is done without 'gat'.
-			memcpy(char_dat[0].last_point.map, "izlude.gat", 16);
-			char_dat[0].last_point.x = 94; // savepoint coordonates
-			char_dat[0].last_point.y = 103;
-		} else {
-			int j;
-			// get first online server
+		case 0x67:	// make new
+//			printf("0x67>request make new char\n");
+			if (RFIFOREST(fd) < 37)
+				return 0;
+			i = make_new_char_sql(fd, RFIFOP(fd, 2));
+
+			//if (i < 0) {
+			//	WFIFOW(fd, 0) = 0x6e;
+			//	WFIFOB(fd, 2) = 0x00;
+			//	WFIFOSET(fd, 3);
+			//	RFIFOSKIP(fd, 37);
+			//	break;
+			//}
+			//Changed that we can support 'Charname already exists' (-1) amd 'Char creation denied' (-2)
+			//And 'You are underaged' (-3) (XD) [Sirius]
+			if(i == -1){
+                            //already exists
+                            WFIFOW(fd, 0) = 0x6e;
+                            WFIFOB(fd, 2) = 0x00;
+                            WFIFOSET(fd, 3);
+                            RFIFOSKIP(fd, 37);
+                            break;
+                        }else if(i == -2){
+                            //denied
+                            WFIFOW(fd, 0) = 0x6e;
+                            WFIFOB(fd, 2) = 0x02;
+                            WFIFOSET(fd, 3); 
+                            RFIFOSKIP(fd, 37);                           
+                            break;
+                        }else if(i == -3){
+                            //underaged XD
+                            WFIFOW(fd, 0) = 0x6e;
+                            WFIFOB(fd, 2) = 0x01;
+                            WFIFOSET(fd, 3);
+                            RFIFOSKIP(fd, 37);
+                            break;
+                        }
+
+			WFIFOW(fd, 0) = 0x6d;
+			memset(WFIFOP(fd, 2), 0x00, 106);
+
+			mmo_char_fromsql(i, char_dat, 0);
 			i = 0;
-			for(j = 0; j < MAX_MAP_SERVERS && i < servers_connected; j++)
-				if (server_fd[j] >= 0 && server[j].map[0][0])  {
-					i = j;
-					printf("Map-server #%d found with a map: '%s'.\n", j, server[j].map[0]);
+			WFIFOL(fd, 2) = char_dat[i].char_id;
+			WFIFOL(fd,2+4) = char_dat[i].base_exp;
+			WFIFOL(fd,2+8) = char_dat[i].zeny;
+			WFIFOL(fd,2+12) = char_dat[i].job_exp;
+			WFIFOL(fd,2+16) = char_dat[i].job_level;
+
+			WFIFOL(fd,2+28) = char_dat[i].karma;
+			WFIFOL(fd,2+32) = char_dat[i].manner;
+
+			WFIFOW(fd,2+40) = 0x30;
+			WFIFOW(fd,2+42) = (char_dat[i].hp > 0x7fff) ? 0x7fff : char_dat[i].hp;
+			WFIFOW(fd,2+44) = (char_dat[i].max_hp > 0x7fff) ? 0x7fff : char_dat[i].max_hp;
+			WFIFOW(fd,2+46) = (char_dat[i].sp > 0x7fff) ? 0x7fff : char_dat[i].sp;
+			WFIFOW(fd,2+48) = (char_dat[i].max_sp > 0x7fff) ? 0x7fff : char_dat[i].max_sp;
+			WFIFOW(fd,2+50) = DEFAULT_WALK_SPEED; // char_dat[i].speed;
+			WFIFOW(fd,2+52) = char_dat[i].class_;
+			WFIFOW(fd,2+54) = char_dat[i].hair;
+
+			WFIFOW(fd,2+58) = char_dat[i].base_level;
+			WFIFOW(fd,2+60) = char_dat[i].skill_point;
+
+			WFIFOW(fd,2+64) = char_dat[i].shield;
+			WFIFOW(fd,2+66) = char_dat[i].head_top;
+			WFIFOW(fd,2+68) = char_dat[i].head_mid;
+			WFIFOW(fd,2+70) = char_dat[i].hair_color;
+
+			memcpy(WFIFOP(fd,2+74), char_dat[i].name, 24);
+
+			WFIFOB(fd,2+98) = char_dat[i].str;
+			WFIFOB(fd,2+99) = char_dat[i].agi;
+			WFIFOB(fd,2+100) = char_dat[i].vit;
+			WFIFOB(fd,2+101) = char_dat[i].int_;
+			WFIFOB(fd,2+102) = char_dat[i].dex;
+			WFIFOB(fd,2+103) = char_dat[i].luk;
+			WFIFOB(fd,2+104) = char_dat[i].char_num;
+
+			WFIFOSET(fd, 108);
+			RFIFOSKIP(fd, 37);
+			//to do
+			for(ch = 0; ch < 9; ch++) {
+				if (sd->found_char[ch] == -1) {
+					sd->found_char[ch] = char_dat[i].char_id;
 					break;
 				}
-			// if no map-servers are connected, we send: server closed
-			if (j == MAX_MAP_SERVERS) {
-				WFIFOW(fd,0) = 0x81;
-				WFIFOL(fd,2) = 1; // 01 = Server closed
-				WFIFOSET(fd,3);
-				RFIFOSKIP(fd,3);
-				return 0;
 			}
-		}
-	}
-
-	WFIFOW(fd, 0) =0x71;
-	WFIFOL(fd, 2) =char_dat[0].char_id;
-	memcpy(WFIFOP(fd, 6), char_dat[0].last_point.map, 16);
-
-	//Lan check added by Kashy
-	if (lan_ip_check(ip))
-		WFIFOL(fd, 22) = inet_addr(lan_map_ip);
-	else
-		WFIFOL(fd, 22) = server[i].ip;
-
-	WFIFOW(fd, 26) = server[i].port;
-	WFIFOSET(fd, 28);
 
-	if (auth_fifo_pos >= AUTH_FIFO_SIZE)
-		auth_fifo_pos = 0;
-
-	#ifdef DEBUG
-	printf("auth_fifo set (auth_fifo_pos:%d) - account_id:%d char_id:%d login_id1:%d\n", auth_fifo_pos, sd->account_id, char_dat[0].char_id, sd->login_id1);
-	#endif
-
-	auth_fifo[auth_fifo_pos].account_id = sd->account_id;
-	auth_fifo[auth_fifo_pos].char_id = char_dat[0].char_id;
-	auth_fifo[auth_fifo_pos].login_id1 = sd->login_id1;
-	auth_fifo[auth_fifo_pos].login_id2 = sd->login_id2;
-	auth_fifo[auth_fifo_pos].delflag = 0;
-	//auth_fifo[auth_fifo_pos].char_pos = sd->found_char[ch];
-	auth_fifo[auth_fifo_pos].char_pos = 0;
-	auth_fifo[auth_fifo_pos].sex = sd->sex;
-	auth_fifo[auth_fifo_pos].connect_until_time = sd->connect_until_time;
-	auth_fifo[auth_fifo_pos].ip = session[fd]->client_addr.sin_addr.s_addr;
-	auth_fifo_pos++;
+		case 0x68: // delete
+			if (RFIFOREST(fd) < 46)
+				return 0;
+			printf("\033[1;31m Request Char Del:\033[0m \033[1;32m%d\033[0m(\033[1;32m%d\033[0m)\n", sd->account_id, RFIFOL(fd, 2));
+			memcpy(email, RFIFOP(fd,6), 40);
+			sprintf(tmp_sql, "SELECT `email` FROM `%s` WHERE `%s`='%d'",login_db, login_db_account_id, sd->account_id);
+			if (mysql_query(&lmysql_handle, tmp_sql)) {
+				printf("\033[1;31m DB server Error Delete Char data - %s \033[0m  \n", mysql_error(&lmysql_handle));
+			}
+			sql_res = mysql_store_result(&lmysql_handle);
+			if (sql_res) {
+				sql_row = mysql_fetch_row(sql_res);
+
+				if ( (strcmp(email,sql_row[0]) == 0) || // client_value == db_value?
+					 ((strcmp(email,"") == 0) &&
+					  (strcmp(sql_row[0],"a@a.com") == 0)) ) { // client_value == "" && db_value == "a@a.com" ?
+					mysql_free_result(sql_res);
+				} else {
+					WFIFOW(fd, 0) = 0x70;
+					WFIFOB(fd, 2) = 0;
+					WFIFOSET(fd, 3);
+					RFIFOSKIP(fd, 46);
+					mysql_free_result(sql_res);
+					break;
+				}
+			} else {
+				WFIFOW(fd, 0) = 0x70;
+				WFIFOB(fd, 2) = 0;
+				WFIFOSET(fd, 3);
+				RFIFOSKIP(fd, 46);
+				mysql_free_result(sql_res);
+				break;
+			}
+			sprintf(tmp_sql, "SELECT `name`,`partner_id` FROM `%s` WHERE `char_id`='%d'",char_db, RFIFOL(fd,2));
+			if (mysql_query(&mysql_handle, tmp_sql)) {
+				printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+			}
+			sql_res = mysql_store_result(&mysql_handle);
+			if(sql_res)
+				sql_row = mysql_fetch_row(sql_res);
+
+			if (sql_res && sql_row[0]) {
+				//delete char from SQL
+				sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",pet_db, RFIFOL(fd, 2));
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
+				sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",inventory_db, RFIFOL(fd, 2));
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
 
-//	printf("0x66> end\n");
+				sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",cart_db, RFIFOL(fd, 2));
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
 
-	RFIFOSKIP(fd, 3);
+				sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",memo_db, RFIFOL(fd, 2));
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
 
-	return 0;
-}
+				sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",skill_db, RFIFOL(fd, 2));
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
 
-int make_new_char(int fd, int len) {
-	if (len < 37)
-		return -1;
+				sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",char_db, RFIFOL(fd, 2));
+				if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
 
-    int i, ch;
-    struct char_session_data *sd = session[fd]->session_data;
+				//Divorce [Wizputer]
+				if (sql_row[1] != 0) {
+					unsigned char buf[64];
+					sprintf(tmp_sql,"UPDATE `%s` SET `partner_id`='0' WHERE `char_id`='%d'",char_db,atoi(sql_row[1]));
+					if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+					}
+					sprintf(tmp_sql,"DELETE FROM `%s` WHERE (`nameid`='%d' OR `nameid`='%d') AND `char_id`='%d'",inventory_db,WEDDING_RING_M,WEDDING_RING_F,atoi(sql_row[1]));
+					if(mysql_query(&mysql_handle, tmp_sql)) {
+						printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+					}
+					WBUFW(buf,0) = 0x2b12;
+					WBUFL(buf,2) = atoi(sql_row[0]);
+					WBUFL(buf,6) = atoi(sql_row[1]);
+					mapif_sendall(buf,10);
+				}
+				// Also delete info from guildtables.
+				sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",guild_member_db, RFIFOL(fd,2));
+				if (mysql_query(&mysql_handle, tmp_sql)) {
+					printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
 
-	#ifdef DEBUG
-	printf("Request to make a new char\n");
-	#endif
+				sprintf(tmp_sql, "SELECT `guild_id` FROM `%s` WHERE `master` = '%s'", guild_db, sql_row[0]);
 
-	i = make_new_char_sql(fd, RFIFOP(fd, 2));
+				if (mysql_query(&mysql_handle, tmp_sql) == 0) {
+					sql_res = mysql_store_result(&mysql_handle);
 
-	if (i < 0) {
-		WFIFOW(fd, 0) = 0x6e;
-		WFIFOB(fd, 2) = 0x00;
-		WFIFOSET(fd, 3);
-		RFIFOSKIP(fd, 37);
-		return 0;
-	}
+					if (sql_res != NULL) {
+						if (mysql_num_rows(sql_res) != 0) {
+							sql_row = mysql_fetch_row(sql_res);
 
-	WFIFOW(fd, 0) = 0x6d;
-	memset(WFIFOP(fd, 2), 0x00, 106);
+							sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_db, atoi(sql_row[0]));
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+							}
 
-	mmo_char_fromsql(i, char_dat, 0);
+							sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_member_db, atoi(sql_row[0]));
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+							}
 
-	i = 0;
+							sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_castle_db, atoi(sql_row[0]));
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+							}
 
-	WFIFOL(fd, 2) = char_dat[i].char_id;
-	WFIFOL(fd,2+4) = char_dat[i].base_exp;
-	WFIFOL(fd,2+8) = char_dat[i].zeny;
-	WFIFOL(fd,2+12) = char_dat[i].job_exp;
-	WFIFOL(fd,2+16) = char_dat[i].job_level;
-	WFIFOL(fd,2+28) = char_dat[i].karma;
-	WFIFOL(fd,2+32) = char_dat[i].manner;
-	WFIFOW(fd,2+40) = 0x30;
-	WFIFOW(fd,2+42) = (char_dat[i].hp > 0x7fff) ? 0x7fff : char_dat[i].hp;
-	WFIFOW(fd,2+44) = (char_dat[i].max_hp > 0x7fff) ? 0x7fff : char_dat[i].max_hp;
-	WFIFOW(fd,2+46) = (char_dat[i].sp > 0x7fff) ? 0x7fff : char_dat[i].sp;
-	WFIFOW(fd,2+48) = (char_dat[i].max_sp > 0x7fff) ? 0x7fff : char_dat[i].max_sp;
-	WFIFOW(fd,2+50) = DEFAULT_WALK_SPEED; // char_dat[i].speed;
-	WFIFOW(fd,2+52) = char_dat[i].class;
-	WFIFOW(fd,2+54) = char_dat[i].hair;
-	WFIFOW(fd,2+58) = char_dat[i].base_level;
-	WFIFOW(fd,2+60) = char_dat[i].skill_point;
-	WFIFOW(fd,2+64) = char_dat[i].shield;
-	WFIFOW(fd,2+66) = char_dat[i].head_top;
-	WFIFOW(fd,2+68) = char_dat[i].head_mid;
-	WFIFOW(fd,2+70) = char_dat[i].hair_color;
-	memcpy(WFIFOP(fd,2+74), char_dat[i].name, 24);
-	WFIFOB(fd,2+98) = char_dat[i].str;
-	WFIFOB(fd,2+99) = char_dat[i].agi;
-	WFIFOB(fd,2+100) = char_dat[i].vit;
-	WFIFOB(fd,2+101) = char_dat[i].int_;
-	WFIFOB(fd,2+102) = char_dat[i].dex;
-	WFIFOB(fd,2+103) = char_dat[i].luk;
-	WFIFOB(fd,2+104) = char_dat[i].char_num;
-	WFIFOSET(fd, 108);
-
-	RFIFOSKIP(fd, 37);
-
-	//to do
-	for(ch = 0; ch < 9; ch++) {
-		if (sd->found_char[ch] == -1) {
-			sd->found_char[ch] = char_dat[i].char_id;
-			break;
-		}
-	}
+							sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_storage_db, atoi(sql_row[0]));
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+							}
 
-	return 0;
-}
+							sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '%d' OR `alliance_id` = '%d'", guild_alliance_db, atoi(sql_row[0]), atoi(sql_row[0]));
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+							}
 
-int delete_char(int fd, int len) {
-	if (len < 46)
-		return -1;
+							sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_position_db, atoi(sql_row[0]));
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+							}
 
-	char email[40];
-	int char_id = RFIFOL(fd, 2);
-	struct char_session_data *sd = session[fd]->session_data;
+							sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_skill_db, atoi(sql_row[0]));
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+							}
 
-	#ifdef DEBUG
-	printf("\033[1;31m Request Char Del:\033[0m \033[1;32m%d\033[0m(\033[1;32m%d\033[0m)\n", sd->account_id, char_id);
-	#endif
+							sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '%d'", guild_expulsion_db, atoi(sql_row[0]));
+							if (mysql_query(&mysql_handle, tmp_sql)) {
+								printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+							}
 
-	memcpy(email, RFIFOP(fd,6), 40);
-	sprintf(tmp_sql, "SELECT `email` FROM `%s` WHERE `%s`='%d'",login_db, login_db_account_id, sd->account_id);
-	sql_query(tmp_sql,"delete_char");
+							mysql_free_result(sql_res);
+						}
+					} else {
+						if (mysql_errno(&mysql_handle) != 0) {
+							printf("Database server error: %s\n", mysql_error(&mysql_handle));
+						}
+					}
+				} else {
+					printf("DB server Error - %s\n", mysql_error(&mysql_handle));
+				}
+			}
 
-	if ((sql_res = mysql_store_result(&mysql_handle)) &&(sql_row = mysql_fetch_row(sql_res))) {
-		if (strcmp(email,sql_row[0]) == 0) {
-			mysql_free_result(sql_res);
-		} else {
-			WFIFOW(fd, 0) = 0x70;
-			WFIFOB(fd, 2) = 0;
-			WFIFOSET(fd, 3);
+			for(i = 0; i < 9; i++) {
+				printf("char comp: %d - %d (%d)\n", sd->found_char[i], RFIFOL(fd, 2), sd->account_id);
+				if (sd->found_char[i] == RFIFOL(fd, 2)) {
+					for(ch = i; ch < 9-1; ch++)
+						sd->found_char[ch] = sd->found_char[ch+1];
+					sd->found_char[8] = -1;
+					break;
+				}
+			}
+			if (i == 9) { // reject
+				WFIFOW(fd, 0) = 0x70;
+				WFIFOB(fd, 2) = 0;
+				WFIFOSET(fd, 3);
+			} else { // deleted!
+				WFIFOW(fd, 0) = 0x6f;
+				WFIFOSET(fd, 2);
+			}
 			RFIFOSKIP(fd, 46);
-			mysql_free_result(sql_res);
-			return 0;
-		}
-	} else {
-		WFIFOW(fd, 0) = 0x70;
-		WFIFOB(fd, 2) = 0;
-		WFIFOSET(fd, 3);
-		RFIFOSKIP(fd, 46);
-		mysql_free_result(sql_res);
-		return 0;
-	}
-
-	sprintf(tmp_sql, "SELECT `partner_id` FROM `%s` WHERE `char_id`='%d'",char_db, char_id);
-	sql_query(tmp_sql,"delete_char");
-
-	if ((sql_res = mysql_store_result(&mysql_handle)) && (sql_row = mysql_fetch_row(sql_res))) {
-		sprintf(tmp_sql,"DELETE FROM `%s` WHERE `char_id`='%d'",char_db, char_id);
-		sql_query(tmp_sql,"delete_char");
-
-		if (sql_row[0] != 0) {
-		    char buf[16];
-			WBUFW(buf,0) = 0x2b12;
-			WBUFL(buf,2) = char_id;
-			WBUFL(buf,6) = atoi(sql_row[1]);
-			mapif_sendall(buf,10);
-		}
-	}
-
-	mysql_free_result(sql_res);
-
-	WFIFOW(fd, 0) = 0x6f;
-	WFIFOSET(fd, 2);
-
-	RFIFOSKIP(fd, 46);
-
-	return 0;
-}
-
-int mapserver_login(int fd, int len) {
-	if (len < 60)
-		return -1;
-
-	int i;
-
-	WFIFOW(fd, 0) = 0x2af9;
-
-	for(i = 0; i < MAX_MAP_SERVERS; i++) {
-		if (server_fd[i] < 0)
 			break;
-	}
-
-	if (i == MAX_MAP_SERVERS || strcmp(RFIFOP(fd,2), userid) || strcmp(RFIFOP(fd,26), passwd)) {
-		WFIFOB(fd,2) = 3;
-		WFIFOSET(fd, 3);
-	} else {
-		WFIFOB(fd,2) = 0;
-		WFIFOSET(fd, 3);
-		session[fd]->func_parse = parse_frommap;
-		server_fd[i] = fd;
-		if(anti_freeze_enable)
-			server_freezeflag[i] = 5; // Map anti-freeze system. Counter. 5 ok, 4...0 freezed
-		server[i].ip = RFIFOL(fd, 54);
-		server[i].port = RFIFOW(fd, 58);
-		server[i].users = 0;
-		memset(server[i].map, 0, sizeof(server[i].map));
-		realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-		char_mapif_init(fd);
-	}
-
-	RFIFOSKIP(fd,60);
-
-	return 0;
-}
-
-int skip_packet(int fd, int len, int real_len) {
-	if (len < real_len)
-		return 0;
-
-	RFIFOSKIP(fd,real_len);
-
-	return 0;
-}
 
-int get_info(int fd, int len) {
-	// Athena info get
-	WFIFOW(fd, 0) = 0x7531;
-	WFIFOB(fd, 2) = ATHENA_MAJOR_VERSION;
-	WFIFOB(fd, 3) = ATHENA_MINOR_VERSION;
-	WFIFOB(fd, 4) = ATHENA_REVISION;
-	WFIFOB(fd, 5) = ATHENA_RELEASE_FLAG;
-	WFIFOB(fd, 6) = ATHENA_OFFICIAL_FLAG;
-	WFIFOB(fd, 7) = ATHENA_SERVER_INTER | ATHENA_SERVER_CHAR;
-	WFIFOW(fd, 8) = ATHENA_MOD_VERSION;
-	WFIFOSET(fd, 10);
-	RFIFOSKIP(fd, 2);
-
-	return 0;
-}
-
-int parse_char(int fd) {
-	int len,res=0;
-	unsigned short cmd;
-	unsigned char *ip = (unsigned char *) &session[fd]->client_addr.sin_addr;
-	struct char_session_data *sd = session[fd]->session_data;
-
-	if(login_fd < 0)
-		session[fd]->eof = 1;
-
-	if(session[fd]->eof) {
-		if (fd == login_fd)
-			login_fd = -1;
-		close(fd);
-		delete_session(fd);
-		return 0;
-	}
-
-	len = RFIFOREST(fd);
-
-	while(len >= 2 && res == 0) {
-
-		cmd = RFIFOW(fd,0);
-
-		// crc32のスキップ用
-		if(	sd==NULL			&&	// 未ログインor管理パケット
-			RFIFOREST(fd)>=4	&&	// 最低バイト数制限 ＆ 0x7530,0x7532管理パケ除去
-			RFIFOREST(fd)<=21	&&	// 最大バイト数制限 ＆ サーバーログイン除去
-			cmd!=0x20b	&&	// md5通知パケット除去
-			(RFIFOREST(fd)<6 || RFIFOW(fd,4)==0x65)	){	// 次に何かパケットが来てるなら、接続でないとだめ
-			RFIFOSKIP(fd,4);
-			cmd = RFIFOW(fd,0);
-			printf("parse_char : %d crc32 skipped\n",fd);
-			if(RFIFOREST(fd)==0)
+		case 0x2af8: // login as map-server
+			if (RFIFOREST(fd) < 60)
 				return 0;
-		}
-
-//		if(cmd<30000 && cmd!=0x187)
-//			printf("parse_char : %d %d %d\n",fd,RFIFOREST(fd),cmd);
-
-		// 不正パケットの処理
-//		if (sd == NULL && cmd != 0x65 && cmd != 0x20b && cmd != 0x187 &&
-//					 cmd != 0x2af8 && cmd != 0x7530 && cmd != 0x7532)
-//			cmd = 0xffff;	// パケットダンプを表示させる
+			WFIFOW(fd, 0) = 0x2af9;
+			for(i = 0; i < MAX_MAP_SERVERS; i++) {
+				if (server_fd[i] < 0)
+					break;
+			}
+			if (i == MAX_MAP_SERVERS || strcmp((const char*)RFIFOP(fd,2), userid) || strcmp((const char*)RFIFOP(fd,26), passwd)) {
+				WFIFOB(fd,2) = 3;
+				WFIFOSET(fd, 3);
+			} else {
+//				int len;
+				WFIFOB(fd,2) = 0;
+				WFIFOSET(fd, 3);
+				session[fd]->func_parse = parse_frommap;
+				server_fd[i] = fd;
+				server[i].ip = RFIFOL(fd, 54);
+				server[i].port = RFIFOW(fd, 58);
+				server[i].users = 0;
+				memset(server[i].map, 0, sizeof(server[i].map));
+				realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
+				char_mapif_init(fd);
+				// send gm acccounts level to map-servers
+/* removed by CLOWNISIUS due to isGM
+				len = 4;
+				WFIFOW(fd,0) = 0x2b15;
+				for(i = 0; i < GM_num; i++) {
+					WFIFOL(fd,len) = gm_account[i].account_id;
+					WFIFOB(fd,len+4) = (unsigned char)gm_account[i].level;
+					len += 5;
+				}
+				WFIFOW(fd,2) = len;
+				WFIFOSET(fd,len);*/
+			}
+			RFIFOSKIP(fd,60);
+			break;
 
-		switch(cmd){
-		//20040622 encryption ragexe correspondence
-		case 0x20b: res = skip_packet(fd,len,19);         break;
+		case 0x187:	// Alive?
+			if (RFIFOREST(fd) < 6) {
+				return 0;
+			}
+			RFIFOSKIP(fd, 6);
+			break;
 
-		case 0x65: res = client_request_connect(fd,len);  break;
-		case 0x66: res = char_select(fd,len,ip);          break;
-		case 0x67: res = make_new_char(fd,len);           break;
-		case 0x68: res = delete_char(fd,len);			  break;
-		case 0x2af8: res = mapserver_login(fd,len);       break;
-		case 0x187:	res = skip_packet(fd,len,6);		  break;
-		case 0x7530: res = get_info(fd,len);              break;
+		case 0x7530:	// Athena info get
+			WFIFOW(fd, 0) = 0x7531;
+			WFIFOB(fd, 2) = ATHENA_MAJOR_VERSION;
+			WFIFOB(fd, 3) = ATHENA_MINOR_VERSION;
+			WFIFOB(fd, 4) = ATHENA_REVISION;
+			WFIFOB(fd, 5) = ATHENA_RELEASE_FLAG;
+			WFIFOB(fd, 6) = ATHENA_OFFICIAL_FLAG;
+			WFIFOB(fd, 7) = ATHENA_SERVER_INTER | ATHENA_SERVER_CHAR;
+			WFIFOW(fd, 8) = ATHENA_MOD_VERSION;
+			WFIFOSET(fd, 10);
+			RFIFOSKIP(fd, 2);
+			return 0;
 
 		case 0x7532:	// disconnect(default also disconnect)
 		default:
 			session[fd]->eof = 1;
 			return 0;
 		}
-
-		len = RFIFOREST(fd);
 	}
 	RFIFOFLUSH(fd);
 
@@ -2586,8 +2935,8 @@ int parse_char(int fd) {
 int parse_console(char *buf) {
     char *type,*command;
 
-    type = (char *)malloc(64);
-    command = (char *)malloc(64);
+    type = (char *)aMalloc(64);
+    command = (char *)aMalloc(64);
 
     memset(type,0,64);
     memset(command,0,64);
@@ -2599,9 +2948,9 @@ int parse_console(char *buf) {
 
     printf("Type of command: %s || Command: %s \n",type,command);
 
-    if(buf) free(buf);
-    if(type) free(type);
-    if(command) free(command);
+    if(buf) aFree(buf);
+    if(type) aFree(type);
+    if(command) aFree(command);
 
     return 0;
 }
@@ -2612,7 +2961,7 @@ int mapif_sendall(unsigned char *buf, unsigned int len) {
 	int fd;
 
 	c = 0;
-	for(i = 0; i < MAX_MAP_SERVERS && i < servers_connected; i++) {
+	for(i = 0; i < MAX_MAP_SERVERS; i++) {
 		if ((fd = server_fd[i]) >= 0) {
 			memcpy(WFIFOP(fd,0), buf, len);
 			WFIFOSET(fd,len);
@@ -2628,7 +2977,7 @@ int mapif_sendallwos(int sfd, unsigned char *buf, unsigned int len) {
 	int fd;
 
 	c = 0;
-	for(i=0, c=0;i<MAX_MAP_SERVERS && i < servers_connected;i++){
+	for(i=0, c=0;i<MAX_MAP_SERVERS;i++){
 		if ((fd = server_fd[i]) >= 0 && fd != sfd) {
 			memcpy(WFIFOP(fd,0), buf, len);
 			WFIFOSET(fd, len);
@@ -2643,7 +2992,7 @@ int mapif_send(int fd, unsigned char *buf, unsigned int len) {
 	int i;
 
 	if (fd >= 0) {
-		for(i = 0; i < MAX_MAP_SERVERS && i < servers_connected; i++) {
+		for(i = 0; i < MAX_MAP_SERVERS; i++) {
 			if (fd == server_fd[i]) {
 				memcpy(WFIFOP(fd,0), buf, len);
 				WFIFOSET(fd,len);
@@ -2654,6 +3003,24 @@ int mapif_send(int fd, unsigned char *buf, unsigned int len) {
 	return 0;
 }
 
+int send_users_tologin(int tid, unsigned int tick, int id, int data) {
+	int users = count_users();
+	unsigned char buf[16];
+
+	if (login_fd > 0 && session[login_fd]) {
+		// send number of user to login server
+		WFIFOW(login_fd,0) = 0x2714;
+		WFIFOL(login_fd,2) = users;
+		WFIFOSET(login_fd,6);
+	}
+	// send number of players to all map-servers
+	WBUFW(buf,0) = 0x2b00;
+	WBUFL(buf,2) = users;
+	mapif_sendall(buf, 6);
+
+	return 0;
+}
+
 int check_connect_login_server(int tid, unsigned int tick, int id, int data) {
 	if (login_fd <= 0 || session[login_fd] == NULL) {
 		printf("Attempt to connect to login-server...\n");
@@ -2737,33 +3104,48 @@ int char_lan_config_read(const char *lancfgName){
 	return 0;
 }
 
+static int char_db_final(void *key,void *data,va_list ap)
+{
+	struct mmo_charstatus *p = (struct mmo_charstatus *) data;
+	if (p) aFree(p);
+	return 0;
+}
 void do_final(void) {
-	printf("Closing char-server...\n");
-
+	printf("Doing final stage...\n");
+	//mmo_char_sync();
+	//inter_save();
 	do_final_itemdb();
-
 	//check SQL save progress.
 	//wait until save char complete
-	printf("Waiting until char saving complete...\n");
-	do {
-		sleep (0);
-	}while (save_flag != 0);
 
-	sprintf(tmp_sql,"UPDATE `%s` SET `online`='0' WHERE `online`='1'", char_db);
-	sql_query(tmp_sql,"do_final");
+	set_all_offline();
+
+	flush_fifos();
 
 	sprintf(tmp_sql,"DELETE FROM `ragsrvinfo");
-	sql_query(tmp_sql,"do_final");
+	if (mysql_query(&mysql_handle, tmp_sql))
+		printf("DB server Error (insert `char`)- %s\n", mysql_error(&mysql_handle));
+
+	if(gm_account)  {
+		aFree(gm_account);
+		gm_account = 0;
+	}
 
-	if(gm_account) free(gm_account);
+	if(char_dat)  {
+		aFree(char_dat);
+		char_dat = 0;
+	}
 
-	if(char_dat) free(char_dat);
 	delete_session(login_fd);
 	delete_session(char_fd);
+	numdb_final(char_db_, char_db_final);
+	exit_dbn();
 
 	mysql_close(&mysql_handle);
+	mysql_close(&lmysql_handle);
+	timer_final();
 
-	printf("Good-bye...\n");
+	printf("ok! all done...\n");
 }
 
 void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
@@ -2828,11 +3210,7 @@ void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
 			strcpy(db_path,w2);
 		//Map server option to use SQL db or not
 		}else if(strcmpi(w1,"use_sql_db")==0){ // added for sql item_db read for char server [Valaris]
-			if (strcmpi(w2, "yes")) {
-				db_use_sqldbs = 1;
-			} else if (strcmpi(w2, "no")) {
-				db_use_sqldbs = 0;
-			}
+			db_use_sqldbs = config_switch(w2);
 			printf("Using SQL dbs: %s\n",w2);
 		//custom columns for login database
 		}else if(strcmpi(w1,"login_db_level")==0){
@@ -2846,6 +3224,7 @@ void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
 		}else if(strcmpi(w1,"import")==0){
 			sql_config_read(w2);
 		}
+
 	}
 	fclose(fp);
 	printf("reading configure done.....\n");
@@ -2869,15 +3248,15 @@ int char_config_read(const char *cfgName) {
 		if (sscanf(line,"%[^:]: %[^\r\n]", w1, w2) != 2)
 			continue;
 
-		remove_control_chars(w1);
-		remove_control_chars(w2);
+		remove_control_chars((unsigned char *) w1);
+		remove_control_chars((unsigned char *) w2);
 		if (strcmpi(w1, "userid") == 0) {
 			memcpy(userid, w2, 24);
 		} else if (strcmpi(w1, "passwd") == 0) {
 			memcpy(passwd, w2, 24);
 		} else if (strcmpi(w1, "server_name") == 0) {
 			memcpy(server_name, w2, 16);
-			printf("%s server has been intialized\n", w2);
+			printf("%s server has been initialized\n", w2);
 		} else if (strcmpi(w1, "wisp_server_name") == 0) {
 			if (strlen(w2) >= 4) {
 				memcpy(wisp_server_name, w2, sizeof(wisp_server_name));
@@ -2901,6 +3280,14 @@ int char_config_read(const char *cfgName) {
 				sprintf(char_ip_str, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]);
 			} else
 				memcpy(char_ip_str, w2, 16);
+		} else if (strcmpi(w1, "bind_ip") == 0) {
+			bind_ip_set_ = 1;
+			h = gethostbyname (w2);
+			if(h != NULL) {
+				printf("Character server binding IP address : %s -> %d.%d.%d.%d\n", w2, (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]);
+				sprintf(bind_ip_str, "%d.%d.%d.%d", (unsigned char)h->h_addr[0], (unsigned char)h->h_addr[1], (unsigned char)h->h_addr[2], (unsigned char)h->h_addr[3]);
+			} else
+				memcpy(bind_ip_str, w2, 16);
 		} else if (strcmpi(w1, "char_port") == 0) {
 			char_port = atoi(w2);
 		} else if (strcmpi(w1, "char_maintenance") == 0) {
@@ -2911,6 +3298,10 @@ int char_config_read(const char *cfgName) {
 			max_connect_user = atoi(w2);
 			if (max_connect_user < 0)
 				max_connect_user = 0; // unlimited online players
+		} else if(strcmpi(w1, "gm_allow_level") == 0) {
+			gm_allow_level = atoi(w2);
+			if(gm_allow_level < 0)
+				gm_allow_level = 99;
 		} else if (strcmpi(w1, "check_ip_flag") == 0) {
 			check_ip_flag = config_switch(w2);
 		} else if (strcmpi(w1, "autosave_time") == 0) {
@@ -2960,13 +3351,8 @@ int char_config_read(const char *cfgName) {
 			strcpy(char_name_letters, w2);
 		} else if (strcmpi(w1, "check_ip_flag") == 0) {
 			check_ip_flag = config_switch(w2);
-		// anti-freeze options [Valaris]
-		} else if(strcmpi(w1,"anti_freeze_enable")==0){
-			anti_freeze_enable = config_switch(w2);
-		} else if (strcmpi(w1, "anti_freeze_interval") == 0) {
-			ANTI_FREEZE_INTERVAL = atoi(w2);
-			if (ANTI_FREEZE_INTERVAL < 5)
-				ANTI_FREEZE_INTERVAL = 5; // minimum 5 seconds
+                } else if (strcmpi(w1, "chars_per_account") == 0) { //maxchars per account [Sirius]
+                        char_per_account = atoi(w2);
 		} else if (strcmpi(w1, "import") == 0) {
 			char_config_read(w2);
 		} else if (strcmpi(w1, "console") == 0) {
@@ -2976,9 +3362,6 @@ int char_config_read(const char *cfgName) {
 	}
 	fclose(fp);
 
-//Read ItemDB
-	do_init_itemdb();
-
 	return 0;
 }
 
@@ -3004,6 +3387,7 @@ int flush_timer(int tid, unsigned int tick, int id, int data){
 int do_init(int argc, char **argv){
 	int i;
 
+	SERVER_TYPE = SERVER_CHAR;
 	for(i = 0; i < MAX_MAP_SERVERS; i++) {
 		memset(&server[i], 0, sizeof(struct mmo_map_server));
 		server_fd[i] = -1;
@@ -3018,6 +3402,9 @@ int do_init(int argc, char **argv){
 	inter_init((argc > 2) ? argv[2] : inter_cfgName); // inter server ﾃﾊｱ篳ｭ
 	printf("interserver configuration reading done.....\n");
 
+	//Read ItemDB
+	do_init_itemdb();
+
 	printf("start char server initializing.....\n");
 	mmo_char_sql_init();
 	printf("char server initializing done.....\n");
@@ -3028,16 +3415,13 @@ int do_init(int argc, char **argv){
 	printf("set terminate function -> do_final().....\n");
 	set_termfunc(do_final);
 
-	printf("open port %d.....\n",char_port);
-	char_fd = make_listen_port(char_port);
-
         if ((naddr_ != 0) && (login_ip_set_ == 0 || char_ip_set_ == 0)) {
           // The char server should know what IP address it is running on
           //   - MouseJstr
           int localaddr = ntohl(addr_[0]);
           unsigned char *ptr = (unsigned char *) &localaddr;
           char buf[16];
-          sprintf(buf, "%d.%d.%d.%d", ptr[0], ptr[1], ptr[2], ptr[3]);;
+          sprintf(buf, "%d.%d.%d.%d", ptr[0], ptr[1], ptr[2], ptr[3]);
           if (naddr_ != 1)
             printf("Multiple interfaces detected..  using %s as our IP address\n", buf);
           else
@@ -3048,21 +3432,31 @@ int do_init(int argc, char **argv){
           	strcpy(char_ip_str, buf);
 
           if (ptr[0] == 192 && ptr[1] == 168)
-            printf("Firewall detected.. edit lan_support.conf and char_athena.conf");
+            printf("Firewall detected.. edit lan_support.conf and char_athena.conf\n");
         }
 
 	login_ip = inet_addr(login_ip_str);
 	char_ip = inet_addr(char_ip_str);
 
+	printf("open port %d.....\n",char_port);
+	//char_fd = make_listen_port(char_port);
+        if (bind_ip_set_)
+            char_fd = make_listen_bind(inet_addr(bind_ip_str),char_port);
+        else
+            char_fd = make_listen_bind(INADDR_ANY,char_port);
+
 	// send ALIVE PING to login server.
 	printf("add interval tic (check_connect_login_server)....\n");
 	i = add_timer_interval(gettick() + 10, check_connect_login_server, 0, 0, 10 * 1000);
 
+	// send USER COUNT PING to login server.
+	printf("add interval tic (send_users_tologin)....\n");
+	i = add_timer_interval(gettick() + 10, send_users_tologin, 0, 0, 5 * 1000);
+
 	//no need to set sync timer on SQL version.
 	//printf("add interval tic (mmo_char_sync_timer)....\n");
 	//i = add_timer_interval(gettick() + 10, mmo_char_sync_timer, 0, 0, autosave_interval);
 
-	add_timer_func_list(map_anti_freeze_system, "map_anti_freeze_system");
 	//Added for Mugendais I'm Alive mod
 	if(imalive_on)
 		add_timer_interval(gettick()+10, imalive_timer,0,0,imalive_time*1000);
@@ -3071,27 +3465,114 @@ int do_init(int argc, char **argv){
 	if(flush_on)
 		add_timer_interval(gettick()+10, flush_timer,0,0,flush_time);
 
-	if(anti_freeze_enable > 0) {
-		add_timer_func_list(map_anti_freeze_system, "map_anti_freeze_system");
-		i = add_timer_interval(gettick() + 1000, map_anti_freeze_system, 0, 0, ANTI_FREEZE_INTERVAL * 1000); // checks every X seconds user specifies
-	}
+	read_gm_account();
 
 	if ( console ) {
 	    set_defaultconsoleparse(parse_console);
 	   	start_console();
 	}
 
+	//Cleaning the tables for NULL entrys @ startup [Sirius]
+         //Chardb clean
+        	printf("Cleaning the '%s' table...", char_db);
+         sprintf(tmp_sql,"DELETE FROM `%s` WHERE `account_id` = '0'", char_db);
+         if(mysql_query(&mysql_handle, tmp_sql)){
+           //error on clean
+            printf(" fail.\n");
+         }else{
+            printf(" done.\n");
+         }
+
+         //guilddb clean
+         printf("Cleaning the '%s' table...", guild_db);
+         sprintf(tmp_sql,"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(mysql_query(&mysql_handle, tmp_sql)){
+          //error on clean
+            printf(" fail.\n");
+         }else{
+            printf(" done.\n");
+         }
+
+         //guildmemberdb clean
+         printf("Cleaning the '%s' table...", guild_member_db);
+         sprintf(tmp_sql,"DELETE FROM `%s` WHERE `guild_id` = '0' AND `account_id` = '0' AND `char_id` = '0'", guild_member_db);
+         if(mysql_query(&mysql_handle, tmp_sql)){
+          //error on clean
+            printf(" fail.\n");
+         }else{
+            printf(" done.\n");
+         }
+
+
+
 	printf("char server init func end (now unlimited loop start!)....\n");
 	printf("The char-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n", char_port);
 	return 0;
 }
 
-
 #undef mysql_query
-int             STDCALL mysql_query(MYSQL *mysql, const char *q);
 
 int debug_mysql_query(char *file, int line, void *mysql, const char *q) {
+#ifdef TWILIGHT
         printf("sql: %s:%d# %s\n", file, line, q);
+#endif
         return mysql_query((MYSQL *) mysql, q);
 }
 
+int char_child(int parent_id, int child_id) {
+        int tmp_id = 0;
+        sprintf (tmp_sql, "SELECT `child` FROM `%s` WHERE `char_id` = '%d'", char_db, parent_id);
+        if (mysql_query (&mysql_handle, tmp_sql)) {
+                printf ("DB server Error (select `char2`)- %s\n", mysql_error (&mysql_handle));
+        }
+        sql_res = mysql_store_result (&mysql_handle);
+        if (sql_res) {
+                sql_row = mysql_fetch_row (sql_res);
+                tmp_id = atoi (sql_row[0]);
+                mysql_free_result (sql_res);
+        }
+        else
+                printf("CHAR: child Failed!\n");
+        if ( tmp_id == child_id )
+                return 1;
+        else
+                return 0;
+}
+
+int char_married(int pl1,int pl2) {
+        int tmp_id = 0;
+        sprintf (tmp_sql, "SELECT `partner_id` FROM `%s` WHERE `char_id` = '%d'", char_db, pl1);
+        if (mysql_query (&mysql_handle, tmp_sql)) {
+                printf ("DB server Error (select `char2`)- %s\n", mysql_error (&mysql_handle));
+        }
+        sql_res = mysql_store_result (&mysql_handle);
+        if (sql_res) {
+                sql_row = mysql_fetch_row (sql_res);
+                tmp_id = atoi (sql_row[0]);
+                mysql_free_result (sql_res);
+        }
+        else
+                printf("CHAR: married Failed!\n");
+        if ( tmp_id == pl2 )
+                return 1;
+        else
+                return 0;
+}
+
+int char_nick2id (char *name) {
+        int char_id = 0;
+        sprintf (tmp_sql, "SELECT `char_id` FROM `%s` WHERE `name` = '%s'", char_db, name);
+        if (mysql_query (&mysql_handle, tmp_sql)) {
+                printf ("DB server Error (select `char2`)- %s\n", mysql_error (&mysql_handle));
+        }
+        sql_res = mysql_store_result (&mysql_handle);
+        if (sql_res) {
+                sql_row = mysql_fetch_row (sql_res);
+                char_id = atoi (sql_row[0]);
+                mysql_free_result (sql_res);
+        }
+        else
+                printf ("CHAR: nick2id Failed!\n");
+        return char_id;
+}
+
diff --git a/src/char_sql/char.h b/src/char_sql/char.h
index 8da399eff..6ade96c36 100644
--- a/src/char_sql/char.h
+++ b/src/char_sql/char.h
@@ -40,12 +40,15 @@ enum {
 struct itemtemp{
 	struct itemtmp equip[MAX_GUILD_STORAGE],notequip[MAX_GUILD_STORAGE];
 };
-int memitemdata_to_sql(struct itemtemp mapitem, int eqcount, int noteqcount, int char_id,int tableswitch);
-int memitemdata_to_sql2(struct itemtemp mapitem, int eqcount, int char_id,int tableswitch);
+int memitemdata_to_sql(struct itemtmp mapitem[], int count, int char_id,int tableswitch);
 int mapif_sendall(unsigned char *buf,unsigned int len);
 int mapif_sendallwos(int fd,unsigned char *buf,unsigned int len);
 int mapif_send(int fd,unsigned char *buf,unsigned int len);
 
+int char_nick2id (char *name);
+int char_married(int pl1,int pl2);
+int char_child(int parent_id, int child_id);
+
 extern int autosave_interval;
 extern char db_path[];
 extern char char_db[256];
@@ -68,11 +71,13 @@ extern char guild_storage_db[256];
 extern char party_db[256];
 extern char pet_db[256];
 
-int db_use_sqldbs; // added for sql item_db read for char server [Valaris]
+extern int db_use_sqldbs; // added for sql item_db read for char server [Valaris]
 extern char login_db_level[32];
 extern char login_db_account_id[32];
 
 extern int lowest_gm_level;
+extern int GM_num;
+extern struct gm_account *gm_account;
 
 extern int debug_mysql_query(char *file, int line, void *mysql, const char *q);
 
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index a850bc0f5..794f2e01f 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -3,8 +3,12 @@
 // SQL conversion by hack
 //
 
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "char.h"
-#include "strlib.h"
+#include "../common/strlib.h"
 #include "int_storage.h"
 #include "inter.h"
 #include "int_guild.h"
@@ -12,17 +16,10 @@
 #include "mmo.h"
 #include "socket.h"
 #include "db.h"
-#include "utils.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "malloc.h"
 
 static struct dbt *guild_db_;
 static struct dbt *castle_db_;
-static struct dbt *guild_expcache_db_;
-static struct dbt *guild_infoevent_db_;
-static struct dbt *guild_castleinfoevent_db_;
 
 static struct guild *guild_pt;
 static struct guild *guild_pt2;
@@ -39,6 +36,18 @@ int mapif_guild_basicinfochanged(int guild_id,int type,const void *data,int len)
 int mapif_guild_info(int fd,struct guild *g);
 int guild_break_sub(void *key,void *data,va_list ap);
 
+#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
+
+static int _erase_guild(void *key, void *data, va_list ap) {
+    int guild = va_arg(ap, int);
+    struct guild_castle * castle = (struct guild_castle *) data;
+    if (castle->guild_id == guild) {
+        aFree(castle);
+        db_erase(castle_db_, key);
+    }
+
+    return 0;
+}
 
 // Save guild into sql
 int inter_guild_tosql(struct guild *g,int flag)
@@ -47,67 +56,114 @@ int inter_guild_tosql(struct guild *g,int flag)
 	// 2 `guild_member` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`rsv1`,`rsv2`,`name`)
 	// 4 `guild_position` (`guild_id`,`position`,`name`,`mode`,`exp_mode`)
 	// 8 `guild_alliance` (`guild_id`,`opposition`,`alliance_id`,`name`)
-	// 16 `guild_expulsion` (`guild_id`,`name`,`mes`,`acc`,`account_id`,`rsv1`,`rsv2`,`rsv3`) 
+	// 16 `guild_expulsion` (`guild_id`,`name`,`mes`,`acc`,`account_id`,`rsv1`,`rsv2`,`rsv3`)
 	// 32 `guild_skill` (`guild_id`,`id`,`lv`)
-	
-	char t_name[100],t_master[24],t_mes1[60],t_mes2[120],t_member[24],t_position[24],t_alliance[24];  // temporay storage for str convertion;
+
+	char t_name[100],t_master[24],t_mes1[60],t_mes2[240],t_member[24],t_position[24],t_alliance[24];  // temporay storage for str convertion;
 	char t_ename[24],t_emes[40];
 	char emblem_data[4096];
-	int first = 1, i=0;
-	int guild_member=0,guild_online_member=0;
-	struct StringBuf sbuf;
+	int i=0;
+	int guild_exist=0,guild_member=0,guild_online_member=0;
 
-	StringBuf_Init(&sbuf);
-	
 	if (g->guild_id<=0) return -1;
-	
-	printf("(\033[1;35m%d\033[0m)  Request save guild - ",g->guild_id);
-	
+
+	printf("(\033[1;35m%d\033[0m)  Request save guild -(flag 0x%x) ",g->guild_id, flag);
+
 	jstrescapecpy(t_name, g->name);
-	
-		guild_member = 0;
-		i = 0;
-		while (i<g->max_member) {
-			if (g->member[i].account_id>0) guild_member++;
-			i++;
+
+	//printf("- Check if guild %d exists\n",g->guild_id);
+	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `guild_id`='%d'",guild_db,g->guild_id);
+	if(mysql_query(&mysql_handle, tmp_sql) ) {
+		printf("DB server Error (delete `guild`)- %s\n", mysql_error(&mysql_handle) );
+	}
+	sql_res = mysql_store_result(&mysql_handle) ;
+	if (sql_res!=NULL && mysql_num_rows(sql_res)>0) {
+		sql_row = mysql_fetch_row(sql_res);
+		guild_exist =  atoi (sql_row[0]);
+		//printf("- Check if guild %d exists : %s\n",g->guild_id,((guild_exist==0)?"No":"Yes"));
+	}
+	mysql_free_result(sql_res) ; //resource free
+
+	if (guild_exist >0){
+		// Check members in party
+		sprintf(tmp_sql,"SELECT count(*) FROM `%s` WHERE `guild_id`='%d'",guild_member_db, g->guild_id);
+		if(mysql_query(&mysql_handle, tmp_sql) ) {
+			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
+			return -1;
 		}
-		
+		sql_res = mysql_store_result(&mysql_handle) ;
+		if (sql_res!=NULL && mysql_num_rows(sql_res)>0) {
+			sql_row = mysql_fetch_row(sql_res);
+
+			guild_member =  atoi (sql_row[0]);
+		//	printf("- Check members in guild %d : %d \n",g->guild_id,guild_member);
+
+		}
+		mysql_free_result(sql_res) ; //resource free
+
 		// Delete old guild from sql
 		if (flag&1||guild_member==0){
-			StringBuf_Printf(&sbuf, "DELETE FROM `%s` WHERE `guild_id`='%d';\n",guild_db, g->guild_id);
+		//	printf("- Delete guild %d from guild\n",g->guild_id);
+			sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_db, g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (delete `guild`)- %s\n", mysql_error(&mysql_handle) );
+			}
 		}
 		if (flag&2||guild_member==0){
 		//	printf("- Delete guild %d from guild_member\n",g->guild_id);
-			StringBuf_Printf(&sbuf, "DELETE FROM `%s` WHERE `guild_id`='%d';\n",guild_member_db, g->guild_id);
-			StringBuf_Printf(&sbuf, "UPDATE `%s` SET `guild_id`='0' WHERE `guild_id`='%d';\n",char_db, g->guild_id);
+			sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_member_db, g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (delete `guild_member`)- %s\n", mysql_error(&mysql_handle) );
+			}
+			sprintf(tmp_sql, "UPDATE `%s` SET `guild_id`='0' WHERE `guild_id`='%d'",char_db, g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle) );
+			}
 		}
 		if (flag&32||guild_member==0){
 		//	printf("- Delete guild %d from guild_skill\n",g->guild_id);
-			StringBuf_Printf(&sbuf, "DELETE FROM `%s` WHERE `guild_id`='%d';\n",guild_skill_db, g->guild_id);
+			sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_skill_db, g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (delete `guild_skill`)- %s\n", mysql_error(&mysql_handle) );
+			}
 		}
 		if (flag&4||guild_member==0){
 		//	printf("- Delete guild %d from guild_position\n",g->guild_id);
-			StringBuf_Printf(&sbuf, "DELETE FROM `%s` WHERE `guild_id`='%d';\n",guild_position_db, g->guild_id);
+			sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_position_db, g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (delete `guild_position`)- %s\n", mysql_error(&mysql_handle) );
+			}
 		}
 		if (flag&16||guild_member==0){
 		//	printf("- Delete guild %d from guild_expulsion\n",g->guild_id);
-			StringBuf_Printf(&sbuf, "DELETE FROM `%s` WHERE `guild_id`='%d';\n",guild_expulsion_db, g->guild_id);
+			sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_expulsion_db, g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (delete `guild_expulsion`)- %s\n", mysql_error(&mysql_handle) );
+			}
 		}
 		if (flag&8||guild_member==0){
 		//	printf("- Delete guild %d from guild_alliance\n",g->guild_id);
-			StringBuf_Printf(&sbuf, "DELETE FROM `%s` WHERE `guild_id`='%d' OR `alliance_id`='%d';\n",guild_alliance_db, g->guild_id,g->guild_id);
+			sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d' OR `alliance_id`='%d'",guild_alliance_db, g->guild_id,g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (delete `guild_alliance`)- %s\n", mysql_error(&mysql_handle) );
+			}
 		}
 		if (flag&2||guild_member==0){
 		//	printf("- Delete guild %d from char\n",g->guild_id);
-			StringBuf_Printf(&sbuf, "UPDATE `%s` SET `guild_id`='0' WHERE `guild_id`='%d';\n",char_db, g->guild_id);
+			sprintf(tmp_sql, "UPDATE `%s` SET `guild_id`='0' WHERE `guild_id`='%d'",char_db, g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (delete `guild_alliance`)- %s\n", mysql_error(&mysql_handle) );
+			}
 		}
 		if (guild_member==0){
 		//	printf("- Delete guild %d from guild_castle\n",g->guild_id);
-			StringBuf_Printf(&sbuf, "DELETE FROM `%s` WHERE `guild_id`='%d';\n",guild_castle_db, g->guild_id);
+			sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_castle_db, g->guild_id);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (delete `guild_castle`)- %s\n", mysql_error(&mysql_handle) );
+			}
+                        db_foreach(castle_db_, _erase_guild, g->guild_id);
 		}
-#if 0
 	}
-#endif
 
 	guild_online_member = 0;
 	i=0;
@@ -115,13 +171,11 @@ int inter_guild_tosql(struct guild *g,int flag)
 		if (g->member[i].account_id>0) guild_online_member++;
 		i++;
 	}
-	
+
 	// No member in guild , no need to create it in sql
 	if (guild_member <= 0 && guild_online_member <=0) {
 		inter_guild_storage_delete(g->guild_id);
 		printf("No member in guild %d , break it! \n",g->guild_id);
-		if(mysql_query(&mysql_handle, StringBuf_Value(&sbuf)) ) 
-			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 		return -2;
 	}
 
@@ -132,134 +186,131 @@ int inter_guild_tosql(struct guild *g,int flag)
 		for(i=0;i<g->emblem_len;i++){
 			len+=sprintf(emblem_data+len,"%02x",(unsigned char)(g->emblem_data[i]));
 			//printf("%02x",(unsigned char)(g->emblem_data[i]));
-		}	
+		}
                 emblem_data[len] = '\0';
 		//printf("- emblem_len = %d \n",g->emblem_len);
-		StringBuf_Printf(&sbuf, "INSERT INTO `%s` "
+		sprintf(tmp_sql,"INSERT INTO `%s` "
 			"(`guild_id`, `name`,`master`,`guild_lv`,`connect_member`,`max_member`,`average_lv`,`exp`,`next_exp`,`skill_point`,`castle_id`,`mes1`,`mes2`,`emblem_len`,`emblem_id`,`emblem_data`) "
-			"VALUES ('%d', '%s', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%s', '%s', '%d', '%d', '%s');",
+			"VALUES ('%d', '%s', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%s', '%s', '%d', '%d', '%s')",
 			guild_db, g->guild_id,t_name,jstrescapecpy(t_master,g->master),
 			g->guild_lv,g->connect_member,g->max_member,g->average_lv,g->exp,g->next_exp,g->skill_point,g->castle_id,
 			jstrescapecpy(t_mes1,g->mes1),jstrescapecpy(t_mes2,g->mes2),g->emblem_len,g->emblem_id,emblem_data);
 		//printf(" %s\n",tmp_sql);
+		if(mysql_query(&mysql_handle, tmp_sql) ) {
+			printf("DB server Error (insert `guild`)- %s\n", mysql_error(&mysql_handle) );
+		}
 	}
 
 	if (flag&2||guild_member==0){
-		struct StringBuf sbuf2;
-		StringBuf_Init(&sbuf2);
-
-		first = 1;
-
-		StringBuf_Printf(&sbuf,"REPLACE `%s` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`rsv1`,`rsv2`,`name`) VALUES \n", guild_member_db);
-
-		StringBuf_Printf(&sbuf2, "UPDATE `%s` SET `guild_id`='%d' WHERE  `char_id` IN (",char_db, g->guild_id);
-
-		//printf("- Insert guild %d to guild_member\n",g->guild_id);
-		for(i=0;i<g->max_member;i++){
-			if (g->member[i].account_id>0){
-				struct guild_member *m = &g->member[i];
-				if (first == 0) {
-					StringBuf_Printf(&sbuf , ", ");
-					StringBuf_Printf(&sbuf2, ", ");
-				} else
-					first = 0;
-				StringBuf_Printf(&sbuf, "('%d','%d','%d','%d','%d', '%d','%d','%d','%d','%d','%d','%d','%d','%d','%s')\n",
-					g->guild_id,
-					m->account_id,m->char_id,
-					m->hair,m->hair_color,m->gender,
-					m->class,m->lv,m->exp,m->exp_payper,m->online,m->position,
-					0,0,
-					jstrescapecpy(t_member,m->name));
-
-				StringBuf_Printf(&sbuf2, "'%d'", m->char_id);
-			}
-		}
-		StringBuf_Printf(&sbuf, ";\n");
-		StringBuf_Printf(&sbuf2,");\n");
-		StringBuf_Append(&sbuf, &sbuf2);
-		StringBuf_Destroy(&sbuf2);
+	  struct StringBuf sbuf;
+	  struct StringBuf sbuf2;
+	  int first = 1;
+	  StringBuf_Init(&sbuf2);
+	  StringBuf_Init(&sbuf);
+
+	  StringBuf_Printf(&sbuf,"REPLACE `%s` (`guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`rsv1`,`rsv2`,`name`) VALUES \n", guild_member_db);
+
+	  StringBuf_Printf(&sbuf2, "UPDATE `%s` SET `guild_id`='%d' WHERE  `char_id` IN (",char_db, g->guild_id);
+
+	  //printf("- Insert guild %d to guild_member\n",g->guild_id);
+	  for(i=0;i<g->max_member;i++){
+	    if (g->member[i].account_id>0){
+	      struct guild_member *m = &g->member[i];
+	      if (first == 0) {
+		StringBuf_Printf(&sbuf , ", ");
+		StringBuf_Printf(&sbuf2, ", ");
+	      } else
+		first = 0;
+	      StringBuf_Printf(&sbuf, "('%d','%d','%d','%d','%d', '%d','%d','%d','%d','%d','%d','%d','%d','%d','%s')\n",
+			       g->guild_id,
+			       m->account_id,m->char_id,
+			       m->hair,m->hair_color,m->gender,
+			       m->class_,m->lv,m->exp,m->exp_payper,m->online,m->position,
+			       0,0,
+			       jstrescapecpy(t_member,m->name));
+
+	      StringBuf_Printf(&sbuf2, "'%d'", m->char_id);
+	    }
+	  }
+	  StringBuf_Printf(&sbuf2,")");
+
+	  if(mysql_query(&mysql_handle, StringBuf_Value(&sbuf)))
+	    printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
+
+	  if(mysql_query(&mysql_handle, StringBuf_Value(&sbuf2)))
+	    printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
+
+	  StringBuf_Destroy(&sbuf2);
+	  StringBuf_Destroy(&sbuf);
 	}
-	
+
 	if (flag&4||guild_member==0){
-		first = 1;
 		//printf("- Insert guild %d to guild_position\n",g->guild_id);
-		StringBuf_Printf(&sbuf ,"INSERT INTO `%s` (`guild_id`,`position`,`name`,`mode`,`exp_mode`) VALUES ", guild_position_db);
 		for(i=0;i<MAX_GUILDPOSITION;i++){
-			if (first == 0)
-				StringBuf_Printf(&sbuf , ", ");
-			else
-				first = 0;
 			struct guild_position *p = &g->position[i];
-			StringBuf_Printf(&sbuf , "('%d','%d', '%s','%d','%d')",
-				g->guild_id, i, jstrescapecpy(t_position,p->name),p->mode,p->exp_mode);
+			sprintf(tmp_sql,"INSERT INTO `%s` (`guild_id`,`position`,`name`,`mode`,`exp_mode`) VALUES ('%d','%d', '%s','%d','%d')",
+				guild_position_db, g->guild_id, i, jstrescapecpy(t_position,p->name),p->mode,p->exp_mode);
+			//printf(" %s\n",tmp_sql);
+			if(mysql_query(&mysql_handle, tmp_sql) ) {
+				printf("DB server Error (insert `guild_position`)- %s\n", mysql_error(&mysql_handle) );
+			}
 		}
-		StringBuf_Printf(&sbuf ,";\n");
 	}
 
 	if (flag&8||guild_member==0){
-		first = 1;
-		StringBuf_Printf(&sbuf , "INSERT INTO `%s` (`guild_id`,`opposition`,`alliance_id`,`name`) VALUES ", guild_alliance_db);
 		//printf("- Insert guild %d to guild_alliance\n",g->guild_id);
 		for(i=0;i<MAX_GUILDALLIANCE;i++){
 			struct guild_alliance *a=&g->alliance[i];
 			if(a->guild_id>0){
-				if (first == 0)
-					StringBuf_Printf(&sbuf , ", ");
-				else
-					first = 0;
-				StringBuf_Printf(&sbuf , "('%d','%d','%d','%s')",
-					g->guild_id,a->opposition,a->guild_id,jstrescapecpy(t_alliance,a->name));
-
-				StringBuf_Printf(&sbuf , ", ('%d','%d','%d','%s')",
-					a->guild_id,a->opposition,g->guild_id,t_name);
+				sprintf(tmp_sql,"INSERT INTO `%s` (`guild_id`,`opposition`,`alliance_id`,`name`) "
+					"VALUES ('%d','%d','%d','%s')",
+					guild_alliance_db, g->guild_id,a->opposition,a->guild_id,jstrescapecpy(t_alliance,a->name));
 				//printf(" %s\n",tmp_sql);
+				if(mysql_query(&mysql_handle, tmp_sql) ) {
+					printf("DB server Error (insert `guild_alliance`)- %s\n", mysql_error(&mysql_handle) );
+				}
+				sprintf(tmp_sql,"INSERT INTO `%s` (`guild_id`,`opposition`,`alliance_id`,`name`) "
+					"VALUES ('%d','%d','%d','%s')",
+					guild_alliance_db, a->guild_id,a->opposition,g->guild_id,t_name);
+				//printf(" %s\n",tmp_sql);
+				if(mysql_query(&mysql_handle, tmp_sql) ) {
+					printf("DB server Error (insert `guild_alliance`)- %s\n", mysql_error(&mysql_handle) );
+				}
 			}
 		}
-		StringBuf_Printf(&sbuf ,";\n");
 	}
 
 	if (flag&16||guild_member==0){
-		first = 1;
 		//printf("- Insert guild %d to guild_expulsion\n",g->guild_id);
-		StringBuf_Printf(&sbuf, "INSERT INTO `%s` (`guild_id`,`name`,`mes`,`acc`,`account_id`,`rsv1`,`rsv2`,`rsv3`) VALUES ", 
-				guild_expulsion_db);
 		for(i=0;i<MAX_GUILDEXPLUSION;i++){
 			struct guild_explusion *e=&g->explusion[i];
 			if(e->account_id>0){
-				if (first == 0)
-					StringBuf_Printf(&sbuf , ", ");
-				else
-					first = 0;
-				StringBuf_Printf(&sbuf, "('%d','%s','%s','%s','%d','%d','%d','%d')",
-					g->guild_id, jstrescapecpy(t_ename,e->name),jstrescapecpy(t_emes,e->mes),e->acc,e->account_id,e->rsv1,e->rsv2,e->rsv3 );
+				sprintf(tmp_sql,"INSERT INTO `%s` (`guild_id`,`name`,`mes`,`acc`,`account_id`,`rsv1`,`rsv2`,`rsv3`) "
+					"VALUES ('%d','%s','%s','%s','%d','%d','%d','%d')",
+					guild_expulsion_db, g->guild_id,
+					jstrescapecpy(t_ename,e->name),jstrescapecpy(t_emes,e->mes),e->acc,e->account_id,e->rsv1,e->rsv2,e->rsv3 );
 				//printf(" %s\n",tmp_sql);
+				if(mysql_query(&mysql_handle, tmp_sql) ) {
+					printf("DB server Error (insert `guild_expulsion`)- %s\n", mysql_error(&mysql_handle) );
+				}
 			}
 		}
-		StringBuf_Printf(&sbuf ,";\n");
 	}
 
 	if (flag&32||guild_member==0){
-		first = 1;
 		//printf("- Insert guild %d to guild_skill\n",g->guild_id);
-		StringBuf_Printf(&sbuf,"INSERT INTO `%s` (`guild_id`,`id`,`lv`) VALUES ", guild_skill_db);
 		for(i=0;i<MAX_GUILDSKILL;i++){
 			if (g->skill[i].id>0){
-				if (first == 0)
-					StringBuf_Printf(&sbuf , ", ");
-				else
-					first = 0;
-				StringBuf_Printf(&sbuf, "('%d','%d','%d')",
-					g->guild_id,g->skill[i].id,g->skill[i].lv);
+				sprintf(tmp_sql,"INSERT INTO `%s` (`guild_id`,`id`,`lv`) VALUES ('%d','%d','%d')",
+					guild_skill_db, g->guild_id,g->skill[i].id,g->skill[i].lv);
+				//printf("%s\n",tmp_sql);
+				if(mysql_query(&mysql_handle, tmp_sql) ) {
+					printf("DB server Error (insert `guild_skill`)- %s\n", mysql_error(&mysql_handle) );
+				}
 			}
 		}
-		StringBuf_Printf(&sbuf ,";\n");
 	}
 
-	if(mysql_query(&mysql_handle, StringBuf_Value(&sbuf))) 
-		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
-
-	StringBuf_Destroy(&sbuf);
-	
 	printf("Save guild done\n");
 	return 0;
 }
@@ -272,15 +323,15 @@ struct guild * inter_guild_fromsql(int guild_id)
 	char *pstr;
 	struct guild *g;
 
-	if (guild_id==0) return 0;
+	if (guild_id<=0) return 0;
 
-	g = numdb_search(guild_db_,guild_id);
+	g = (struct guild*)numdb_search(guild_db_,guild_id);
 	if (g != NULL)
 		return g;
-	
-	g = (struct guild *) malloc(sizeof(struct guild));
+
+	g = (struct guild*)aMalloc(sizeof(struct guild));
 	memset(g,0,sizeof(struct guild));
-	
+
 //	printf("Retrieve guild information from sql ......\n");
 //	printf("- Read guild %d from sql \n",guild_id);
 
@@ -289,25 +340,28 @@ struct guild * inter_guild_fromsql(int guild_id)
 	//printf("  %s\n",tmp_sql);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (select `guild`)- %s\n", mysql_error(&mysql_handle) );
-		free(g);
+		aFree(g);
 		return 0;
 	}
-	
+
 	sql_res = mysql_store_result(&mysql_handle) ;
 	if (sql_res!=NULL && mysql_num_rows(sql_res)>0) {
 		sql_row = mysql_fetch_row(sql_res);
 		if (sql_row==NULL) {
 			mysql_free_result(sql_res);
-			free(g);
+			aFree(g);
 			return 0;
 		}
-		
+
 		g->guild_id=atoi(sql_row[0]);
 		strncpy(g->name,sql_row[1],24);
 		strncpy(g->master,sql_row[2],24);
 		g->guild_lv=atoi(sql_row[3]);
 		g->connect_member=atoi(sql_row[4]);
-		g->max_member=atoi(sql_row[5]);
+                if (atoi(sql_row[5]) > MAX_GUILD) // Fix reduction of MAX_GUILD [PoW]
+                        g->max_member = MAX_GUILD;
+                else
+                        g->max_member = atoi(sql_row[5]);
 		g->average_lv=atoi(sql_row[6]);
 		g->exp=atoi(sql_row[7]);
 		g->next_exp=atoi(sql_row[8]);
@@ -327,7 +381,7 @@ struct guild * inter_guild_fromsql(int guild_id)
 			if(c2>='a' && c2<='f')x2=c2-'a'+10;
 			if(c2>='A' && c2<='F')x2=c2-'A'+10;
 			g->emblem_data[i]=(x1<<4)|x2;
-		}	
+		}
 	}
 	mysql_free_result(sql_res);
 
@@ -337,7 +391,7 @@ struct guild * inter_guild_fromsql(int guild_id)
 	//printf("  %s\n",tmp_sql);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (select `guild_member`)- %s\n", mysql_error(&mysql_handle) );
-		free(g);
+		aFree(g);
 		return 0;
 	}
 	sql_res = mysql_store_result(&mysql_handle) ;
@@ -350,43 +404,47 @@ struct guild * inter_guild_fromsql(int guild_id)
 			m->hair=atoi(sql_row[3]);
 			m->hair_color=atoi(sql_row[4]);
 			m->gender=atoi(sql_row[5]);
-			m->class=atoi(sql_row[6]);
+			m->class_=atoi(sql_row[6]);
 			m->lv=atoi(sql_row[7]);
 			m->exp=atoi(sql_row[8]);
 			m->exp_payper=atoi(sql_row[9]);
-			m->online=atoi(sql_row[10]);
-			m->position=atoi(sql_row[11]);
+                        m->online=atoi(sql_row[10]);
+                        if (atoi(sql_row[11]) >= MAX_GUILDPOSITION) // Fix reduction of MAX_GUILDPOSITION [PoW]
+                                m->position = MAX_GUILDPOSITION - 1;
+                        else
+                                m->position = atoi(sql_row[11]);
+
 			strncpy(m->name,sql_row[14],24);
 		}
 	}
 	mysql_free_result(sql_res);
-	
+
 	//printf("- Read guild_position %d from sql \n",guild_id);
 	sprintf(tmp_sql,"SELECT `guild_id`,`position`,`name`,`mode`,`exp_mode` FROM `%s` WHERE `guild_id`='%d'",guild_position_db, guild_id);
 	//printf("  %s\n",tmp_sql);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (select `guild_position`)- %s\n", mysql_error(&mysql_handle) );
-		free(g);
+		aFree(g);
 		return 0;
 	}
 	sql_res = mysql_store_result(&mysql_handle) ;
 	if (sql_res!=NULL && mysql_num_rows(sql_res)>0) {
 		int i;
 		for(i=0;((sql_row = mysql_fetch_row(sql_res))&&i<MAX_GUILDPOSITION);i++){
-			int position = atoi(sql_row[1]);	
+			int position = atoi(sql_row[1]);
 			struct guild_position *p = &g->position[position];
-			strncpy(p->name,sql_row[2],24);	
+			strncpy(p->name,sql_row[2],24);
 			p->mode=atoi(sql_row[3]);
-			p->exp_mode=atoi(sql_row[4]);	
+			p->exp_mode=atoi(sql_row[4]);
 		}
 	}
-	mysql_free_result(sql_res);	
+	mysql_free_result(sql_res);
 
 	//printf("- Read guild_alliance %d from sql \n",guild_id);
 	sprintf(tmp_sql,"SELECT `guild_id`,`opposition`,`alliance_id`,`name` FROM `%s` WHERE `guild_id`='%d'",guild_alliance_db, guild_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (select `guild_alliance`)- %s\n", mysql_error(&mysql_handle) );
-		free(g);
+		aFree(g);
 		return 0;
 	}
 	sql_res = mysql_store_result(&mysql_handle) ;
@@ -400,12 +458,12 @@ struct guild * inter_guild_fromsql(int guild_id)
 		}
 	}
 	mysql_free_result(sql_res);
-	
+
 	//printf("- Read guild_expulsion %d from sql \n",guild_id);
 	sprintf(tmp_sql,"SELECT `guild_id`,`name`,`mes`,`acc`,`account_id`,`rsv1`,`rsv2`,`rsv3` FROM `%s` WHERE `guild_id`='%d'",guild_expulsion_db, guild_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (select `guild_expulsion`)- %s\n", mysql_error(&mysql_handle) );
-		free(g);
+		aFree(g);
 		return 0;
 	}
 	sql_res = mysql_store_result(&mysql_handle) ;
@@ -421,16 +479,16 @@ struct guild * inter_guild_fromsql(int guild_id)
 			e->rsv1=atoi(sql_row[5]);
 			e->rsv2=atoi(sql_row[6]);
 			e->rsv3=atoi(sql_row[7]);
-			
+
 		}
 	}
 	mysql_free_result(sql_res);
-	
+
 	//printf("- Read guild_skill %d from sql \n",guild_id);
 	sprintf(tmp_sql,"SELECT `guild_id`,`id`,`lv` FROM `%s` WHERE `guild_id`='%d' ORDER BY `id`",guild_skill_db, guild_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (select `guild_skill`)- %s\n", mysql_error(&mysql_handle) );
-		free(g);
+		aFree(g);
 		return 0;
 	}
 	sql_res = mysql_store_result(&mysql_handle) ;
@@ -442,7 +500,7 @@ struct guild * inter_guild_fromsql(int guild_id)
 		}
 	}
 	mysql_free_result(sql_res);
-							
+
 //	printf("Successfully retrieve guild information from sql!\n");
 
 	numdb_insert(guild_db_, guild_id,g);
@@ -450,21 +508,40 @@ struct guild * inter_guild_fromsql(int guild_id)
 	return g;
 }
 
-// Save guild_castle to sql
+#if 1
+static int _set_guild_castle(void *key, void *data, va_list ap) {
+    int castle_id = va_arg(ap, int);
+    int guild_id = va_arg(ap, int);
+    struct guild * g = (struct guild *) data;
+
+    if (g->castle_id == castle_id)
+        g->castle_id = -1;
+    if (g->guild_id == guild_id)
+        g->castle_id = castle_id;
+    return 0;
+}
+#endif
+
 int inter_guildcastle_tosql(struct guild_castle *gc)
 {
-	// `guild_castle` (`castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`, `visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`)
-	
-	if (gc==NULL) return 0;
-	//printf("Save to guild_castle\n");
-	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `castle_id`='%d'",guild_castle_db, gc->castle_id);
-	//printf(" %s\n",tmp_sql);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
+        struct guild_castle *gcopy;
+	if(gc == NULL || gc->castle_id < 0 ){ //gc->castle_id can be == 0 (for the 1st castle it's == 0) [Lupus]
 		return 0;
 	}
-	
-	sprintf(tmp_sql,"INSERT INTO `%s` "
+	//printf("[Guild Castle %02i]: Save...\n",gc->castle_id);
+	gcopy = (struct guild_castle *) numdb_search(castle_db_,gc->castle_id);
+	if (gcopy == NULL) {
+		gcopy = (struct guild_castle *) aMalloc(sizeof(struct guild_castle));
+		numdb_insert(castle_db_, gc->castle_id, gcopy);
+	} else {
+		//if the castle data hasn't been changed, then we don't write it into SQL
+		if ((gc->guild_id  == gcopy->guild_id ) && (  gc->economy  == gcopy->economy ) && ( gc->defense  == gcopy->defense ) && ( gc->triggerE  == gcopy->triggerE ) && ( gc->triggerD  == gcopy->triggerD ) && ( gc->nextTime  == gcopy->nextTime ) && ( gc->payTime  == gcopy->payTime ) && ( gc->createTime  == gcopy->createTime ) && ( gc->visibleC  == gcopy->visibleC ) && ( gc->visibleG0  == gcopy->visibleG0 ) && ( gc->visibleG1  == gcopy->visibleG1 ) && ( gc->visibleG2  == gcopy->visibleG2 ) && ( gc->visibleG3  == gcopy->visibleG3 ) && ( gc->visibleG4  == gcopy->visibleG4 ) && ( gc->visibleG5  == gcopy->visibleG5 ) && ( gc->visibleG6  == gcopy->visibleG6 ) && ( gc->visibleG7  == gcopy->visibleG7 ) && ( gc->Ghp0  == gcopy->Ghp0 ) && ( gc->Ghp1  == gcopy->Ghp1 ) && ( gc->Ghp2  == gcopy->Ghp2 ) && ( gc->Ghp3  == gcopy->Ghp3 ) && ( gc->Ghp4  == gcopy->Ghp4 ) && ( gc->Ghp5  == gcopy->Ghp5 ) && ( gc->Ghp6  == gcopy->Ghp6 ) && ( gc->Ghp7 == gcopy->Ghp7 ))
+			return 0;
+	}
+	//printf("[Guild Castle %02i]: Save... ->SQL\n",gc->castle_id);
+	memcpy(gcopy, gc, sizeof(struct guild_castle));
+
+	sprintf(tmp_sql,"REPLACE INTO `%s` "
 		"(`castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`,"
 		"`visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`,"
 		"`Ghp0`, `Ghp1`, `Ghp2`, `Ghp3`, `Ghp4`, `Ghp5`, `Ghp6`, `Ghp7`)"
@@ -472,35 +549,35 @@ int inter_guildcastle_tosql(struct guild_castle *gc)
 		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, gc->visibleG0, gc->visibleG1, gc->visibleG2, gc->visibleG3, gc->visibleG4, gc->visibleG5,
 		gc->visibleG6, gc->visibleG7, gc->Ghp0, gc->Ghp1, gc->Ghp2, gc->Ghp3, gc->Ghp4, gc->Ghp5, gc->Ghp6, gc->Ghp7);
-	//printf(" %s\n",tmp_sql);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
-		return 0;
-	}
 
-	sprintf(tmp_sql,"UPDATE `%s` SET `castle_id`='-1' WHERE `castle_id`='%d'",guild_db, gc->castle_id);
-	//printf(" %s\n",tmp_sql);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
-		return 0;
-	}
-		
-	sprintf(tmp_sql,"UPDATE `%s` SET `castle_id`='%d' WHERE `guild_id`='%d'",guild_db, gc->castle_id,gc->guild_id);
 	//printf(" %s\n",tmp_sql);
+
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 		return 0;
 	}
+
+        db_foreach(guild_db_, _set_guild_castle, gc->castle_id,gc->guild_id);
 	
 	return 0;
 }
+
 // Read guild_castle from sql
 int inter_guildcastle_fromsql(int castle_id,struct guild_castle *gc)
 {
-	
+    struct guild_castle *gcopy;
 	if (gc==NULL) return 0;
 	//printf("Read from guild_castle\n");
-	memset(gc,0,sizeof(struct guild_castle));
+
+	gcopy = (struct guild_castle*)numdb_search(castle_db_, castle_id);
+	if (gcopy == NULL) {
+	  gcopy = (struct guild_castle*)aMalloc(sizeof(struct guild_castle));
+	  numdb_insert(castle_db_, gc->castle_id, gcopy);
+	} else {
+	  memcpy(gc, gcopy, sizeof(struct guild_castle));
+	  return 0;
+	}
+
 	gc->castle_id=castle_id;
 	if (castle_id==-1) return 0;
 	sprintf(tmp_sql,"SELECT `castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`, "
@@ -518,7 +595,7 @@ int inter_guildcastle_fromsql(int castle_id,struct guild_castle *gc)
 			mysql_free_result(sql_res);
 			return 0;
 		}
-		
+
 		gc->guild_id =  atoi (sql_row[1]);
 		gc->economy = atoi (sql_row[2]);
 		gc->defense = atoi (sql_row[3]);
@@ -544,11 +621,14 @@ int inter_guildcastle_fromsql(int castle_id,struct guild_castle *gc)
 		gc->Ghp5 = atoi (sql_row[23]);
 		gc->Ghp6 = atoi (sql_row[24]);
 		gc->Ghp7 = atoi (sql_row[25]);
-		
+
 		//printf("Read Castle %d of guild %d from sql \n",castle_id,gc->guild_id);
 
 	}
 	mysql_free_result(sql_res) ; //resource free
+
+	memcpy(gcopy, gc, sizeof(struct guild_castle));
+
 	return 0;
 }
 
@@ -559,7 +639,7 @@ int inter_guild_readdb()
 	FILE *fp;
 	char line[1024];
 	for (i=0;i<100;i++) guild_exp[i]=0;
-	
+
 	fp=fopen("db/exp_guild.txt","r");
 	if(fp==NULL){
 		printf("can't read db/exp_guild.txt\n");
@@ -585,17 +665,14 @@ int inter_guild_sql_init()
 
         guild_db_=numdb_init();
         castle_db_=numdb_init();
-        guild_expcache_db_=numdb_init();
-        guild_infoevent_db_=numdb_init();
-        guild_castleinfoevent_db_=numdb_init();
-	
+
 	printf("interserver guild memory initialize.... (%d byte)\n",sizeof(struct guild));
-	guild_pt = calloc(sizeof(struct guild), 1);
-	guild_pt2= calloc(sizeof(struct guild), 1);
-	guildcastle_pt=calloc(sizeof(struct guild_castle), 1);
-	
+	guild_pt = (struct guild*)aCalloc(sizeof(struct guild), 1);
+	guild_pt2= (struct guild*)aCalloc(sizeof(struct guild), 1);
+	guildcastle_pt = (struct guild_castle*)aCalloc(sizeof(struct guild_castle), 1);
+
 	inter_guild_readdb(); // Read exp
-	
+
 	sprintf (tmp_sql , "SELECT count(*) FROM `%s`",guild_db);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
@@ -614,18 +691,41 @@ int inter_guild_sql_init()
 			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 			exit(0);
 		}
-		
+
 		sql_res = mysql_store_result(&mysql_handle) ;
 		sql_row = mysql_fetch_row(sql_res);
 		guild_newid = atoi(sql_row[0])+1;
 		mysql_free_result(sql_res);
 	}
-	
+
 	printf("set guild_newid: %d.......\n",guild_newid);
 
 	return 0;
 }
 
+int guild_db_final (void *k, void *data, va_list ap)
+{
+	struct guild *g = (struct guild *) data;
+	if (g) aFree(g);
+	return 0;
+}
+int castle_db_final (void *k, void *data, va_list ap)
+{
+	struct guild_castle *gc = (struct guild_castle *) data;
+	if (gc) aFree(gc);
+	return 0;
+}
+void inter_guild_sql_final()
+{
+	if (guild_pt) aFree(guild_pt);
+	if (guild_pt2) aFree(guild_pt2);
+	if (guildcastle_pt) aFree(guildcastle_pt);
+	
+	numdb_final(guild_db_, guild_db_final);
+	numdb_final(castle_db_, castle_db_final);
+
+	return;
+}
 
 // Get guild by its name
 struct guild* search_guildname(char *str)
@@ -655,7 +755,7 @@ int guild_check_empty(struct guild *g)
 			return 0;
 		}
 	}
-	
+
 	// 誰もいないので解散
 	mapif_guild_broken(g->guild_id,0);
 	inter_guild_storage_delete(g->guild_id);
@@ -707,7 +807,7 @@ int guild_calcinfo(struct guild *g)
 			nextexp = guild_nextexp(g->guild_lv);
 		}
 	}
-	
+
 	// ギルドの次の経験値
 	g->next_exp = guild_nextexp(g->guild_lv);
 
@@ -721,13 +821,13 @@ int guild_calcinfo(struct guild *g)
 		if(g->member[i].account_id>0){
 			g->average_lv+=g->member[i].lv;
 			c++;
-			
+
 			if(g->member[i].online>0)
 				g->connect_member++;
 		}
 	}
 	if(c) g->average_lv/=c;
-	
+
 	// 全データを送る必要がありそう
 	if(	g->max_member!=before.max_member	||
 		g->guild_lv!=before.guild_lv		||
@@ -735,7 +835,7 @@ int guild_calcinfo(struct guild *g)
 		mapif_guild_info(-1,g);
 		return 1;
 	}
-		
+
 	return 0;
 }
 
@@ -818,9 +918,9 @@ int mapif_guild_memberinfoshort(struct guild *g,int idx)
 	WBUFL(buf, 2)=g->guild_id;
 	WBUFL(buf, 6)=g->member[idx].account_id;
 	WBUFL(buf,10)=g->member[idx].char_id;
-	WBUFB(buf,14)=g->member[idx].online;
+	WBUFB(buf,14)=(unsigned char)g->member[idx].online;
 	WBUFW(buf,15)=g->member[idx].lv;
-	WBUFW(buf,17)=g->member[idx].class;
+	WBUFW(buf,17)=g->member[idx].class_;
 	mapif_sendall(buf,19);
 	return 0;
 }
@@ -838,7 +938,7 @@ int mapif_guild_broken(int guild_id,int flag)
 }
 
 // ギルド内発言
-int mapif_guild_message(int guild_id,int account_id,char *mes,int len)
+int mapif_guild_message(int guild_id,int account_id,char *mes,int len, int sfd)
 {
 	unsigned char buf[512];
 	WBUFW(buf,0)=0x3837;
@@ -846,7 +946,7 @@ int mapif_guild_message(int guild_id,int account_id,char *mes,int len)
 	WBUFL(buf,4)=guild_id;
 	WBUFL(buf,8)=account_id;
 	memcpy(WBUFP(buf,12),mes,len);
-	mapif_sendall(buf,len+12);
+	mapif_sendallwos(sfd, buf,len+12);
 	return 0;
 }
 
@@ -966,6 +1066,7 @@ int mapif_guild_castle_datasave(int castle_id,int index,int value)      // <Agit
 
 int mapif_guild_castle_alldataload(int fd) {
 	struct guild_castle* gc = guildcastle_pt;
+        struct guild_castle *gcopy;
 	int i, len = 4;
 
 	WFIFOW(fd,0) = 0x3842;
@@ -1004,6 +1105,14 @@ int mapif_guild_castle_alldataload(int fd) {
 			gc->Ghp6 = atoi(sql_row[24]);
 			gc->Ghp7 = atoi(sql_row[25]);
 			memcpy(WFIFOP(fd,len), gc, sizeof(struct guild_castle));
+
+                        gcopy = (struct guild_castle*)numdb_search(castle_db_,gc->castle_id);
+                        if (gcopy == NULL) {
+                            gcopy = (struct guild_castle *) aMalloc(sizeof(struct guild_castle));
+                            numdb_insert(castle_db_, gc->castle_id, gcopy);
+                        }
+                        memcpy(gcopy, gc, sizeof(struct guild_castle));
+
 			len += sizeof(struct guild_castle);
 		}
 	}
@@ -1024,7 +1133,7 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member
 {
 	struct guild *g;
 	int i;
-	
+
 	printf("CreateGuild\n");
 	g=search_guildname(name);
 	if(g!=NULL&&g->guild_id>0){
@@ -1038,38 +1147,38 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member
 	memcpy(g->name,name,24);
 	memcpy(g->master,master->name,24);
 	memcpy(&g->member[0],master,sizeof(struct guild_member));
-	
+
 	g->position[0].mode=0x11;
-	strcpy(g->position[                  0].name,"GuildMaster");
+	strcpy(g->position[0].name,"GuildMaster");
 	strcpy(g->position[MAX_GUILDPOSITION-1].name,"Newbie");
 	for(i=1;i<MAX_GUILDPOSITION-1;i++)
 		sprintf(g->position[i].name,"Position %d",i+1);
-	
+
 	// Initialize guild property
 	g->max_member=16;
 	g->average_lv=master->lv;
 	g->castle_id=-1;
 	for(i=0;i<MAX_GUILDSKILL;i++)
 		g->skill[i].id=i + GD_SKILLBASE;
-	
+
 	// Save to sql
 	printf("Create initialize OK!\n");
 	i=inter_guild_tosql(g,255);
-	
+
 	if (i<0) {
 		mapif_guild_created(fd,account_id,NULL);
 		return 0;
 	}
-	
+
 	// Report to client
 	mapif_guild_created(fd,account_id,g);
 	mapif_guild_info(fd,g);
-	
+
 	if(log_inter)
 		inter_log("guild %s (id=%d) created by master %s (id=%d)" RETCODE,
 			name, g->guild_id, master->name, master->account_id );
-	
-	
+
+
 	return 0;
 }
 // Return guild info to client
@@ -1089,15 +1198,15 @@ int mapif_parse_GuildAddMember(int fd,int guild_id,struct guild_member *m)
 {
 	struct guild *g = inter_guild_fromsql(guild_id);
 	int i;
-	
+
 	if(g==NULL||g->guild_id<=0){
 		mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,1);
 		return 0;
 	}
-	
+
 	for(i=0;i<g->max_member;i++){
 		if(g->member[i].account_id==0){
-			
+
 			memcpy(&g->member[i],m,sizeof(struct guild_member));
 			mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,0);
 			guild_calcinfo(g);
@@ -1114,7 +1223,7 @@ int mapif_parse_GuildAddMember(int fd,int guild_id,struct guild_member *m)
 int mapif_parse_GuildLeave(int fd,int guild_id,int account_id,int char_id,int flag,const char *mes)
 {
 	struct guild *g= inter_guild_fromsql(guild_id);
-	
+
 	if(g!=NULL&&g->guild_id>0){
 		int i;
 		for(i=0;i<g->max_member;i++){
@@ -1122,7 +1231,7 @@ int mapif_parse_GuildLeave(int fd,int guild_id,int account_id,int char_id,int fl
 				g->member[i].char_id==char_id){
 				printf("%d %d\n",i, (int)(&g->member[i]));
 				printf("%d %s\n",i, g->member[i].name);
-				
+
 				if(flag){	// 追放の場合追放リストに入れる
 					int j;
 					for(j=0;j<MAX_GUILDEXPLUSION;j++){
@@ -1139,17 +1248,17 @@ int mapif_parse_GuildLeave(int fd,int guild_id,int account_id,int char_id,int fl
 					memcpy(g->explusion[j].name,g->member[i].name,24);
 					memcpy(g->explusion[j].mes,mes,40);
 				}
-				
+
 				mapif_guild_leaved(guild_id,account_id,char_id,flag,g->member[i].name,mes);
 				printf("%d %d\n",i, (int)(&g->member[i]));
 				printf("%d %s\n",i, (&g->member[i])->name);
 				memset(&g->member[i],0,sizeof(struct guild_member));
-				
+
 				if( guild_check_empty(g)==0 )
 					mapif_guild_info(-1,g);// まだ人がいるのでデータ送信
 				/*
 				else
-					inter_guild_save();	// 解散したので一応セーブ
+					inter_guild_save();	// 解散したので一営Zーブ
 				return 0;*/
 			}
 		}
@@ -1162,31 +1271,33 @@ int mapif_parse_GuildLeave(int fd,int guild_id,int account_id,int char_id,int fl
 		}
 		/* mapif_guild_leaved(guild_id,account_id,char_id,flag,g->member[i].name,mes);	*/
 	}
-	
+
 	return 0;
 }
-
 // Change member info
 int mapif_parse_GuildChangeMemberInfoShort(int fd,int guild_id,
-	int account_id,int char_id,int online,int lv,int class)
+	int account_id,int char_id,int online,int lv,int class_)
 {
 	// Could speed up by manipulating only guild_member
 	struct guild * g= inter_guild_fromsql(guild_id);
-	int i,alv,c;
+	int i,alv,c, idx;
 
 	if(g==NULL||g->guild_id<=0)
 		return 0;
-	
+
 	g->connect_member=0;
-	
+
+	idx = -1;
+
 	for(i=0,alv=0,c=0;i<g->max_member;i++){
 		if(	g->member[i].account_id==account_id &&
 			g->member[i].char_id==char_id){
-			
+
 			g->member[i].online=online;
 			g->member[i].lv=lv;
-			g->member[i].class=class;
+			g->member[i].class_=class_;
 			mapif_guild_memberinfoshort(g,i);
+			idx = i;
 		}
 		if( g->member[i].account_id>0 ){
 			alv+=g->member[i].lv;
@@ -1195,11 +1306,19 @@ int mapif_parse_GuildChangeMemberInfoShort(int fd,int guild_id,
 		if( g->member[i].online )
 			g->connect_member++;
 	}
-	// 平均レベル
-	g->average_lv=alv/c;
-	
-	inter_guild_tosql(g,3); // Change guild & guild_member
-	
+
+	if (c)
+		// 平均レベル
+		g->average_lv=alv/c;
+
+	sprintf(tmp_sql, "UPDATE `%s` SET `connect_member`=%d,`average_lv`=%d WHERE `guild_id`='%d'", guild_db,  g->connect_member, g->average_lv,  g->guild_id);
+	if(mysql_query(&mysql_handle, tmp_sql) )
+	  printf("DB server Error: %s - %s\n", tmp_sql, mysql_error(&mysql_handle) );
+
+	sprintf(tmp_sql, "UPDATE `%s` SET `online`=%d,`lv`=%d,`class`=%d WHERE `char_id`=%d", guild_member_db, g->member[idx].online, g->member[idx].lv, g->member[idx].class_, g->member[idx].char_id);
+	if(mysql_query(&mysql_handle, tmp_sql) )
+	  printf("DB server Error: %s - %s\n", tmp_sql, mysql_error(&mysql_handle) );
+
 	return 0;
 }
 
@@ -1209,7 +1328,7 @@ int mapif_parse_BreakGuild(int fd,int guild_id)
 	struct guild *g= inter_guild_fromsql(guild_id);
 	if(g==NULL)
 		return 0;
-	
+
 	// Delete guild from sql
 	//printf("- Delete guild %d from guild\n",guild_id);
 	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_db, guild_id);
@@ -1241,32 +1360,34 @@ int mapif_parse_BreakGuild(int fd,int guild_id)
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (delete `guild_position`)- %s\n", mysql_error(&mysql_handle) );
 	}
-	
+
 	//printf("- Delete guild %d from guild_castle\n",guild_id);
 	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_castle_db, guild_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (delete `guild_position`)- %s\n", mysql_error(&mysql_handle) );
 	}
-	
+
+        db_foreach(castle_db_, _erase_guild, guild_id);
+
 	//printf("- Update guild %d of char\n",guild_id);
 	sprintf(tmp_sql, "UPDATE `%s` SET `guild_id`='0' WHERE `guild_id`='%d'",char_db, guild_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (delete `guild_position`)- %s\n", mysql_error(&mysql_handle) );
 	}
-		
+
 	inter_guild_storage_delete(guild_id);
 	mapif_guild_broken(guild_id,0);
-	
+
 	if(log_inter)
 		inter_log("guild %s (id=%d) broken" RETCODE,g->name,guild_id);
-	
+
 	return 0;
 }
 
 // ギルドメッセージ送信
 int mapif_parse_GuildMessage(int fd,int guild_id,int account_id,char *mes,int len)
 {
-	return mapif_guild_message(guild_id,account_id,mes,len);
+	return mapif_guild_message(guild_id,account_id,mes,len, fd);
 }
 // ギルド基本データ変更要求
 int mapif_parse_GuildBasicInfoChange(int fd,int guild_id,
@@ -1307,7 +1428,7 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha
 	struct guild * g = inter_guild_fromsql(guild_id);
 
 	//printf("GuildMemberInfoChange %s \n",(type==GMI_EXP)?"GMI_EXP":"OTHER");
-	
+
 	if(g==NULL){
 		return 0;
 	}
@@ -1322,21 +1443,34 @@ int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int cha
 	}
 	switch(type){
 	case GMI_POSITION:	// 役職
-		g->member[i].position=*((int *)data);
-		break;
-	case GMI_EXP:	{	// EXP
-			int exp,oldexp=g->member[i].exp;
-			exp=g->member[i].exp=*((unsigned int *)data);
-			g->exp+=(exp-oldexp);
-			guild_calcinfo(g);	// Lvアップ判断
-			mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,4);
-		}break;
+	  {
+	    g->member[i].position=*((int *)data);
+	    mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+	    inter_guild_tosql(g,3); // Change guild & guild_member
+	    break;
+	  }
+	case GMI_EXP:
+	  {	// EXP
+	    int exp,oldexp=g->member[i].exp;
+	    exp=g->member[i].exp=*((unsigned int *)data);
+	    g->exp+=(exp-oldexp);
+	    guild_calcinfo(g);	// Lvアップ判断
+	    mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,4);
+	    mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
+
+	    sprintf(tmp_sql, "UPDATE `%s` SET `guild_lv`=%d,`connect_member`=%d,`max_member`=%d,`average_lv`=%d,`exp`=%d,`next_exp`=%d,`skill_point`=%d WHERE `guild_id`='%d'", guild_db, g->guild_lv, g->connect_member, g->max_member, g->average_lv, g->exp, g->next_exp, g->skill_point, g->guild_id);
+	    if(mysql_query(&mysql_handle, tmp_sql) )
+	      printf("DB server Error: %s - %s\n", tmp_sql, mysql_error(&mysql_handle) );
+
+	    sprintf(tmp_sql, "UPDATE `%s` SET `exp`=%d  WHERE `char_id`=%d", guild_member_db, g->member[i].exp, g->member[i].char_id);
+	    if(mysql_query(&mysql_handle, tmp_sql) )
+	      printf("DB server Error: %s - %s\n", tmp_sql, mysql_error(&mysql_handle) );
+	    break;
+	  }
 	default:
-		printf("int_guild: GuildMemberInfoChange: Unknown type %d\n",type);
-		break;
+	  printf("int_guild: GuildMemberInfoChange: Unknown type %d\n",type);
+	  break;
 	}
-	mapif_guild_memberinfochanged(guild_id,account_id,char_id,type,data,len);
-	inter_guild_tosql(g,3); // Change guild & guild_member
 	return 0;
 }
 
@@ -1362,10 +1496,11 @@ int mapif_parse_GuildSkillUp(int fd,int guild_id,int skill_num,int account_id)
 	struct guild *g = inter_guild_fromsql(guild_id);
 	int idx = skill_num - GD_SKILLBASE;
 
+
 	if(g == NULL || idx < 0 || idx >= MAX_GUILDSKILL)
 		return 0;
 	//printf("GuildSkillUp\n");
-	
+
 	if(	g->skill_point>0 && g->skill[idx].id>0 &&
 		g->skill[idx].lv<10 ){
 		g->skill[idx].lv++;
@@ -1388,10 +1523,10 @@ int mapif_parse_GuildAlliance(int fd,int guild_id1,int guild_id2,
 	int j,i;
 	g[0]= inter_guild_fromsql(guild_id1);
 	g[1]= inter_guild_fromsql(guild_id2);
-	
+
 	if(g[0]==NULL || g[1]==NULL || g[0]->guild_id ==0 || g[1]->guild_id==0)
 		return 0;
-		
+
 	if(!(flag&0x8)){
 		for(i=0;i<2-(flag&1);i++){
 			for(j=0;j<MAX_GUILDALLIANCE;j++)
@@ -1422,7 +1557,7 @@ int mapif_parse_GuildAlliance(int fd,int guild_id1,int guild_id2,
 int mapif_parse_GuildNotice(int fd,int guild_id,const char *mes1,const char *mes2)
 {
 	struct guild *g= inter_guild_fromsql(guild_id);
-	
+
 	if(g==NULL||g->guild_id<=0)
 		return 0;
 	memcpy(g->mes1,mes1,60);
@@ -1434,7 +1569,7 @@ int mapif_parse_GuildNotice(int fd,int guild_id,const char *mes1,const char *mes
 int mapif_parse_GuildEmblem(int fd,int len,int guild_id,int dummy,const char *data)
 {
 	struct guild * g= inter_guild_fromsql(guild_id);
-	
+
 	if(g==NULL||g->guild_id<=0)
 		return 0;
 	memcpy(g->emblem_data,data,len);
@@ -1497,7 +1632,7 @@ int mapif_parse_GuildCastleDataSave(int fd,int castle_id,int index,int value)
 			struct guild *g=inter_guild_fromsql(gid);
 			if(log_inter)
 				inter_log("guild %s (id=%d) %s castle id=%d" RETCODE,
-					(g)?g->name:"??" ,gid, (value)?"occupy":"abandon", index);
+					(g)?g->name:"??" ,gid, (value)?"occupy":"abandon", castle_id);
 		}
 		gc->guild_id = value;
 		break;
@@ -1548,21 +1683,21 @@ int mapif_parse_GuildCheck(int fd,int guild_id,int account_id,int char_id)
 int inter_guild_parse_frommap(int fd)
 {
 	switch(RFIFOW(fd,0)){
-	case 0x3030: mapif_parse_CreateGuild(fd,RFIFOL(fd,4),RFIFOP(fd,8),(struct guild_member *)RFIFOP(fd,32)); break;
+	case 0x3030: mapif_parse_CreateGuild(fd,RFIFOL(fd,4),(char*)RFIFOP(fd,8),(struct guild_member *)RFIFOP(fd,32)); break;
 	case 0x3031: mapif_parse_GuildInfo(fd,RFIFOL(fd,2)); break;
 	case 0x3032: mapif_parse_GuildAddMember(fd,RFIFOL(fd,4),(struct guild_member *)RFIFOP(fd,8)); break;
-	case 0x3034: mapif_parse_GuildLeave(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOP(fd,15)); break;
+	case 0x3034: mapif_parse_GuildLeave(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),(const char*)RFIFOP(fd,15)); break;
 	case 0x3035: mapif_parse_GuildChangeMemberInfoShort(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOW(fd,17)); break;
 	case 0x3036: mapif_parse_BreakGuild(fd,RFIFOL(fd,2)); break;
-	case 0x3037: mapif_parse_GuildMessage(fd,RFIFOL(fd,4),RFIFOL(fd,8),RFIFOP(fd,12),RFIFOW(fd,2)-12); break;
+	case 0x3037: mapif_parse_GuildMessage(fd,RFIFOL(fd,4),RFIFOL(fd,8),(char*)RFIFOP(fd,12),RFIFOW(fd,2)-12); break;
 	case 0x3038: mapif_parse_GuildCheck(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10)); break;
-	case 0x3039: mapif_parse_GuildBasicInfoChange(fd,RFIFOL(fd,4),RFIFOW(fd,8),RFIFOP(fd,10),RFIFOW(fd,2)-10); break;
-	case 0x303A: mapif_parse_GuildMemberInfoChange(fd,RFIFOL(fd,4),RFIFOL(fd,8),RFIFOL(fd,12),RFIFOW(fd,16),RFIFOP(fd,18),RFIFOW(fd,2)-18); break;
+	case 0x3039: mapif_parse_GuildBasicInfoChange(fd,RFIFOL(fd,4),RFIFOW(fd,8),(const char*)RFIFOP(fd,10),RFIFOW(fd,2)-10); break;
+	case 0x303A: mapif_parse_GuildMemberInfoChange(fd,RFIFOL(fd,4),RFIFOL(fd,8),RFIFOL(fd,12),RFIFOW(fd,16),(const char*)RFIFOP(fd,18),RFIFOW(fd,2)-18); break;
 	case 0x303B: mapif_parse_GuildPosition(fd,RFIFOL(fd,4),RFIFOL(fd,8),(struct guild_position *)RFIFOP(fd,12)); break;
 	case 0x303C: mapif_parse_GuildSkillUp(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10)); break;
 	case 0x303D: mapif_parse_GuildAlliance(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOL(fd,14),RFIFOB(fd,18)); break;
-	case 0x303E: mapif_parse_GuildNotice(fd,RFIFOL(fd,2),RFIFOP(fd,6),RFIFOP(fd,66)); break;
-	case 0x303F: mapif_parse_GuildEmblem(fd,RFIFOW(fd,2)-12,RFIFOL(fd,4),RFIFOL(fd,8),RFIFOP(fd,12)); break;
+	case 0x303E: mapif_parse_GuildNotice(fd,RFIFOL(fd,2),(const char*)RFIFOP(fd,6),(const char*)RFIFOP(fd,66)); break;
+	case 0x303F: mapif_parse_GuildEmblem(fd,RFIFOW(fd,2)-12,RFIFOL(fd,4),RFIFOL(fd,8),(const char*)RFIFOP(fd,12)); break;
 	case 0x3040: mapif_parse_GuildCastleDataLoad(fd,RFIFOW(fd,2),RFIFOB(fd,4)); break;
 	case 0x3041: mapif_parse_GuildCastleDataSave(fd,RFIFOW(fd,2),RFIFOB(fd,4),RFIFOL(fd,5)); break;
 
diff --git a/src/char_sql/int_guild.h b/src/char_sql/int_guild.h
index 8f4203d7c..8257cf8f6 100644
--- a/src/char_sql/int_guild.h
+++ b/src/char_sql/int_guild.h
@@ -3,6 +3,7 @@
 
 int inter_guild_parse_frommap(int fd);
 int inter_guild_sql_init();
+void inter_guild_sql_final();
 int inter_guild_mapif_init(int fd);
 
 int inter_guild_leave(int guild_id,int account_id,int char_id);
diff --git a/src/char_sql/int_party.c b/src/char_sql/int_party.c
index b2528a42d..430385110 100644
--- a/src/char_sql/int_party.c
+++ b/src/char_sql/int_party.c
@@ -3,15 +3,12 @@
 // SQL conversion by hack
 //
 
-#include "char.h"
-#include "strlib.h"
-#include "socket.h"	
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-
-#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
+#include "char.h"
+#include "../common/strlib.h"
+#include "socket.h"
 
 static struct party *party_pt;
 static int party_newid=100;
@@ -20,29 +17,31 @@ int mapif_party_broken(int party_id,int flag);
 int party_check_empty(struct party *p);
 int mapif_parse_PartyLeave(int fd,int party_id,int account_id);
 
+#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
+
 // Save party to mysql
 int inter_party_tosql(int party_id,struct party *p)
 {
 	// 'party' ('party_id','name','exp','item','leader')
-	
+
 	char t_name[100];
 	char t_member[24];
 	int party_member = 0, party_online_member = 0;
 	int party_exist = 0;
 	int leader_id = 0;
 	int i = 0;
-	
+
 	printf("(\033[1;64m%d\033[0m)    Request save party - ",party_id);
-	
+
 	jstrescapecpy(t_name, p->name);
-	
+
 	if (p==NULL || party_id==0 || p->party_id ==0 || party_id!=p->party_id) {
 		printf("- Party pointer or party_id error \n");
 		return 0;
 	}
-	
-	// Check if party exists	
-	sprintf(tmp_sql,"SELECT count(*) FROM `%s` WHERE `party_id`='%d'",party_db, party_id);
+
+	// Check if party exists
+	sprintf(tmp_sql,"SELECT count(*) FROM `%s` WHERE `party_id`='%d'",party_db, party_id); // TBR
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 		return 0;
@@ -57,7 +56,7 @@ int inter_party_tosql(int party_id,struct party *p)
 
 	if (party_exist >0){
 		// Check members in party
-		sprintf(tmp_sql,"SELECT count(*) FROM `%s` WHERE `party_id`='%d'",char_db, party_id);
+		sprintf(tmp_sql,"SELECT count(*) FROM `%s` WHERE `party_id`='%d'",char_db, party_id); // TBR
 		if(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 			return 0;
@@ -65,22 +64,22 @@ int inter_party_tosql(int party_id,struct party *p)
 		sql_res = mysql_store_result(&mysql_handle) ;
 		if (sql_res!=NULL && mysql_num_rows(sql_res)>0) {
 			sql_row = mysql_fetch_row(sql_res);
-			
+
 			party_member =  atoi (sql_row[0]);
 		//	printf("- Check members in party %d : %d \n",party_id,party_member);
 
 		}
 		mysql_free_result(sql_res) ; //resource free
-	
+
 		party_online_member = 0;
 		i=0;
 		while (i<MAX_PARTY){
 			if (p->member[i].account_id>0) party_online_member++;
 			i++;
 		}
-		
+
 		//if (party_online_member==0) printf("- No member online \n"); else printf("- Some member %d online \n", party_online_member);
-			
+
 		if (party_member <= 0 && party_online_member == 0) {
 
 			// Delete the party, if has no member.
@@ -93,29 +92,29 @@ int inter_party_tosql(int party_id,struct party *p)
 			return 0;
 		} else {
 			// Update party information, if exists
-			
+
 			int i=0;
-				
+
 			for (i=0;i<MAX_PARTY;i++){
 
 				if (p->member[i].account_id>0){
-					sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='%d', `online`='%d' WHERE `account_id`='%d' AND `name`='%s'",
-						char_db, party_id, p->member[i].online, p->member[i].account_id,jstrescapecpy(t_member,p->member[i].name));	
+					sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='%d' WHERE `account_id`='%d' AND `name`='%s'",
+						char_db, party_id, p->member[i].account_id,jstrescapecpy(t_member,p->member[i].name));
 					//printf("%s",tmp_sql);
 					if(mysql_query(&mysql_handle, tmp_sql) ) {
 						printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle) );
 					}
 				}
 			}
-			
-			
+
+
 			sprintf(tmp_sql,"UPDATE `%s` SET `name`='%s', `exp`='%d', `item`='%d', `leader_id`=`leader_id` WHERE `party_id`='%d'",
-				party_db, t_name,p->exp,p->item,party_id);	
+				party_db, t_name,p->exp,p->item,party_id);
 			if(mysql_query(&mysql_handle, tmp_sql) ) {
 				printf("DB server Error (inset/update `party`)- %s\n", mysql_error(&mysql_handle) );
 			}
 
-			
+
 		//	printf("- Update party %d information \n",party_id);
 		}
 	} else {
@@ -129,18 +128,18 @@ int inter_party_tosql(int party_id,struct party *p)
 			printf("DB server Error (inset/update `party`)- %s\n", mysql_error(&mysql_handle) );
 			return 0;
 		}
-		
-		sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='%d', `online`='1'  WHERE `account_id`='%d' AND `name`='%s'",
-			char_db, party_id,leader_id, jstrescapecpy(t_member,p->member[i].name));	
+
+		sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='%d'  WHERE `account_id`='%d' AND `name`='%s'",
+			char_db, party_id,leader_id, jstrescapecpy(t_member,p->member[i].name));
 		if(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error (inset/update `party`)- %s\n", mysql_error(&mysql_handle) );
 		}
-		
-		//printf("- Insert new party %d  \n",party_id);	
+
+		//printf("- Insert new party %d  \n",party_id);
 	}
-	
+
 	printf("Party save success\n");
-	return 0;	
+	return 0;
 
 }
 
@@ -149,15 +148,15 @@ int inter_party_fromsql(int party_id,struct party *p)
 {
 	int leader_id=0;
 	printf("(\033[1;64m%d\033[0m)    Request load party - ",party_id);
-	
+
 	memset(p, 0, sizeof(struct party));
-	
-	sprintf(tmp_sql,"SELECT `party_id`, `name`,`exp`,`item`, `leader_id` FROM `%s` WHERE `party_id`='%d'",party_db, party_id);
+
+	sprintf(tmp_sql,"SELECT `party_id`, `name`,`exp`,`item`, `leader_id` FROM `%s` WHERE `party_id`='%d'",party_db, party_id); // TBR
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (select `party`)- %s\n", mysql_error(&mysql_handle) );
 		return 0;
 	}
-	
+
 	sql_res = mysql_store_result(&mysql_handle) ;
 	if (sql_res!=NULL && mysql_num_rows(sql_res)>0) {
 		sql_row = mysql_fetch_row(sql_res);
@@ -172,11 +171,11 @@ int inter_party_fromsql(int party_id,struct party *p)
 	//	printf("- Cannot find party %d \n",party_id);
 		return 0;
 	}
-		
+
 	mysql_free_result(sql_res);
-	
+
 	// Load members
-	sprintf(tmp_sql,"SELECT `account_id`, `name`,`base_level`,`last_map`,`online` FROM `%s` WHERE `party_id`='%d'",char_db, party_id);
+	sprintf(tmp_sql,"SELECT `account_id`, `name`,`base_level`,`last_map`,`online` FROM `%s` WHERE `party_id`='%d'",char_db, party_id); // TBR
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (select `party`)- %s\n", mysql_error(&mysql_handle) );
 		return 0;
@@ -196,25 +195,20 @@ int inter_party_fromsql(int party_id,struct party *p)
 	//	printf("- %d members found in party %d \n",i,party_id);
 	}
 	mysql_free_result(sql_res);
-		
-	
+
+
 	printf("Party load success\n");
 	return 0;
-	
+
 }
 
 int inter_party_sql_init(){
 	int i;
-	
+
 	//memory alloc
 	printf("interserver party memory initialize.... (%d byte)\n",sizeof(struct party));
-	party_pt = calloc(sizeof(struct party), 1);
-	
-	sprintf(tmp_sql,"UPDATE `%s` SET `online`='0'", char_db);	
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	
+	party_pt = (struct party*)aCalloc(sizeof(struct party), 1);
+
 	sprintf (tmp_sql , "SELECT count(*) FROM `%s`",party_db);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
@@ -231,18 +225,22 @@ int inter_party_sql_init(){
 		if(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 		}
-		
+
 		sql_res = mysql_store_result(&mysql_handle) ;
-		
+
 		sql_row = mysql_fetch_row(sql_res);
 		party_newid = atoi (sql_row[0])+1;
 		mysql_free_result(sql_res);
 	}
-	
+
 	printf("set party_newid: %d.......\n",party_newid);
-	
+
 	return 0;
 }
+void inter_party_sql_final(){
+	if (party_pt) aFree(party_pt);
+	return;
+}
 
 
 // Search for the party according to its name
@@ -251,8 +249,8 @@ struct party* search_partyname(char *str)
 	struct party *p=NULL;
 	int leader_id = 0;
 	char t_name[24];
-	
-	sprintf(tmp_sql,"SELECT `party_id`, `name`,`exp`,`item`,`leader_id` FROM `%s` WHERE `name`='%s'",party_db, jstrescapecpy(t_name,str));	
+
+	sprintf(tmp_sql,"SELECT `party_id`, `name`,`exp`,`item`,`leader_id` FROM `%s` WHERE `name`='%s'",party_db, jstrescapecpy(t_name,str));
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error (select `party`)- %s\n", mysql_error(&mysql_handle) );
 	}
@@ -295,16 +293,32 @@ struct party* search_partyname(char *str)
 // EXP公平分配できるかチェック
 int party_check_exp_share(struct party *p)
 {
-	int i;
-	int maxlv=0,minlv=0x7fffffff;
-	for(i=0;i<MAX_PARTY;i++){
-		int lv=p->member[i].lv;
-		if( p->member[i].online ){
-			if( lv < minlv ) minlv=lv;
-			if( maxlv < lv ) maxlv=lv;
-		}
-	}
-	return (maxlv==0 || maxlv-minlv<=party_share_level);
+        int i, dudes=0;
+        int pl1=0,pl2=0,pl3=0;
+        int maxlv=0,minlv=0x7fffffff;
+        for(i=0;i<MAX_PARTY;i++){
+                int lv=p->member[i].lv;
+                if (!lv) continue;
+              if( p->member[i].online ){
+                        if( lv < minlv ) minlv=lv;
+                        if( maxlv < lv ) maxlv=lv;
+                        if( lv >= 70 ) dudes+=1000;
+                        dudes++;
+              }
+        }
+        if((dudes/1000 >= 2) && (dudes%1000 == 3) && (!strcmp(p->member[0].map,p->member[1].map)) && (!strcmp(p->member[1].map,p->member[2].map))) {
+                pl1=char_nick2id(p->member[0].name);
+                pl2=char_nick2id(p->member[1].name);
+                pl3=char_nick2id(p->member[2].name);
+                printf("PARTY: group of 3 Id1 %d lv %d name %s Id2 %d lv %d name %s Id3 %d lv %d name %s\n",pl1,p->member[0].lv,p->member[0].name,pl2,p->member[1].lv,p->member[1].name,pl3,p->member[2].lv,p->member[2].name);
+                if (char_married(pl1,pl2) && char_child(pl1,pl3))
+                        return 1;
+                if (char_married(pl1,pl3) && char_child(pl1,pl2))
+                        return 1;
+                if (char_married(pl2,pl3) && char_child(pl2,pl1))
+                        return 1;
+        }
+        return (maxlv==0 || maxlv-minlv<=party_share_level);
 }
 // Is there any member in the party?
 int party_check_empty(struct party *p)
@@ -441,7 +455,7 @@ int mapif_party_broken(int party_id,int flag)
 	return 0;
 }
 // パーティ内発言
-int mapif_party_message(int party_id,int account_id,char *mes,int len)
+int mapif_party_message(int party_id,int account_id,char *mes,int len, int sfd)
 {
 	unsigned char buf[512];
 	WBUFW(buf,0)=0x3827;
@@ -449,7 +463,7 @@ int mapif_party_message(int party_id,int account_id,char *mes,int len)
 	WBUFL(buf,4)=party_id;
 	WBUFL(buf,8)=account_id;
 	memcpy(WBUFP(buf,12),mes,len);
-	mapif_sendall(buf,len+12);
+	mapif_sendallwos(sfd, buf,len+12);
 	return 0;
 }
 
@@ -458,7 +472,7 @@ int mapif_party_message(int party_id,int account_id,char *mes,int len)
 
 
 // Create Party
-int mapif_parse_CreateParty(int fd,int account_id,char *name,char *nick,char *map,int lv)
+int mapif_parse_CreateParty(int fd,int account_id,char *name,char *nick,char *map,int lv, int item, int item2)
 {
 	struct party *p;
 	if( (p=search_partyname(name))!=NULL){
@@ -476,19 +490,24 @@ int mapif_parse_CreateParty(int fd,int account_id,char *name,char *nick,char *ma
 	p->party_id=party_newid++;
 	memcpy(p->name,name,24);
 	p->exp=0;
-	p->item=0;
+	p->item=item;
+	//<item1>アイテム?集方法。0で個人別、1でパ?ティ公有
+	//<item2>アイテム分配方法。0で個人別、1でパ?ティに均等分配
+	//difference between "collection" and "distribution" is...? ^^;
+	p->itemc = 0;
+
 	p->member[0].account_id=account_id;
 	memcpy(p->member[0].name,nick,24);
 	memcpy(p->member[0].map,map,16);
 	p->member[0].leader=1;
 	p->member[0].online=1;
 	p->member[0].lv=lv;
-	
+
 	inter_party_tosql(p->party_id,p);
-	
+
 	mapif_party_created(fd,account_id,p);
 	mapif_party_info(fd,p);
-	
+
 	return 0;
 }
 // パーティ情報要求
@@ -500,7 +519,7 @@ int mapif_parse_PartyInfo(int fd,int party_id)
 		return 0;
 	}
 	inter_party_fromsql(party_id, p);
-	
+
 	if(p->party_id >= 0)
 		mapif_party_info(fd,p);
 	else
@@ -512,23 +531,23 @@ int mapif_parse_PartyAddMember(int fd,int party_id,int account_id,char *nick,cha
 {
 	struct party *p;
 	int i;
-	
+
 	p = party_pt;
 	if(p==NULL){
 		printf("int_party: out of memory !\n");
 		return 0;
 	}
 	inter_party_fromsql(party_id, p);
-	
+
 	if(p->party_id <= 0){
 		mapif_party_memberadded(fd,party_id,account_id,1);
 		return 0;
 	}
-	
+
 	for(i=0;i<MAX_PARTY;i++){
 		if(p->member[i].account_id==0){
 			int flag=0;
-			
+
 			p->member[i].account_id=account_id;
 			memcpy(p->member[i].name,nick,24);
 			memcpy(p->member[i].map,map,16);
@@ -544,7 +563,7 @@ int mapif_parse_PartyAddMember(int fd,int party_id,int account_id,char *nick,cha
 			}
 			if(flag)
 				mapif_party_optionchanged(fd,p,0,0);
-				
+
 			inter_party_tosql(party_id, p);
 			return 0;
 		}
@@ -558,25 +577,25 @@ int mapif_parse_PartyChangeOption(int fd,int party_id,int account_id,int exp,int
 {
 	struct party *p;
 	int flag=0;
-	
+
 	p = party_pt;
 	if(p==NULL){
 		printf("int_party: out of memory !\n");
 		return 0;
 	}
-	
+
 	inter_party_fromsql(party_id, p);
-	
+
 	if(p->party_id <= 0){
 		return 0;
 	}
-	
+
 	p->exp=exp;
 	if( exp>0 && !party_check_exp_share(p) ){
 		flag|=0x01;
 		p->exp=0;
 	}
-	
+
 	p->item=item;
 
 	mapif_party_optionchanged(fd,p,account_id,flag);
@@ -592,27 +611,27 @@ int mapif_parse_PartyLeave(int fd,int party_id,int account_id)
 		printf("int_party: out of memory !\n");
 		return 0;
 	}
-	
+
 	inter_party_fromsql(party_id, p);
-	
+
 	if(p->party_id >= 0){
 		int i,j;
 		for(i=0;i<MAX_PARTY;i++){
-			
+
 			if(p->member[i].account_id==account_id){
 				//printf("p->member[i].account_id = %d , account_id = %d \n",p->member[i].account_id,account_id);
 				mapif_party_leaved(party_id,account_id,p->member[i].name);
-				
-				
-				
+
+
+
 				// Update char information, does the name need encoding?
-				sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='0', `online`='1' WHERE `party_id`='%d' AND `name`='%s'", 
+				sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d' AND `name`='%s'",
 					char_db, party_id, jstrescapecpy(t_member,p->member[i].name));
 				if(mysql_query(&mysql_handle, tmp_sql) ) {
 					printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle) );
 				}
-//				printf("Delete member %s from MySQL \n", p->member[i].name);	
-						
+//				printf("Delete member %s from MySQL \n", p->member[i].name);
+
 				if (p->member[i].leader==1){
 					for(j=0;j<MAX_PARTY;j++)
 					{
@@ -620,12 +639,12 @@ int mapif_parse_PartyLeave(int fd,int party_id,int account_id)
 						if(p->member[j].account_id>0&&j!=i){
 							mapif_party_leaved(party_id,p->member[j].account_id,p->member[j].name);
 							// Update char information, does the name need encoding?
-							sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='0', `online`='1' WHERE `party_id`='%d' AND `name`='%s'", 
+							sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d' AND `name`='%s'",
 								char_db, party_id, jstrescapecpy(t_member,p->member[i].name));
 							if(mysql_query(&mysql_handle, tmp_sql) ) {
 								printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle) );
 							}
-//							printf("Delete member %s from MySQL \n", p->member[j].name);	
+//							printf("Delete member %s from MySQL \n", p->member[j].name);
 						}
 					}
 					// Delete the party, if has no member.
@@ -634,9 +653,9 @@ int mapif_parse_PartyLeave(int fd,int party_id,int account_id)
 						printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 					}
 //					printf("Leader breaks party %d \n",party_id);
-					memset(p, 0, sizeof(struct party));					
+					memset(p, 0, sizeof(struct party));
 				}else memset(&p->member[i],0,sizeof(struct party_member));
-				
+
 				break;
 
 			}
@@ -648,8 +667,8 @@ int mapif_parse_PartyLeave(int fd,int party_id,int account_id)
 			inter_party_tosql(party_id,p);	// Break the party if no member
 		*/
 	}else{
-		sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d' AND `account_id`='%d' AND `online`='1'", 
-			char_db, party_id, account_id);	
+		sprintf(tmp_sql,"UPDATE `%s` SET `party_id`='0' WHERE `party_id`='%d' AND `account_id`='%d' AND `online`='1'",
+			char_db, party_id, account_id);
 		if(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle) );
 		}
@@ -661,21 +680,21 @@ int mapif_parse_PartyChangeMap(int fd,int party_id,int account_id,char *map,int
 {
 	struct party *p;
 	int i;
-	
+
 	p = party_pt;
 	if(p==NULL){
 		printf("int_party: out of memory !\n");
 		return 0;
 	}
 	inter_party_fromsql(party_id, p);
-	
+
 	if(p->party_id <= 0){
 		return 0;
 	}
 	for(i=0;i<MAX_PARTY;i++){
 		if(p->member[i].account_id==account_id){
 			int flag=0;
-			
+
 			memcpy(p->member[i].map,map,16);
 			p->member[i].online=online;
 			p->member[i].lv=lv;
@@ -697,27 +716,27 @@ int mapif_parse_PartyChangeMap(int fd,int party_id,int account_id,char *map,int
 int mapif_parse_BreakParty(int fd,int party_id)
 {
 	struct party *p;
-	
+
 	p = party_pt;
 	if(p==NULL){
 		printf("int_party: out of memory !\n");
 		return 0;
 	}
-	
+
 	inter_party_fromsql(party_id, p);
-	
+
 	if(p->party_id <= 0){
 		return 0;
 	}
 	inter_party_tosql(party_id,p);
-	
+
 	mapif_party_broken(fd,party_id);
 	return 0;
 }
 // パーティメッセージ送信
 int mapif_parse_PartyMessage(int fd,int party_id,int account_id,char *mes,int len)
 {
-	return mapif_party_message(party_id,account_id,mes,len);
+	return mapif_party_message(party_id,account_id,mes,len, fd);
 }
 // パーティチェック要求
 int mapif_parse_PartyCheck(int fd,int party_id,int account_id,char *nick)
@@ -733,15 +752,15 @@ int mapif_parse_PartyCheck(int fd,int party_id,int account_id,char *nick)
 int inter_party_parse_frommap(int fd)
 {
 	switch(RFIFOW(fd,0)){
-	case 0x3020: mapif_parse_CreateParty(fd,RFIFOL(fd,2),RFIFOP(fd,6),RFIFOP(fd,30),RFIFOP(fd,54),RFIFOW(fd,70)); break;
+	case 0x3020: mapif_parse_CreateParty(fd,RFIFOL(fd,2),(char*)RFIFOP(fd,6),(char*)RFIFOP(fd,30),(char*)RFIFOP(fd,54),RFIFOW(fd,70), RFIFOB(fd,72), RFIFOB(fd,73)); break;
 	case 0x3021: mapif_parse_PartyInfo(fd,RFIFOL(fd,2)); break;
-	case 0x3022: mapif_parse_PartyAddMember(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOP(fd,10),RFIFOP(fd,34),RFIFOW(fd,50)); break;
+	case 0x3022: mapif_parse_PartyAddMember(fd,RFIFOL(fd,2),RFIFOL(fd,6),(char*)RFIFOP(fd,10),(char*)RFIFOP(fd,34),RFIFOW(fd,50)); break;
 	case 0x3023: mapif_parse_PartyChangeOption(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOW(fd,10),RFIFOW(fd,12)); break;
 	case 0x3024: mapif_parse_PartyLeave(fd,RFIFOL(fd,2),RFIFOL(fd,6)); break;
-	case 0x3025: mapif_parse_PartyChangeMap(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOP(fd,10),RFIFOB(fd,26),RFIFOW(fd,27)); break;
+	case 0x3025: mapif_parse_PartyChangeMap(fd,RFIFOL(fd,2),RFIFOL(fd,6),(char*)RFIFOP(fd,10),RFIFOB(fd,26),RFIFOW(fd,27)); break;
 	case 0x3026: mapif_parse_BreakParty(fd,RFIFOL(fd,2)); break;
-	case 0x3027: mapif_parse_PartyMessage(fd,RFIFOL(fd,4),RFIFOL(fd,8),RFIFOP(fd,12),RFIFOW(fd,2)-12); break;
-	case 0x3028: mapif_parse_PartyCheck(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOP(fd,10)); break;
+	case 0x3027: mapif_parse_PartyMessage(fd,RFIFOL(fd,4),RFIFOL(fd,8),(char*)RFIFOP(fd,12),RFIFOW(fd,2)-12); break;
+	case 0x3028: mapif_parse_PartyCheck(fd,RFIFOL(fd,2),RFIFOL(fd,6),(char*)RFIFOP(fd,10)); break;
 	default:
 		return 0;
 	}
diff --git a/src/char_sql/int_party.h b/src/char_sql/int_party.h
index 04f71c881..686d70b04 100644
--- a/src/char_sql/int_party.h
+++ b/src/char_sql/int_party.h
@@ -3,6 +3,7 @@
 
 int inter_party_parse_frommap(int fd);
 int inter_party_sql_init();
+void inter_party_sql_final();
 int inter_party_leave(int party_id,int account_id);
 
 #endif
diff --git a/src/char_sql/int_pet.c b/src/char_sql/int_pet.c
index 7f2ed2a7c..ea1fed67d 100644
--- a/src/char_sql/int_pet.c
+++ b/src/char_sql/int_pet.c
@@ -2,13 +2,13 @@
 // original code from athena
 // SQL conversion by Jioh L. Jung
 //
-#include "char.h"
-#include "strlib.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "char.h"
+#include "../common/strlib.h"
+
 struct s_pet *pet_pt;
 static int pet_newid = 100;
 
@@ -18,11 +18,11 @@ static int pet_newid = 100;
 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 t_name[100];
-	
+
 	printf("request save pet: %d.......\n",pet_id);
-	
+
 	jstrescapecpy(t_name, p->name);
-	
+
 	if(p->hungry < 0)
 		p->hungry = 0;
 	else if(p->hungry > 100)
@@ -36,32 +36,32 @@ int inter_pet_tosql(int pet_id, struct s_pet *p) {
 			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 	}
 	sql_res = mysql_store_result(&mysql_handle) ;
-	if (sql_res!=NULL && mysql_num_rows(sql_res)>0) 
+	if (sql_res!=NULL && mysql_num_rows(sql_res)>0)
 		//row reside -> updating
 		sprintf(tmp_sql, "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, t_name, p->account_id, p->char_id, p->level, p->egg_id,
+			pet_db, p->class_, t_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);
 	else //no row -> insert
 		sprintf(tmp_sql,"INSERT INTO `%s` (`pet_id`, `class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate`) VALUES ('%d', '%d', '%s', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
-			pet_db, pet_id, p->class, t_name, p->account_id, p->char_id, p->level, p->egg_id,
+			pet_db, pet_id, p->class_, t_name, p->account_id, p->char_id, p->level, p->egg_id,
 			p->equip, p->intimate, p->hungry, p->rename_flag, p->incuvate);
 	mysql_free_result(sql_res) ; //resource free
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (inset/update `pet`)- %s\n", mysql_error(&mysql_handle) );
 	}
-	
+
 	printf("pet save success.......\n");
 	return 0;
 }
 
 int inter_pet_fromsql(int pet_id, struct s_pet *p){
-	
+
 	printf("request load pet: %d.......\n",pet_id);
-	
+
 	memset(p, 0, sizeof(struct s_pet));
-	
+
 	//`pet` (`pet_id`, `class`,`name`,`account_id`,`char_id`,`level`,`egg_id`,`equip`,`intimate`,`hungry`,`rename_flag`,`incuvate`)
-	
+
 	sprintf(tmp_sql,"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(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error (select `pet`)- %s\n", mysql_error(&mysql_handle) );
@@ -70,9 +70,9 @@ int inter_pet_fromsql(int pet_id, struct s_pet *p){
 	sql_res = mysql_store_result(&mysql_handle) ;
 	if (sql_res!=NULL && mysql_num_rows(sql_res)>0) {
 		sql_row = mysql_fetch_row(sql_res);
-		
+
 		p->pet_id = pet_id;
-		p->class = atoi(sql_row[1]);
+		p->class_ = atoi(sql_row[1]);
 		memcpy(p->name, sql_row[2],24);
 		p->account_id = atoi(sql_row[3]);
 		p->char_id = atoi(sql_row[4]);
@@ -92,20 +92,20 @@ int inter_pet_fromsql(int pet_id, struct s_pet *p){
 		p->intimate = 0;
 	else if(p->intimate > 1000)
 		p->intimate = 1000;
-	
+
 	mysql_free_result(sql_res);
-	
+
 	printf("pet load success.......\n");
 	return 0;
 }
 //----------------------------------------------
-	
+
 int inter_pet_sql_init(){
 	int i;
-		
+
 	//memory alloc
 	printf("interserver pet memory initialize.... (%d byte)\n",sizeof(struct s_pet));
-	pet_pt = calloc(sizeof(struct s_pet), 1);
+	pet_pt = (struct s_pet*)aCalloc(sizeof(struct s_pet), 1);
 
 	sprintf (tmp_sql , "SELECT count(*) FROM `%s`", pet_db);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
@@ -124,22 +124,26 @@ int inter_pet_sql_init(){
 		if(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 		}
-		
+
 		sql_res = mysql_store_result(&mysql_handle) ;
-		
+
 		sql_row = mysql_fetch_row(sql_res);
 		pet_newid = atoi (sql_row[0])+1; //should SET MAX existing PET ID + 1 [Lupus]
 		mysql_free_result(sql_res);
 	}
-	
+
 	printf("set pet_newid: %d.......\n",pet_newid);
-	
+
 	return 0;
 }
+void inter_pet_sql_final(){
+	if (pet_pt) aFree(pet_pt);
+	return;
+}
 //----------------------------------
 int inter_pet_delete(int pet_id){
 	printf("request delete pet: %d.......\n",pet_id);
-	
+
 	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `pet_id`='%d'",pet_db, pet_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
@@ -215,7 +219,7 @@ int mapif_create_pet(int fd, int account_id, int char_id, short pet_class, short
 		pet_pt->account_id = account_id;
 		pet_pt->char_id = char_id;
 	}
-	pet_pt->class = pet_class;
+	pet_pt->class_ = pet_class;
 	pet_pt->level = pet_lv;
 	pet_pt->egg_id = pet_egg_id;
 	pet_pt->equip = pet_equip;
@@ -232,19 +236,19 @@ int mapif_create_pet(int fd, int account_id, int char_id, short pet_class, short
 		pet_pt->intimate = 0;
 	else if(pet_pt->intimate > 1000)
 		pet_pt->intimate = 1000;
-	
+
 	inter_pet_tosql(pet_pt->pet_id,pet_pt);
-	
+
 	mapif_pet_created(fd, account_id, pet_pt);
-	
+
 	return 0;
 }
 
 int mapif_load_pet(int fd, int account_id, int char_id, int pet_id){
 	memset(pet_pt, 0, sizeof(struct s_pet));
-	
+
 	inter_pet_fromsql(pet_id, pet_pt);
-	
+
 	if(pet_pt!=NULL) {
 		if(pet_pt->incuvate == 1) {
 			pet_pt->account_id = pet_pt->char_id = 0;
@@ -267,7 +271,7 @@ int mapif_save_pet(int fd, int account_id, struct s_pet *data) {
 	if(sizeof(struct s_pet)!=len-8) {
 		printf("inter pet: data size error %d %d\n", sizeof(struct s_pet), len-8);
 	}
-	
+
 	else{
 		if(data->hungry < 0)
 			data->hungry = 0;
@@ -292,7 +296,7 @@ int mapif_delete_pet(int fd, int pet_id){
 
 int mapif_parse_CreatePet(int fd){
 	mapif_create_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOW(fd, 10), RFIFOW(fd, 12), RFIFOW(fd, 14), RFIFOW(fd, 16), RFIFOL(fd, 18),
-		RFIFOL(fd, 20), RFIFOB(fd, 22), RFIFOB(fd, 23), RFIFOP(fd, 24));
+		RFIFOL(fd, 20), RFIFOB(fd, 22), RFIFOB(fd, 23), (char*)RFIFOP(fd, 24));
 	return 0;
 }
 
diff --git a/src/char_sql/int_pet.h b/src/char_sql/int_pet.h
index b6e3f1bbf..39f127262 100644
--- a/src/char_sql/int_pet.h
+++ b/src/char_sql/int_pet.h
@@ -2,6 +2,7 @@
 #define _INT_PET_H_
 
 int inter_pet_init();
+void inter_pet_sql_final();
 int inter_pet_save();
 int inter_pet_delete(int pet_id);
 
diff --git a/src/char_sql/int_storage.c b/src/char_sql/int_storage.c
index 18100e02a..c13c782a6 100644
--- a/src/char_sql/int_storage.c
+++ b/src/char_sql/int_storage.c
@@ -2,62 +2,46 @@
 // original code from athena
 // SQL conversion by Jioh L. Jung
 //
-#include "char.h"
-#include "itemdb.h"
 #include <string.h>
 #include <stdlib.h>
 
+#include "char.h"
+#include "itemdb.h"
+
 #define STORAGE_MEMINC	16
 
 // reset by inter_config_read()
 struct storage *storage_pt=NULL;
 struct guild_storage *guild_storage_pt=NULL;
 
-
 #define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
 
 // storage data -> DB conversion
 int storage_tosql(int account_id,struct storage *p){
 	int i;
-	int eqcount=1;
-	int noteqcount=1;
-	struct itemtemp mapitem;
+//	int eqcount=1;
+//	int noteqcount=1;
+	int count=0;
+	struct itemtmp mapitem[MAX_GUILD_STORAGE];
 	for(i=0;i<MAX_STORAGE;i++){
-		if(p->storage[i].nameid>0){
-			if(itemdb_isequip(p->storage[i].nameid)==1){				
-				mapitem.equip[eqcount].flag=0;
-				mapitem.equip[eqcount].id = p->storage[i].id;
-				mapitem.equip[eqcount].nameid=p->storage[i].nameid;
-				mapitem.equip[eqcount].amount = p->storage[i].amount;
-				mapitem.equip[eqcount].equip = p->storage[i].equip;
-				mapitem.equip[eqcount].identify = p->storage[i].identify;
-				mapitem.equip[eqcount].refine = p->storage[i].refine;
-				mapitem.equip[eqcount].attribute = p->storage[i].attribute;
-				mapitem.equip[eqcount].card[0] = p->storage[i].card[0];
-				mapitem.equip[eqcount].card[1] = p->storage[i].card[1];
-				mapitem.equip[eqcount].card[2] = p->storage[i].card[2];
-				mapitem.equip[eqcount].card[3] = p->storage[i].card[3];
-				eqcount++;
-			}
-			else if(itemdb_isequip(p->storage[i].nameid)==0){				
-				mapitem.notequip[noteqcount].flag=0;
-				mapitem.notequip[noteqcount].id = p->storage[i].id;
-				mapitem.notequip[noteqcount].nameid=p->storage[i].nameid;
-				mapitem.notequip[noteqcount].amount = p->storage[i].amount;
-				mapitem.notequip[noteqcount].equip = p->storage[i].equip;
-				mapitem.notequip[noteqcount].identify = p->storage[i].identify;
-				mapitem.notequip[noteqcount].refine = p->storage[i].refine;
-				mapitem.notequip[noteqcount].attribute = p->storage[i].attribute;
-				mapitem.notequip[noteqcount].card[0] = p->storage[i].card[0];
-				mapitem.notequip[noteqcount].card[1] = p->storage[i].card[1];
-				mapitem.notequip[noteqcount].card[2] = p->storage[i].card[2];
-				mapitem.notequip[noteqcount].card[3] = p->storage[i].card[3];
-				noteqcount++;
-			}
+		if(p->storage_[i].nameid>0){
+			mapitem[count].flag=0;
+			mapitem[count].id = p->storage_[i].id;
+			mapitem[count].nameid=p->storage_[i].nameid;
+			mapitem[count].amount = p->storage_[i].amount;
+			mapitem[count].equip = p->storage_[i].equip;
+			mapitem[count].identify = p->storage_[i].identify;
+			mapitem[count].refine = p->storage_[i].refine;
+			mapitem[count].attribute = p->storage_[i].attribute;
+			mapitem[count].card[0] = p->storage_[i].card[0];
+			mapitem[count].card[1] = p->storage_[i].card[1];
+			mapitem[count].card[2] = p->storage_[i].card[2];
+			mapitem[count].card[3] = p->storage_[i].card[3];
+			count++;
 		}
 	}
 
-	memitemdata_to_sql(mapitem, eqcount, noteqcount, account_id,TABLE_STORAGE);
+	memitemdata_to_sql(mapitem, count, account_id,TABLE_STORAGE);
 
 	//printf ("storage dump to DB - id: %d (total: %d)\n", account_id, j);
 	return 0;
@@ -66,36 +50,36 @@ int storage_tosql(int account_id,struct storage *p){
 // DB -> storage data conversion
 int storage_fromsql(int account_id, struct storage *p){
 	int i=0;
-	
+
 	memset(p,0,sizeof(struct storage)); //clean up memory
 	p->storage_amount = 0;
 	p->account_id = account_id;
-	
+
 	// storage {`account_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`attribute`/`card0`/`card1`/`card2`/`card3`}
 	sprintf(tmp_sql,"SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`card0`,`card1`,`card2`,`card3` FROM `%s` WHERE `account_id`='%d'",storage_db, account_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 	}
 	sql_res = mysql_store_result(&mysql_handle) ;
-	
+
 	if (sql_res) {
 		while((sql_row = mysql_fetch_row(sql_res))) {	//start to fetch
-			p->storage[i].id= atoi(sql_row[0]);
-			p->storage[i].nameid= atoi(sql_row[1]);
-			p->storage[i].amount= atoi(sql_row[2]);
-			p->storage[i].equip= atoi(sql_row[3]);
-			p->storage[i].identify= atoi(sql_row[4]);
-			p->storage[i].refine= atoi(sql_row[5]);
-			p->storage[i].attribute= atoi(sql_row[6]);
-			p->storage[i].card[0]= atoi(sql_row[7]);
-			p->storage[i].card[1]= atoi(sql_row[8]);
-			p->storage[i].card[2]= atoi(sql_row[9]);
-			p->storage[i].card[3]= atoi(sql_row[10]);
+			p->storage_[i].id= atoi(sql_row[0]);
+			p->storage_[i].nameid= atoi(sql_row[1]);
+			p->storage_[i].amount= atoi(sql_row[2]);
+			p->storage_[i].equip= atoi(sql_row[3]);
+			p->storage_[i].identify= atoi(sql_row[4]);
+			p->storage_[i].refine= atoi(sql_row[5]);
+			p->storage_[i].attribute= atoi(sql_row[6]);
+			p->storage_[i].card[0]= atoi(sql_row[7]);
+			p->storage_[i].card[1]= atoi(sql_row[8]);
+			p->storage_[i].card[2]= atoi(sql_row[9]);
+			p->storage_[i].card[3]= atoi(sql_row[10]);
 			p->storage_amount = ++i;
 		}
 		mysql_free_result(sql_res);
 	}
-	
+
 	printf ("storage load complete from DB - id: %d (total: %d)\n", account_id, p->storage_amount);
 	return 1;
 }
@@ -103,45 +87,29 @@ int storage_fromsql(int account_id, struct storage *p){
 // Save guild_storage data to sql
 int guild_storage_tosql(int guild_id, struct guild_storage *p){
 	int i;
-	int eqcount=1;
-	int noteqcount=1;
-	struct itemtemp mapitem;
+//	int eqcount=1;
+//	int noteqcount=1;
+	int count=0;
+	struct itemtmp mapitem[MAX_GUILD_STORAGE];
 	for(i=0;i<MAX_GUILD_STORAGE;i++){
-		if(p->storage[i].nameid>0){
-			if(itemdb_isequip(p->storage[i].nameid)==1){				
-				mapitem.equip[eqcount].flag=0;
-				mapitem.equip[eqcount].id = p->storage[i].id;
-				mapitem.equip[eqcount].nameid=p->storage[i].nameid;
-				mapitem.equip[eqcount].amount = p->storage[i].amount;
-				mapitem.equip[eqcount].equip = p->storage[i].equip;
-				mapitem.equip[eqcount].identify = p->storage[i].identify;
-				mapitem.equip[eqcount].refine = p->storage[i].refine;
-				mapitem.equip[eqcount].attribute = p->storage[i].attribute;
-				mapitem.equip[eqcount].card[0] = p->storage[i].card[0];
-				mapitem.equip[eqcount].card[1] = p->storage[i].card[1];
-				mapitem.equip[eqcount].card[2] = p->storage[i].card[2];
-				mapitem.equip[eqcount].card[3] = p->storage[i].card[3];
-				eqcount++;
-			}
-			else if(itemdb_isequip(p->storage[i].nameid)==0){				
-				mapitem.notequip[noteqcount].flag=0;
-				mapitem.notequip[noteqcount].id = p->storage[i].id;
-				mapitem.notequip[noteqcount].nameid=p->storage[i].nameid;
-				mapitem.notequip[noteqcount].amount = p->storage[i].amount;
-				mapitem.notequip[noteqcount].equip = p->storage[i].equip;
-				mapitem.notequip[noteqcount].identify = p->storage[i].identify;
-				mapitem.notequip[noteqcount].refine = p->storage[i].refine;
-				mapitem.notequip[noteqcount].attribute = p->storage[i].attribute;
-				mapitem.notequip[noteqcount].card[0] = p->storage[i].card[0];
-				mapitem.notequip[noteqcount].card[1] = p->storage[i].card[1];
-				mapitem.notequip[noteqcount].card[2] = p->storage[i].card[2];
-				mapitem.notequip[noteqcount].card[3] = p->storage[i].card[3];
-				noteqcount++;
-			}
+		if(p->storage_[i].nameid>0){
+			mapitem[count].flag=0;
+			mapitem[count].id = p->storage_[i].id;
+			mapitem[count].nameid=p->storage_[i].nameid;
+			mapitem[count].amount = p->storage_[i].amount;
+			mapitem[count].equip = p->storage_[i].equip;
+			mapitem[count].identify = p->storage_[i].identify;
+			mapitem[count].refine = p->storage_[i].refine;
+			mapitem[count].attribute = p->storage_[i].attribute;
+			mapitem[count].card[0] = p->storage_[i].card[0];
+			mapitem[count].card[1] = p->storage_[i].card[1];
+			mapitem[count].card[2] = p->storage_[i].card[2];
+			mapitem[count].card[3] = p->storage_[i].card[3];
+			count++;
 		}
 	}
 
-	memitemdata_to_sql(mapitem, eqcount, noteqcount, guild_id,TABLE_GUILD_STORAGE);
+	memitemdata_to_sql(mapitem, count, guild_id,TABLE_GUILD_STORAGE);
 
 	printf ("guild storage save to DB - id: %d (total: %d)\n", guild_id,i);
 	return 0;
@@ -163,21 +131,23 @@ int guild_storage_fromsql(int guild_id, struct guild_storage *p){
 		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 	}
 	sql_res = mysql_store_result(&mysql_handle) ;
-	
+
 	if (sql_res) {
 		while((sql_row = mysql_fetch_row(sql_res))) {	//start to fetch
-			p->storage[i].id= atoi(sql_row[0]);
-			p->storage[i].nameid= atoi(sql_row[1]);
-			p->storage[i].amount= atoi(sql_row[2]);
-			p->storage[i].equip= atoi(sql_row[3]);
-			p->storage[i].identify= atoi(sql_row[4]);
-			p->storage[i].refine= atoi(sql_row[5]);
-			p->storage[i].attribute= atoi(sql_row[6]);
-			p->storage[i].card[0]= atoi(sql_row[7]);
-			p->storage[i].card[1]= atoi(sql_row[8]);
-			p->storage[i].card[2]= atoi(sql_row[9]);
-			p->storage[i].card[3]= atoi(sql_row[10]);
+			p->storage_[i].id= atoi(sql_row[0]);
+			p->storage_[i].nameid= atoi(sql_row[1]);
+			p->storage_[i].amount= atoi(sql_row[2]);
+			p->storage_[i].equip= atoi(sql_row[3]);
+			p->storage_[i].identify= atoi(sql_row[4]);
+			p->storage_[i].refine= atoi(sql_row[5]);
+			p->storage_[i].attribute= atoi(sql_row[6]);
+			p->storage_[i].card[0]= atoi(sql_row[7]);
+			p->storage_[i].card[1]= atoi(sql_row[8]);
+			p->storage_[i].card[2]= atoi(sql_row[9]);
+			p->storage_[i].card[3]= atoi(sql_row[10]);
 			p->storage_amount = ++i;
+			if (i >= MAX_GUILD_STORAGE)
+				break;
 		}
 		mysql_free_result(sql_res);
 	}
@@ -188,17 +158,24 @@ int guild_storage_fromsql(int guild_id, struct guild_storage *p){
 //---------------------------------------------------------
 // storage data initialize
 int inter_storage_sql_init(){
-	
+
 	//memory alloc
 	printf("interserver storage memory initialize....(%d byte)\n",sizeof(struct storage));
-	storage_pt=calloc(sizeof(struct storage), 1);
-	guild_storage_pt=calloc(sizeof(struct guild_storage), 1);
+	storage_pt = (struct storage*)aCalloc(sizeof(struct storage), 1);
+	guild_storage_pt = (struct guild_storage*)aCalloc(sizeof(struct guild_storage), 1);
 	memset(storage_pt,0,sizeof(struct storage));
 	memset(guild_storage_pt,0,sizeof(struct guild_storage));
-	
+
 	return 1;
 }
-// 倉庫データ削除
+// storage data finalize
+void inter_storage_sql_final()
+{
+	if (storage_pt) aFree(storage_pt);
+	if (guild_storage_pt) aFree(guild_storage_pt);	 
+	return;
+}
+// q?f[^?
 int inter_storage_delete(int account_id)
 {
 		sprintf(tmp_sql, "DELETE FROM `%s` WHERE `account_id`='%d'",storage_db, account_id);
@@ -243,7 +220,7 @@ int mapif_load_guild_storage(int fd,int account_id,int guild_id)
 {
 	int guild_exist=0;
 	WFIFOW(fd,0)=0x3818;
-	
+
 	// Check if guild exists, I may write a function for this later, coz I use it several times.
 	//printf("- Check if guild %d exists\n",g->guild_id);
 	sprintf(tmp_sql, "SELECT count(*) FROM `%s` WHERE `guild_id`='%d'",guild_db, guild_id);
@@ -257,7 +234,7 @@ int mapif_load_guild_storage(int fd,int account_id,int guild_id)
 		//printf("- Check if guild %d exists : %s\n",g->guild_id,((guild_exist==0)?"No":"Yes"));
 	}
 	mysql_free_result(sql_res) ; //resource free
-	
+
 	if(guild_exist==1) {
 		guild_storage_fromsql(guild_id,guild_storage_pt);
 		WFIFOW(fd,2)=sizeof(struct guild_storage)+12;
@@ -296,7 +273,7 @@ int mapif_parse_LoadStorage(int fd){
 int mapif_parse_SaveStorage(int fd){
 	int account_id=RFIFOL(fd,4);
 	int len=RFIFOW(fd,2);
-	
+
 	if(sizeof(struct storage)!=len-8){
 		printf("inter storage: data size error %d %d\n",sizeof(struct storage),len-8);
 	}else{
@@ -335,7 +312,7 @@ int mapif_parse_SaveGuildStorage(int fd)
 			//printf("- Check if guild %d exists : %s\n",g->guild_id,((guild_exist==0)?"No":"Yes"));
 		}
 		mysql_free_result(sql_res) ; //resource free
-		
+
 		if(guild_exist==1) {
 			memcpy(guild_storage_pt,RFIFOP(fd,12),sizeof(struct guild_storage));
 			guild_storage_tosql(guild_id,guild_storage_pt);
diff --git a/src/char_sql/int_storage.h b/src/char_sql/int_storage.h
index f9f37db3e..5541d1ed7 100644
--- a/src/char_sql/int_storage.h
+++ b/src/char_sql/int_storage.h
@@ -2,6 +2,7 @@
 #define _INT_STORAGE_H_
 
 int inter_storage_sql_init();
+void inter_storage_sql_final();
 int inter_storage_delete(int account_id);
 int inter_guild_storage_delete(int guild_id);
 
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index b50afb9d7..83fcc967f 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 #include "char.h"
-#include "strlib.h"
+#include "../common/strlib.h"
 #include "inter.h"
 #include "int_party.h"
 #include "int_guild.h"
@@ -15,8 +15,6 @@
 #include "int_pet.h"
 #include "lock.h"
 
-#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
-
 #define WISDATA_TTL		(60*1000)	// Wisデータの生存時間(60秒)
 #define WISDELLIST_MAX	256			// Wisデータ削除リストの要素数
 
@@ -36,6 +34,11 @@ MYSQL_ROW	sql_row ;
 int sql_fields, sql_cnt;
 char tmp_sql[65535];
 
+MYSQL lmysql_handle;
+char tmp_lsql[65535];
+MYSQL_RES* 	lsql_res ;
+MYSQL_ROW	lsql_row ;
+
 int char_server_port = 3306;
 char char_server_ip[32] = "127.0.0.1";
 char char_server_id[32] = "ragnarok";
@@ -64,7 +67,7 @@ int inter_send_packet_length[]={
 int inter_recv_packet_length[]={
 	-1,-1, 7, 0, -1, 6, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,
 	 6,-1, 0, 0,  0, 0, 0, 0, 10,-1, 0, 0,  0, 0,  0, 0,
-	72, 6,52,14, 10,29, 6,-1, 34, 0, 0, 0,  0, 0,  0, 0,
+	74, 6,52,14, 10,29, 6,-1, 34, 0, 0, 0,  0, 0,  0, 0,
 	-1, 6,-1, 0, 55,19, 6,-1, 14,-1,-1,-1, 14,19,186,-1,
 	 5, 9, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,
 	 0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,
@@ -84,20 +87,20 @@ static int wis_dellist[WISDELLIST_MAX], wis_delnum;
 //--------------------------------------------------------
 // Save account_reg to sql (type=2)
 int inter_accreg_tosql(int account_id,struct accreg *reg){
-	
+
 	int j;
 	char temp_str[32];
 	if (account_id<=0) return 0;
 	reg->account_id=account_id;
-	
+
 	//`global_reg_value` (`type`, `account_id`, `char_id`, `str`, `value`)
 	sprintf(tmp_sql,"DELETE FROM `%s` WHERE `type`=2 AND `account_id`='%d'",reg_db, account_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (delete `global_reg_value`)- %s\n", mysql_error(&mysql_handle) );
 	}
-	
+
 	if (reg->reg_num<=0) return 0;
-	
+
 	for(j=0;j<reg->reg_num;j++){
 		if(reg->reg[j].str != NULL){
 			sprintf(tmp_sql,"INSERT INTO `%s` (`type`, `account_id`, `str`, `value`) VALUES (2,'%d', '%s','%d')",
@@ -117,7 +120,7 @@ int inter_accreg_fromsql(int account_id,struct accreg *reg)
 	if (reg==NULL) return 0;
 	memset(reg, 0, sizeof(struct accreg));
 	reg->account_id=account_id;
-	
+
 	//`global_reg_value` (`type`, `account_id`, `char_id`, `str`, `value`)
 	sprintf (tmp_sql, "SELECT `str`, `value` FROM `%s` WHERE `type`=2 AND `account_id`='%d'",reg_db, reg->account_id);
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
@@ -126,7 +129,7 @@ int inter_accreg_fromsql(int account_id,struct accreg *reg)
 	sql_res = mysql_store_result(&mysql_handle);
 
 	if (sql_res) {
-		for(j=0;(sql_row = mysql_fetch_row(sql_res));j++){	
+		for(j=0;(sql_row = mysql_fetch_row(sql_res));j++){
 			memcpy(reg->reg[j].str, sql_row[0],32);
 			reg->reg[j].value = atoi(sql_row[1]);
 		}
@@ -141,7 +144,7 @@ int inter_accreg_sql_init()
 {
 	CREATE(accreg_pt, struct accreg, 1);
 	return 0;
-	
+
 }
 
 /*==========================================
@@ -187,7 +190,7 @@ int inter_config_read(const char *cfgName) {
 		}
 		//Logins information to be read from the inter_athena.conf
 		//for character deletion (checks email in the loginDB)
-		
+
 		else if(strcmpi(w1,"login_server_ip")==0){
 			strcpy(login_server_ip, w2);
 			printf ("set login_server_ip : %s\n",w2);
@@ -223,7 +226,7 @@ int inter_config_read(const char *cfgName) {
 		}
 	}
 	fclose(fp);
-	
+
 	printf ("success reading interserver configuration\n");
 
 	return 0;
@@ -241,7 +244,7 @@ int inter_log(char *fmt,...)
 	sprintf(tmp_sql,"INSERT INTO `%s` (`time`, `log`) VALUES (NOW(),  '%s')",interlog_db, jstrescapecpy(temp_str,str));
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error (insert `interlog`)- %s\n", mysql_error(&mysql_handle) );
-	}	
+	}
 
 	va_end(ap);
 	return 0;
@@ -252,37 +255,67 @@ int inter_log(char *fmt,...)
 int inter_init(const char *file)
 {
 	//int i;
-	
+
 	printf ("interserver initialize...\n");
 	inter_config_read(file);
-	
+
 	//DB connection initialized
 	mysql_init(&mysql_handle);
-	printf("Connect to DB server....\n");
+	printf("Connect Character DB server.... (Character Server)\n");
 	if(!mysql_real_connect(&mysql_handle, char_server_ip, char_server_id, char_server_pw,
-		char_server_db ,char_server_port, (char *)NULL, CLIENT_MULTI_STATEMENTS)) {
+		char_server_db ,char_server_port, (char *)NULL, 0)) {
 			//pointer check
 			printf("%s\n",mysql_error(&mysql_handle));
 			exit(1);
 	}
 	else {
-		printf ("Connect Success!\n");
+		printf ("Connect Success! (Character Server)\n");
+	}
+
+	mysql_init(&lmysql_handle);
+	printf("Connect Character DB server.... (login server)\n");
+	if(!mysql_real_connect(&lmysql_handle, login_server_ip, login_server_id, login_server_pw,
+		login_server_db ,login_server_port, (char *)NULL, 0)) {
+			//pointer check
+			printf("%s\n",mysql_error(&lmysql_handle));
+			exit(1);
+	}else {
+		printf ("Connect Success! (Login Server)");
 	}
-	
 	wis_db = numdb_init();
 	inter_guild_sql_init();
 	inter_storage_sql_init();
 	inter_party_sql_init();
-	
+
 	inter_pet_sql_init();
 	inter_accreg_sql_init();
 
+	atexit(inter_final);
+
 	//printf ("interserver timer initializing : %d sec...\n",autosave_interval);
 	//i=add_timer_interval(gettick()+autosave_interval,inter_save_timer,0,0,autosave_interval);
 
 	return 0;
 }
 
+// finalize
+int wis_db_final (void *k, void *data, va_list ap) {
+	struct WisData *p = (struct WisData *) data;
+	if (p) aFree(p);
+	return 0;
+}
+void inter_final() {
+	numdb_final(wis_db, wis_db_final);
+
+	inter_guild_sql_final();
+	inter_storage_sql_final();
+	inter_party_sql_final();
+	inter_pet_sql_final();
+	
+	if (accreg_pt) aFree(accreg_pt);
+	return;
+}
+
 int inter_mapif_init(int fd) {
 	inter_guild_mapif_init(fd);
 
@@ -293,13 +326,13 @@ int inter_mapif_init(int fd) {
 //--------------------------------------------------------
 
 // GM message sending
-int mapif_GMmessage(unsigned char *mes, int len) {
+int mapif_GMmessage(unsigned char *mes, int len, int sfd) {
 	unsigned char buf[len];
 
 	WBUFW(buf, 0) = 0x3800;
 	WBUFW(buf, 2) = len;
 	memcpy(WBUFP(buf, 4), mes, len-4);
-	mapif_sendall(buf, len);
+	mapif_sendallwos(sfd, buf, len);
 	printf("\033[1;34m inter server: GM[len:%d] - '%s' \033[0m\n", len, mes);
 	return 0;
 }
@@ -322,7 +355,7 @@ int mapif_wis_message(struct WisData *wd) {
 int mapif_wis_end(struct WisData *wd,int flag)
 {
 	unsigned char buf[27];
-	
+
 	WBUFW(buf, 0)=0x3802;
 	memcpy(WBUFP(buf, 2),wd->src,24);
 	WBUFB(buf,26)=flag;
@@ -345,7 +378,7 @@ int mapif_account_reg_reply(int fd,int account_id)
 {
 	struct accreg *reg=accreg_pt;
 	inter_accreg_fromsql(account_id,reg);
-	
+
 	WFIFOW(fd,0)=0x3804;
 	WFIFOL(fd,4)=account_id;
 	if(reg->reg_num==0){
@@ -362,6 +395,27 @@ int mapif_account_reg_reply(int fd,int account_id)
 	return 0;
 }
 
+int mapif_send_gmaccounts()
+{
+	int i, len = 4;
+	unsigned char buf[32000];
+
+	// forward the gm accounts to the map server
+	len = 4;
+	WBUFW(buf,0) = 0x2b15;
+				
+	for(i = 0; i < GM_num; i++) {
+		WBUFL(buf, len) = gm_account[i].account_id;
+		WBUFB(buf, len+4) = (unsigned char)gm_account[i].level;
+		len += 5;
+	}
+	WBUFW(buf, 2) = len;
+	mapif_sendall(buf, len);
+
+	return 0;
+}
+
+
 //--------------------------------------------------------
 
 // Existence check of WISP data
@@ -384,12 +438,12 @@ int check_ttl_wisdata() {
 		wis_delnum = 0;
 		numdb_foreach(wis_db, check_ttl_wisdata_sub, tick);
 		for(i = 0; i < wis_delnum; i++) {
-			struct WisData *wd = numdb_search(wis_db, wis_dellist[i]);
+			struct WisData *wd = (struct WisData*)numdb_search(wis_db, wis_dellist[i]);
 			printf("inter: wis data id=%d time out : from %s to %s\n", wd->id, wd->src, wd->dst);
 			// removed. not send information after a timeout. Just no answer for the player
 			//mapif_wis_end(wd, 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
 			numdb_erase(wis_db, wd->id);
-			free(wd);
+			aFree(wd);
 		}
 	} while(wis_delnum >= WISDELLIST_MAX);
 
@@ -401,7 +455,7 @@ int check_ttl_wisdata() {
 // GM message sending
 int mapif_parse_GMmessage(int fd)
 {
-	mapif_GMmessage(RFIFOP(fd, 4), RFIFOW(fd, 2));
+	mapif_GMmessage(RFIFOP(fd, 4), RFIFOW(fd, 2), fd);
 	return 0;
 }
 
@@ -410,6 +464,7 @@ int mapif_parse_GMmessage(int fd)
 int mapif_parse_WisRequest(int fd) {
 	struct WisData* wd;
 	static int wisid = 0;
+	char t_name[32];
 
 	if (RFIFOW(fd,2)-52 >= sizeof(wd->msg)) {
 		printf("inter: Wis message size too long.\n");
@@ -418,7 +473,8 @@ int mapif_parse_WisRequest(int fd) {
 		printf("inter: Wis message doesn't exist.\n");
 		return 0;
 	}
-	sprintf (tmp_sql, "SELECT `name` FROM `%s` WHERE `char_id`='%d'",char_db, (int) RFIFOP(fd,28));
+	sprintf (tmp_sql, "SELECT `name` FROM `%s` WHERE `name`='%s'",
+		char_db, jstrescapecpy(t_name, (char *)RFIFOP(fd,28)));
 	if(mysql_query(&mysql_handle, tmp_sql) ) {
 		printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 	}
@@ -435,9 +491,9 @@ int mapif_parse_WisRequest(int fd) {
 	} else {
 		// to be sure of the correct name, rewrite it
 		memset(RFIFOP(fd,28), 0, 24);
-		strncpy(RFIFOP(fd,28), sql_row[0], 24);
+		strncpy((char*)RFIFOP(fd,28), sql_row[0], 24);
 		// if source is destination, don't ask other servers.
-		if (strcmp(RFIFOP(fd,4),RFIFOP(fd,28)) == 0) {
+		if (strcmp((char*)RFIFOP(fd,4),(char*)RFIFOP(fd,28)) == 0) {
 			unsigned char buf[27];
 			WBUFW(buf, 0) = 0x3802;
 			memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), 24);
@@ -461,7 +517,12 @@ int mapif_parse_WisRequest(int fd) {
 			mapif_wis_message(wd);
 		}
 	}
-
+	
+	//Freeing ... O.o 
+	if(sql_res){
+		mysql_free_result(sql_res);
+	}
+	
 	return 0;
 }
 
@@ -469,7 +530,7 @@ int mapif_parse_WisRequest(int fd) {
 // Wisp/page transmission result
 int mapif_parse_WisReply(int fd) {
 	int id = RFIFOL(fd,2), flag = RFIFOB(fd,6);
-	struct WisData *wd = numdb_search(wis_db, id);
+	struct WisData *wd = (struct WisData*)numdb_search(wis_db, id);
 
 	if (wd == NULL)
 		return 0;	// This wisp was probably suppress before, because it was timeout of because of target was found on another map-server
@@ -477,7 +538,7 @@ int mapif_parse_WisReply(int fd) {
 	if ((--wd->count) <= 0 || flag != 1) {
 		mapif_wis_end(wd, flag); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
 		numdb_erase(wis_db, id);
-		free(wd);
+		aFree(wd);
 	}
 
 	return 0;
@@ -491,13 +552,13 @@ int mapif_parse_AccReg(int fd)
 	struct accreg *reg=accreg_pt;
 	int account_id = RFIFOL(fd,4);
 	memset(accreg_pt,0,sizeof(struct accreg));
-	
+
 	for(j=0,p=8;j<ACCOUNT_REG_NUM && p<RFIFOW(fd,2);j++,p+=36){
 		memcpy(reg->reg[j].str,RFIFOP(fd,p),32);
 		reg->reg[j].value=RFIFOL(fd,p+32);
 	}
 	reg->reg_num=j;
-	
+
 	inter_accreg_tosql(account_id,reg);
 	mapif_account_reg(fd,RFIFOP(fd,0));	// Send confirm message to map
 	return 0;
@@ -526,7 +587,7 @@ int inter_parse_frommap(int fd)
 	// パケット長を調べる
 	if(	(len=inter_check_length(fd,inter_recv_packet_length[cmd-0x3000]))==0 )
 		return 2;
-	
+
 	switch(cmd){
 	case 0x3000: mapif_parse_GMmessage(fd); break;
 	case 0x3001: mapif_parse_WisRequest(fd); break;
@@ -556,9 +617,9 @@ int inter_check_length(int fd, int length)
 			return 0;
 		length = RFIFOW(fd, 2);
 	}
-	
+
 	if(RFIFOREST(fd)<length)	// packet not yet
 		return 0;
-	
+
 	return length;
 }
diff --git a/src/char_sql/inter.h b/src/char_sql/inter.h
index 398088504..9265a8d82 100644
--- a/src/char_sql/inter.h
+++ b/src/char_sql/inter.h
@@ -2,9 +2,10 @@
 #define _INTER_H_
 
 int inter_init(const char *file);
+void inter_final();
 int inter_parse_frommap(int fd);
 int inter_mapif_init(int fd);
-
+int mapif_send_gmaccounts();
 
 int inter_check_length(int fd,int length);
 
@@ -24,6 +25,11 @@ extern MYSQL_RES* 	sql_res ;
 extern MYSQL_ROW	sql_row ;
 extern int 	sql_cnt;
 
+extern MYSQL lmysql_handle;
+extern char tmp_lsql[65535];
+extern MYSQL_RES* 	lsql_res ;
+extern MYSQL_ROW	lsql_row ;
+
 extern int char_server_port;
 extern char char_server_ip[32];
 extern char char_server_id[32];
diff --git a/src/char_sql/itemdb.c b/src/char_sql/itemdb.c
index d045189a0..bc3e8603e 100644
--- a/src/char_sql/itemdb.c
+++ b/src/char_sql/itemdb.c
@@ -13,8 +13,6 @@
 #include "memwatch.h"
 #endif
 
-#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
-
 #define MAX_RANDITEM	2000
 
 // ** ITEMDB_OVERRIDE_NAME_VERBOSE **
@@ -33,7 +31,7 @@ struct item_data* itemdb_search(int nameid)
 {
 	struct item_data *id;
 
-	id=numdb_search(item_db,nameid);
+	id = (struct item_data*)numdb_search(item_db,nameid);
 	if(id) return id;
 
 	CREATE(id, struct item_data, 1);
@@ -123,7 +121,7 @@ static int itemdb_readdb(void)
 		}
 		if(str[0]==NULL)
 			continue;
-		
+
 		nameid=atoi(str[0]);
 		if(nameid<=0 || nameid>=20000)
 			continue;
@@ -174,7 +172,7 @@ static int itemdb_read_sqldb(void) // sql item_db read, shortened version of map
 
 			// Insert a new row into the item database
 /*
-			id = calloc(sizeof(struct item_data), 1);
+			id = aCalloc(sizeof(struct item_data), 1);
 
 			if (id == NULL) {
 				printf("out of memory : itemdb_read_sqldb\n");
@@ -187,7 +185,7 @@ static int itemdb_read_sqldb(void) // sql item_db read, shortened version of map
 			// ----------
 */
             id=itemdb_search(nameid);
-             
+
 			memcpy(id->name, sql_row[1], 24);
 			memcpy(id->jname, sql_row[2], 24);
 
@@ -214,12 +212,12 @@ static int itemdb_final(void *key,void *data,va_list ap)
 {
 	struct item_data *id;
 
-	id=data;
+	id = (struct item_data*)data;
 	if(id->use_script)
-		free(id->use_script);
+		aFree(id->use_script);
 	if(id->equip_script)
-		free(id->equip_script);
-	free(id);
+		aFree(id->equip_script);
+	aFree(id);
 
 	return 0;
 }
diff --git a/src/char_sql/itemdb.h b/src/char_sql/itemdb.h
index dea835e78..762873c8e 100644
--- a/src/char_sql/itemdb.h
+++ b/src/char_sql/itemdb.h
@@ -6,7 +6,7 @@ struct item_data {
 	char name[24],jname[24];
 	int value_buy,value_sell,value_notdc,value_notoc;
 	int type;
-	int class;
+	int class_;
 	int sex;
 	int equip;
 	int weight;
diff --git a/src/char_sql/make.sh b/src/char_sql/make.sh
index a4ca8b5e4..6ee175f73 100644
--- a/src/char_sql/make.sh
+++ b/src/char_sql/make.sh
@@ -6,6 +6,5 @@
 	gcc -c int_pet.c -I/usr/local/include/mysql/
 	gcc -c int_storage.c -I/usr/local/include/mysql/
 	gcc -c inter.c -I/usr/local/include/mysql/
-	gcc -c strlib.c
 	gcc -c itemdb.c -I../common/
-	gcc -o ../char-server inter.o char.o int_pet.o int_storage.o int_guild.o int_party.o strlib.o itemdb.o ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o -L/usr/local/lib/mysql -lmysqlclient -lz
+	gcc -o ../char-server inter.o char.o int_pet.o int_storage.o int_guild.o int_party.o ../common/strlib.o itemdb.o ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o -L/usr/local/lib/mysql -lmysqlclient -lz
diff --git a/src/char_sql/strlib.c b/src/char_sql/strlib.c
deleted file mode 100644
index b113d96f5..000000000
--- a/src/char_sql/strlib.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "strlib.h"
-#include "utils.h"
-
-//-----------------------------------------------
-// string lib.
-unsigned char* jstrescape (unsigned char* pt) {
-	//copy from here
-	unsigned char * ptr;
-	int i =0, j=0;
-	
-	//copy string to temporary
-	CREATE(ptr, char, J_MAX_MALLOC_SIZE);
-	strcpy (ptr,pt);
-	
-	while (ptr[i] != '\0') {
-		switch (ptr[i]) {
-			case '\'':
-				pt[j++] = '\\';
-				pt[j++] = ptr[i++];
-				break;
-			case '\\':
-				pt[j++] = '\\';
-				pt[j++] = ptr[i++];
-				break;
-			default:
-				pt[j++] = ptr[i++];
-		}
-	}
-	pt[j++] = '\0';
-	free (ptr);
-	return (unsigned char*) &pt[0];
-}
-
-unsigned char* jstrescapecpy (unsigned char* pt,unsigned char* spt) {
-	//copy from here
-	int i =0, j=0;
-	
-	while (spt[i] != '\0') {
-		switch (spt[i]) {
-			case '\'':
-				pt[j++] = '\\';
-				pt[j++] = spt[i++];
-				break;
-			case '\\':
-				pt[j++] = '\\';
-				pt[j++] = spt[i++];
-				break;
-			default:
-				pt[j++] = spt[i++];
-		}
-	}
-	pt[j++] = '\0';
-	return (unsigned char*) &pt[0];
-}
-int jmemescapecpy (unsigned char* pt,unsigned char* spt, int size) {
-	//copy from here
-	int i =0, j=0;
-	
-	while (i < size) {
-		switch (spt[i]) {
-			case '\'':
-				pt[j++] = '\\';
-				pt[j++] = spt[i++];
-				break;
-			case '\\':
-				pt[j++] = '\\';
-				pt[j++] = spt[i++];
-				break;
-			default:
-				pt[j++] = spt[i++];
-		}
-	}
-	// copy size is 0 ~ (j-1)
-	return j;
-}
diff --git a/src/char_sql/strlib.h b/src/char_sql/strlib.h
deleted file mode 100644
index 6b6169083..000000000
--- a/src/char_sql/strlib.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _J_STR_LIB_H_
-#define _J_STR_LIB_H_
-#define J_MAX_MALLOC_SIZE 65535
-// String function library.
-// code by Jioh L. Jung (ziozzang@4wish.net)
-// This code is under license "BSD"
-unsigned char* jstrescape (unsigned char* pt);
-unsigned char* jstrescapecpy (unsigned char* pt,unsigned char* spt);
-int jmemescapecpy (unsigned char* pt,unsigned char* spt, int size);
-#endif