Clearing trunk.

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

17 files changed, 0 insertions, 8112 deletions

diff --git a/src/char_sql/Makefile b/src/char_sql/Makefile
deleted file mode 100644
index 1741b5ab6..000000000
--- a/src/char_sql/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-all: char-server_sql
-sql: char-server_sql
-
-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 itemdb.o $(COMMON_OBJ)
-	$(CC) -o ../../$@ $^ $(LIB_S)
-
-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
-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
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
deleted file mode 100644
index d672bc0eb..000000000
--- a/src/char_sql/char.c
+++ /dev/null
@@ -1,3578 +0,0 @@
-// $Id: char.c,v 1.16 2004/09/23 18:31:16 MouseJstr Exp $
-// original : char2.c 2003/03/14 11:58:35 Rev.1.5
-//
-// original code from athena
-// SQL conversion by Jioh L. Jung
-// TXT 1.105
-#include <sys/types.h>
-
-#ifdef LCCWIN32
-#include <winsock.h>
-#pragma lib <libmysql.lib>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/time.h>
-#include <sys/ioctl.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <sys/time.h>
-#include <time.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <string.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdarg.h>
-
-#include "char.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
-
-static struct dbt *char_db_;
-
-char char_db[256] = "char";
-char cart_db[256] = "cart_inventory";
-char inventory_db[256] = "inventory";
-char charlog_db[256] = "charlog";
-char storage_db[256] = "storage";
-char interlog_db[256] = "interlog";
-char reg_db[256] = "global_reg_value";
-char skill_db[256] = "skill";
-char memo_db[256] = "memo";
-char guild_db[256] = "guild";
-char guild_alliance_db[256] = "guild_alliance";
-char guild_castle_db[256] = "guild_castle";
-char guild_expulsion_db[256] = "guild_expulsion";
-char guild_member_db[256] = "guild_member";
-char guild_position_db[256] = "guild_position";
-char guild_skill_db[256] = "guild_skill";
-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;
-
-char *SQL_CONF_NAME = "conf/inter_athena.conf";
-
-struct mmo_map_server server[MAX_MAP_SERVERS];
-int server_fd[MAX_MAP_SERVERS];
-
-int login_fd, char_fd;
-char userid[24];
-char passwd[24];
-char server_name[20];
-char wisp_server_name[24] = "Server";
-int login_ip_set_ = 0;
-char login_ip_str[128];
-in_addr_t login_ip;
-int login_port = 6900;
-int char_ip_set_ = 0;
-char char_ip_str[128];
-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]
-
-char lan_map_ip[128]; // Lan map ip added by kashy
-int subnetmaski[4]; // Subnetmask added by kashy
-char unknown_char_name[1024] = "Unknown";
-char db_path[1024]="db";
-
-//Added for Mugendai's I'm Alive mod
-int imalive_on=0;
-int imalive_time=60;
-//Added by Mugendai for GUI
-int flush_on=1;
-int flush_time=100;
-
-struct char_session_data{
-	int account_id,login_id1,login_id2,sex;
-	int found_char[9];
-	char email[40]; // e-mail (default: a@a.com) by [Yor]
-	time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-};
-
-#define AUTH_FIFO_SIZE 256
-struct {
-	int account_id,char_id,login_id1,login_id2,ip,char_pos,delflag,sex;
-	time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
-} auth_fifo[AUTH_FIFO_SIZE];
-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; //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;
-int start_armor = 2301;
-
-// check for exit signal
-// 0 is saving complete
-// other is char_id
-unsigned int save_flag = 0;
-
-// start point (you can reset point on conf file)
-struct point start_point = {"new_1-1.gat", 53, 111};
-
-struct gm_account *gm_account = NULL;
-int GM_num = 0;
-
-int console = 0;
-
-#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
-
-//-------------------------------------------------
-// Set Character online/offline [Wizputer]
-//-------------------------------------------------
-
-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));
-		}
-    }
-
-    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 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);
-            }
-       }
-    }
-
-   	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));
-	}
-
-}
-
-void set_char_offline(int char_id, int account_id) {
-    struct mmo_charstatus *cp;
-
-    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));
-	}
-
-   if (login_fd <= 0 || session[login_fd]->eof)
-	return;
-
-   WFIFOW(login_fd,0) = 0x272c;
-   WFIFOL(login_fd,2) = account_id;
-   WFIFOSET(login_fd,6);
-}
-
-//----------------------------------------------------------------------
-// Determine if an account (id) is a GM account
-// 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;
-
-	for(i = 0; i < GM_num; i++)
-		if (gm_account[i].account_id == account_id)
-			return gm_account[i].level;
-	return 0;
-}
-
-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++;
-		}
-	}
-
-	mysql_free_result(lsql_res);
-	mapif_send_gmaccounts();
-}
-
-// Insert friends list
-int insert_friends(int char_id){
-	int i;
-	char *tmp_p = tmp_sql;
-
-	tmp_p += sprintf(tmp_p, "REPLACE INTO `%s` (`id`, `account_id`",friend_db);
-
-	for (i=0;i<20;i++)
-		tmp_p += sprintf(tmp_p, ", `friend_id%d`, `name%d`", i, i);
-
-	tmp_p += sprintf(tmp_p, ") VALUES (NULL, '%d'", char_id);
-
-	for (i=0;i<20;i++)
-		tmp_p += sprintf(tmp_p, ", '0', ''");
-
-	tmp_p += sprintf(tmp_p, ")");
-
-	if (mysql_query(&mysql_handle, tmp_sql)) {
-		printf("DB server Error (insert `friend`)- %s\n", mysql_error(&mysql_handle));
-         	return 0;
-         }
-return 1;
-}
-
-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,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];	
-
-	if (char_id!=p->char_id) return 0;
-
-	cp = (struct mmo_charstatus*)numdb_search(char_db_,char_id);
-
-	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);
-
-//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[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++;
-		}
-	}
-	//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;
-//	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[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++;
-		}
-	}
-
-	//printf("- Save cart data to MySQL!\n");
-	if (diff)
-	    memitemdata_to_sql(mapitem, count, p->char_id,TABLE_CART);
-
-//=====================================================================================================
-
-	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
-	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
-	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
-	//`max_hp`,`hp`,`max_sp`,`sp`,`status_point`,`skill_point`, //21
-	//`option`,`karma`,`manner`,`party_id`,`guild_id`,`pet_id`, //27
-	//`hair`,`hair_color`,`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`, //35
-	//`last_map`,`last_x`,`last_y`,`save_map`,`save_x`,`save_y`)
-	//printf("- Save char data to MySQL!\n");
-	sprintf(tmp_sql ,"UPDATE `%s` SET `class`='%d', `base_level`='%d', `job_level`='%d',"
-		"`base_exp`='%d', `job_exp`='%d', `zeny`='%d',"
-		"`max_hp`='%d',`hp`='%d',`max_sp`='%d',`sp`='%d',`status_point`='%d',`skill_point`='%d',"
-		"`str`='%d',`agi`='%d',`vit`='%d',`int`='%d',`dex`='%d',`luk`='%d',"
-		"`option`='%d',`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', `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,
-		p->option, p->karma, p->manner, p->party_id, p->guild_id, p->pet_id,
-		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->father, p->mother,
-		p->child, p->account_id, p->char_id
-	);
-
-	if(mysql_query(&mysql_handle, tmp_sql)) {
-			printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle));
-	}
-
-	}
-
-	diff = 0;
-
-	for(i=0;i<10;i++){
-	  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 (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));
-	}
-
-	//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));
-		}
-	}
-	}
-
-	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
-
-            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;
-            }
-        }
-
-	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) {
-				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));
-				}
-			}
-		}
-	}
-	}
-
-	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;
-	  }
-	}
-
-	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));
-	}
-
-	//insert here.
-	for(i=0;i<p->global_reg_num;i++){
-		if (p->global_reg[i].str) {
-			if(p->global_reg[i].value !=0){
-					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));
-					}
-			}
-		}
-	}
-	}
-
-	// Friends list
-	// account_id, friend_id0, name0, ...
-	#if 0
-		tmp_p += sprintf(tmp_p, "REPLACE INTO `%s` (`id`, `account_id`",friend_db);
-
-		diff = 0;
-
-		for (i=0;i<20;i++)
-			tmp_p += sprintf(tmp_p, ", `friend_id%d`, `name%d`", i, i);
-
-		tmp_p += sprintf(tmp_p, ") VALUES (NULL, '%d'", char_id);
-
-		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;
-		}
-
-		tmp_p += sprintf(tmp_p, ")");
-	#else	// [Dino9021]
-		tmp_p += sprintf(tmp_p, "UPDATE `%s` SET ",friend_db);
-
-		diff = 0;
-		
-		for (i=0;i<20;i++) {
-			if (i>0)
-				tmp_p += sprintf(tmp_p, ", ");
-
-			tmp_p += sprintf(tmp_p, "`friend_id%d`='%d', `name%d`='%s'", i, p->friend_id[i], 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;
-		}
-
-		tmp_p += sprintf(tmp_p, " where account_id='%d';", char_id);
-	#endif
-
-	if (diff)
-	  mysql_query(&mysql_handle, tmp_sql);
-
-	printf("saving char is done.\n");
-	save_flag = 0;
-
-	memcpy(cp, p, sizeof(struct mmo_charstatus));
-
-	return 0;
-}
-
-// [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) {
-	case TABLE_INVENTORY:
-		tablename = inventory_db; // no need for sprintf here as *_db are char*.
-		sprintf(selectoption,"char_id");
-		break;
-	case TABLE_CART:
-		tablename = cart_db;
-		sprintf(selectoption,"char_id");
-		break;
-	case TABLE_STORAGE:
-		tablename = storage_db;
-		sprintf(selectoption,"account_id");
-		break;
-	case TABLE_GUILD_STORAGE:
-		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);
-	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) {
-		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[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));
-						}
-						//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;
-				}
-			}
-			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));
-			}
-		}
-		mysql_free_result(sql_res);
-	}
-
-	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=================================================
-
-//		gettimeofday(&tv,NULL);
-//		strftime(tmpstr,24,"%Y-%m-%d %H:%M:%S",localtime(&(tv.tv_sec)));
-//		printf("\n\n");
-//		printf("Working Table Name : Not EQU %s,  Count : map %3d | db %3d \n",tablename ,noteqcount ,dbnoteqcount);
-//		printf("*********************************************************************************\n");
-//		printf("======================================MAP===================Char ID %10d===\n",char_id);
-//		printf("==flag ===name ===equip===ident===refin===attri===card0===card1===card2===card3==\n");
-//		for(j=1;j<noteqcount;j++)
-//			printf("| %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d |\n", mapitem.notequip[j].flag,mapitem.notequip[j].nameid, mapitem.notequip[j].equip, mapitem.notequip[j].identify, mapitem.notequip[j].refine,mapitem.notequip[j].attribute, mapitem.notequip[j].card[0], mapitem.notequip[j].card[1], mapitem.notequip[j].card[2], mapitem.notequip[j].card[3]);
-//		printf("======================================DB=========================================\n");
-//		printf("==flag ===name ===equip===ident===refin===attri===card0===card1===card2===card3==\n");
-//		for(j=1;j<dbnoteqcount;j++)
-//			printf("| %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d | %5d |\n", dbitem.notequip[j].flag ,dbitem.notequip[j].nameid, dbitem.notequip[j].equip, dbitem.notequip[j].identify, dbitem.notequip[j].refine,dbitem.notequip[j].attribute, dbitem.notequip[j].card[0], dbitem.notequip[j].card[1], dbitem.notequip[j].card[2], dbitem.notequip[j].card[3]);
-//		printf("=================================================================================\n");
-//		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, 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;
-	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
-	//`option`,`karma`,`manner`,`party_id`,`guild_id`,`pet_id`, //27
-	//`hair`,`hair_color`,`clothes_color`,`weapon`,`shield`,`head_top`,`head_mid`,`head_bottom`, //35
-	//`last_map`,`last_x`,`last_y`,`save_map`,`save_x`,`save_y`)
-	//splite 2 parts. cause veeeery long SQL syntax
-
-	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
-
-	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) {
-		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->base_level = atoi(sql_row[5]);
-		p->job_level = atoi(sql_row[6]);
-		p->base_exp = atoi(sql_row[7]);
-		p->job_exp = atoi(sql_row[8]);
-		p->zeny = atoi(sql_row[9]);
-		p->str = atoi(sql_row[10]);
-		p->agi = atoi(sql_row[11]);
-		p->vit = atoi(sql_row[12]);
-		p->int_ = atoi(sql_row[13]);
-		p->dex = atoi(sql_row[14]);
-		p->luk = atoi(sql_row[15]);
-		p->max_hp = atoi(sql_row[16]);
-		p->hp = atoi(sql_row[17]);
-		p->max_sp = atoi(sql_row[18]);
-		p->sp = atoi(sql_row[19]);
-		p->status_point = atoi(sql_row[20]);
-		p->skill_point = atoi(sql_row[21]);
-		//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);
-	} 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); // 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) {
-		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]);
-			p->memo_point[i].y=atoi(sql_row[2]);
-			//i ++;
-		}
-		mysql_free_result(sql_res);
-	}
-	printf("memo ");
-
-	//read inventory
-	//`inventory` (`id`,`char_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 `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[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);
-	}
-	printf("inventory ");
-
-
-	//read cart.
-	//`cart_inventory` (`id`,`char_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 `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[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);
-	}
-	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); // 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; //memory!? shit!.
-			p->skill[n].lv = atoi(sql_row[1]);
-		}
-		mysql_free_result(sql_res);
-	}
-	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); // 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]);
-		}
-		mysql_free_result(sql_res);
-	}
-	p->global_reg_num=i;
-
-	//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) {
-		set_char_online(char_id,p->account_id);
-	}
-
-	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 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
-	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);
-	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);
-
-	if (i !=0) {
-		sprintf(tmp_sql , "SELECT max(`char_id`) FROM `%s`", char_db);
-		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);
-	} 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);
-        }
-
-	//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));
-
-	//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;
-}
-
-//==========================================================================================================
-
-int make_new_char_sql(int fd, unsigned char *dat) {
-	struct char_session_data *sd;
-	char t_name[100];
-	int i, char_id, temp;
-
-
-	//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((const char*)dat); i++)
-			if (strchr(char_name_letters, dat[i]) == NULL)
-				return -2;
-	} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
-		for (i = 0; i < strlen((const char*)dat); i++)
-			if (strchr(char_name_letters, dat[i]) != NULL)
-				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[31] >= 9)) {
-
-		// check individual stat value
-		for(i = 24; i <= 29; i++) {
-			if (dat[i] < 1 || dat[i] > 9) {
-				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 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
-		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);
-	}
-
-	// check char slot.
-	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` (`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 `char`)- %s\n", mysql_error(&mysql_handle));
-	}
-
-	//`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')",
-		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");
-}
-
-// to do
-///////////////////////////
-
-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) {
-	int i, users;
-
-	if (login_fd > 0 && session[login_fd]){
-		users = 0;
-		for(i = 0; i < MAX_MAP_SERVERS; i++) {
-			if (server_fd[i] >= 0) {
-				users += server[i].users;
-			}
-		}
-		return users;
-	}
-	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
-
-	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);
-	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);
-		printf("number of chars: %d\n", found_num);
-		i = 0;
-		while((sql_row = mysql_fetch_row(sql_res))) {
-			sd->found_char[i] = atoi(sql_row[0]);
-			i++;
-		}
-		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;
-
-	memset(WFIFOP(fd, 0), 0, offset + found_num * 106);
-	WFIFOW(fd, 0) = 0x6b;
-	WFIFOW(fd, 2) = offset + found_num * 106;
-
-	printf("(\033[1;13m%d\033[0m) Request Char Data:\n",sd->account_id);
-
-	for(i = 0; i < found_num; i++) {
-		mmo_char_fromsql(sd->found_char[i], char_dat, 0);
-
-		p = &char_dat[0];
-
-		j = offset + (i * 106); // increase speed of code
-
-		WFIFOL(fd,j) = p->char_id;
-		WFIFOL(fd,j+4) = p->base_exp;
-		WFIFOL(fd,j+8) = p->zeny;
-		WFIFOL(fd,j+12) = p->job_exp;
-		WFIFOL(fd,j+16) = p->job_level;
-
-		WFIFOL(fd,j+20) = 0;
-		WFIFOL(fd,j+24) = 0;
-		WFIFOL(fd,j+28) = p->option;
-
-		WFIFOL(fd,j+32) = p->karma;
-		WFIFOL(fd,j+36) = p->manner;
-
-		WFIFOW(fd,j+40) = p->status_point;
-		WFIFOW(fd,j+42) = (p->hp > 0x7fff) ? 0x7fff : p->hp;
-		WFIFOW(fd,j+44) = (p->max_hp > 0x7fff) ? 0x7fff : p->max_hp;
-		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+54) = p->hair;
-
-		// 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;
-		WFIFOW(fd,j+64) = p->shield;
-		WFIFOW(fd,j+66) = p->head_top;
-		WFIFOW(fd,j+68) = p->head_mid;
-		WFIFOW(fd,j+70) = p->hair_color;
-		WFIFOW(fd,j+72) = p->clothes_color;
-
-		memcpy(WFIFOP(fd,j+74), p->name, 24);
-
-		WFIFOB(fd,j+98) = (p->str > 255) ? 255 : p->str;
-		WFIFOB(fd,j+99) = (p->agi > 255) ? 255 : p->agi;
-		WFIFOB(fd,j+100) = (p->vit > 255) ? 255 : p->vit;
-		WFIFOB(fd,j+101) = (p->int_ > 255) ? 255 : p->int_;
-		WFIFOB(fd,j+102) = (p->dex > 255) ? 255 : p->dex;
-		WFIFOB(fd,j+103) = (p->luk > 255) ? 255 : p->luk;
-		WFIFOB(fd,j+104) = p->char_num;
-	}
-
-	WFIFOSET(fd,WFIFOW(fd,2));
-//	printf("mmo_char_send006b end..\n");
-	return 0;
-}
-
-int parse_tologin(int fd) {
-	int i;
-	struct char_session_data *sd;
-
-	// 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);
-			login_fd = -1;
-		}
-		close(fd);
-		delete_session(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
-	while(RFIFOREST(fd) >= 2) {
-//		printf("parse_tologin : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd, 0));
-
-		switch(RFIFOW(fd, 0)){
-		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;
-
-		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);
-					}
-				}
-			}
-			RFIFOSKIP(fd,51);
-			break;
-
-		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;
-
-		// login-server alive packet
-		case 0x2718:
-			if (RFIFOREST(fd) < 2)
-				return 0;
-			RFIFOSKIP(fd,2);
-			break;
-
-		// 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++;
-			}
-			//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;
-
-/*		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;
-						}
-					}
-				}
-
-			WBUFW(buf,0) = 0x2b0d;
-			WBUFL(buf,2) = acc;
-			WBUFB(buf,6) = sex;
-
-			mapif_sendall(buf, 7);
-		  }
-			break;
-
-		// 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;
-
-		// 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;
-
-		// 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();
-
-					//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;
-		}
-	}
-
-	RFIFOFLUSH(fd);
-
-	return 0;
-}
-
-int parse_frommap(int fd) {
-	int i = 0, j = 0;
-	int 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++)
-		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;
-	}
-
-	while(RFIFOREST(fd) >= 2) {
-//		printf("parse_frommap : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd,0));
-
-		switch(RFIFOW(fd, 0)) {
-
-		// map-server alive packet
-		case 0x2718:
-			if (RFIFOREST(fd) < 2)
-				return 0;
-			RFIFOSKIP(fd,2);
-			break;
-
-		case 0x2af7:
-			RFIFOSKIP(fd,2);
-			read_gm_account();
-			break;
-
-		// 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;
-
-		// 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;
-
-		// 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;
-
-		// 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);
-
-			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;
-
-		// req char selection
-		case 0x2b02:
-			if (RFIFOREST(fd) < 18)
-				return 0;
-
-			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;
-
-		// request "change map server"
-		case 0x2b05:
-			if (RFIFOREST(fd) < 49)
-				return 0;
-
-			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;
-
-			WFIFOSET(fd,44);
-			RFIFOSKIP(fd,49);
-			break;
-			*/
-
-		break;
-		
-		// char name check
-		case 0x2b08:
-			if (RFIFOREST(fd) < 6)
-				return 0;
-
-			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);
-
-			sql_row = mysql_fetch_row(sql_res);
-
-			WFIFOW(fd,0) = 0x2b09;
-			WFIFOL(fd,2) = RFIFOL(fd,2);
-
-			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);
-
-			WFIFOSET(fd,30);
-
-			RFIFOSKIP(fd,6);
-			break;
-
-/*		// 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;
-
-		// 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)
-		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));
-			}
-
-			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) = 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) = 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) = 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) = 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) = 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;
-
-		// 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;
-
-		// 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;
-
-		default:
-			// inter server - packet
-			{
-				int r = inter_parse_frommap(fd);
-				if (r == 1) break;		// processed
-				if (r == 2) return 0;	// need more packet
-			}
-
-			// no inter server packet. no char server packet -> disconnect
-			printf("parse_frommap: unknown packet %x! \n", RFIFOW(fd,0));
-			session[fd]->eof = 1;
-			return 0;
-		}
-	}
-	return 0;
-}
-
-int search_mapserver(char *map) {
-	int i, j;
-	char temp_map[16];
-	int temp_map_len;
-
-//	printf("Searching the map-server for map '%s'... ", map);
-	strncpy(temp_map, map, sizeof(temp_map));
-	temp_map[sizeof(temp_map)-1] = '\0';
-	if (strchr(temp_map, '.') != NULL)
-		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++)
-		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));
-				if (strncmp(server[i].map[j], temp_map, temp_map_len) == 0) {
-//					printf("found -> server #%d.\n", i);
-					return i;
-				}
-
-//	printf("not found.\n");
-	return -1;
-}
-
-int char_mapif_init(int fd) {
-	return inter_mapif_init(fd);
-}
-
-//-----------------------------------------------------
-// Test to know if an IP come from LAN or WAN. by [Yor]
-//-----------------------------------------------------
-int lan_ip_check(unsigned char *p){
-	int i;
-	int lancheck = 1;
-	int subneti[4];
-	unsigned int k0, k1, k2, k3;
-
-	sscanf(lan_map_ip, "%d.%d.%d.%d", &k0, &k1, &k2, &k3);
-	subneti[0] = k0; subneti[1] = k1; subneti[2] = k2; subneti[3] = k3;
-
-//	printf("lan_ip_check: to compare: %d.%d.%d.%d, network: %d.%d.%d.%d/%d.%d.%d.%d\n",
-//	       p[0], p[1], p[2], p[3],
-//	       subneti[0], subneti[1], subneti[2], subneti[3],
-//	       subnetmaski[0], subnetmaski[1], subnetmaski[2], subnetmaski[3]);
-	for(i = 0; i < 4; i++) {
-		if ((subneti[i] & subnetmaski[i]) != (p[i] & subnetmaski[i])) {
-			lancheck = 0;
-			break;
-		}
-	}
-//	printf("LAN test (result): %s source\033[0m.\n", (lancheck) ? "\033[1;36mLAN" : "\033[1;32mWAN");
-	return lancheck;
-}
-
-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;
-
-	sd = (struct char_session_data*)session[fd]->session_data;
-
-	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;
-	}
-
-	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;
-		}
-
-//		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;	// パケットダンプを表示させる
-
-		switch(cmd){
-		case 0x20b: //20040622 encryption ragexe correspondence
-			if (RFIFOREST(fd) < 19)
-				return 0;
-			RFIFOSKIP(fd,19);
-			break;
-
-		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);
-
-			WFIFOL(fd, 0) = RFIFOL(fd, 2);
-			WFIFOSET(fd, 4);
-
-			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;
-
-		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;
-
-                        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));
-			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)
-				mmo_char_fromsql(atoi(sql_row[0]), char_dat, 1);
-			else {
-				mysql_free_result(sql_res);
-				RFIFOSKIP(fd, 3);
-				break;
-			}
-
-			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;
-
-		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;
-			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;
-				}
-			}
-
-		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));
-				}
-
-				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));
-				}
-
-				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));
-				}
-
-				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));
-				}
-
-				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));
-				}
-
-				//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));
-				}
-
-				sprintf(tmp_sql, "SELECT `guild_id` FROM `%s` WHERE `master` = '%s'", guild_db, sql_row[0]);
-
-				if (mysql_query(&mysql_handle, tmp_sql) == 0) {
-					sql_res = mysql_store_result(&mysql_handle);
-
-					if (sql_res != NULL) {
-						if (mysql_num_rows(sql_res) != 0) {
-							sql_row = mysql_fetch_row(sql_res);
-
-							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));
-							}
-
-							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));
-							}
-
-							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));
-							}
-
-							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));
-							}
-
-							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));
-							}
-
-							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));
-							}
-
-							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));
-							}
-
-							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));
-							}
-
-							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));
-				}
-			}
-
-			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);
-			break;
-
-		case 0x2af8: // login as map-server
-			if (RFIFOREST(fd) < 60)
-				return 0;
-			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;
-
-		case 0x187:	// Alive?
-			if (RFIFOREST(fd) < 6) {
-				return 0;
-			}
-			RFIFOSKIP(fd, 6);
-			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;
-		}
-	}
-	RFIFOFLUSH(fd);
-
-	return 0;
-}
-
-// Console Command Parser [Wizputer]
-int parse_console(char *buf) {
-    char *type,*command;
-
-    type = (char *)aMalloc(64);
-    command = (char *)aMalloc(64);
-
-    memset(type,0,64);
-    memset(command,0,64);
-
-    printf("Console: %s\n",buf);
-
-    if ( sscanf(buf, "%[^:]:%[^\n]", type , command ) < 2 )
-        sscanf(buf,"%[^\n]",type);
-
-    printf("Type of command: %s || Command: %s \n",type,command);
-
-    if(buf) aFree(buf);
-    if(type) aFree(type);
-    if(command) aFree(command);
-
-    return 0;
-}
-
-// MAP send all
-int mapif_sendall(unsigned char *buf, unsigned int len) {
-	int i, c;
-	int fd;
-
-	c = 0;
-	for(i = 0; i < MAX_MAP_SERVERS; i++) {
-		if ((fd = server_fd[i]) >= 0) {
-			memcpy(WFIFOP(fd,0), buf, len);
-			WFIFOSET(fd,len);
-			c++;
-		}
-	}
-
-	return c;
-}
-
-int mapif_sendallwos(int sfd, unsigned char *buf, unsigned int len) {
-	int i, c;
-	int fd;
-
-	c = 0;
-	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);
-			c++;
-		}
-	}
-
-	return c;
-}
-
-int mapif_send(int fd, unsigned char *buf, unsigned int len) {
-	int i;
-
-	if (fd >= 0) {
-		for(i = 0; i < MAX_MAP_SERVERS; i++) {
-			if (fd == server_fd[i]) {
-				memcpy(WFIFOP(fd,0), buf, len);
-				WFIFOSET(fd,len);
-				return 1;
-			}
-		}
-	}
-	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");
-		login_fd = make_connection(login_ip, login_port);
-		session[login_fd]->func_parse = parse_tologin;
-		realloc_fifo(login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-		WFIFOW(login_fd,0) = 0x2710;
-		memset(WFIFOP(login_fd,2), 0, 24);
-		memcpy(WFIFOP(login_fd,2), userid, strlen(userid) < 24 ? strlen(userid) : 24);
-		memset(WFIFOP(login_fd,26), 0, 24);
-		memcpy(WFIFOP(login_fd,26), passwd, strlen(passwd) < 24 ? strlen(passwd) : 24);
-		WFIFOL(login_fd,50) = 0;
-		WFIFOL(login_fd,54) = char_ip;
-		WFIFOL(login_fd,58) = char_port;
-		memset(WFIFOP(login_fd,60), 0, 20);
-		memcpy(WFIFOP(login_fd,60), server_name, strlen(server_name) < 20 ? strlen(server_name) : 20);
-		WFIFOW(login_fd,80) = 0;
-		WFIFOW(login_fd,82) = char_maintenance;
-		WFIFOW(login_fd,84) = char_new;
-		WFIFOSET(login_fd,86);
-	}
-	return 0;
-}
-
-//----------------------------------------------------------
-// Return numerical value of a switch configuration by [Yor]
-// on/off, english, fran軋is, deutsch, espa�ol
-//----------------------------------------------------------
-int config_switch(const char *str) {
-	if (strcmpi(str, "on") == 0 || strcmpi(str, "yes") == 0 || strcmpi(str, "oui") == 0 || strcmpi(str, "ja") == 0 || strcmpi(str, "si") == 0)
-		return 1;
-	if (strcmpi(str, "off") == 0 || strcmpi(str, "no") == 0 || strcmpi(str, "non") == 0 || strcmpi(str, "nein") == 0)
-		return 0;
-
-	return atoi(str);
-}
-
-// Lan Support conf reading added by Kashy
-int char_lan_config_read(const char *lancfgName){
-	char subnetmask[128];
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
-	struct hostent * h = NULL;
-
-	if ((fp = fopen(lancfgName, "r")) == NULL) {
-		printf("file not found: %s\n", lancfgName);
-		return 1;
-	}
-
-	printf("Start reading of Lan Support configuration file\n");
-
-	while(fgets(line, sizeof(line)-1, fp)){
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-
-		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
-			continue;
-
-		else if (strcmpi(w1, "lan_map_ip") == 0) {
-			h = gethostbyname(w2);
-			if (h != NULL) {
-				sprintf(lan_map_ip, "%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 {
-				strncpy(lan_map_ip, w2, sizeof(lan_map_ip));
-				lan_map_ip[sizeof(lan_map_ip)-1] = 0;
-			}
-			printf("set Lan_map_IP : %s\n", lan_map_ip);
-		}
-
-		else if (strcmpi(w1, "subnetmask") == 0) {
-			unsigned int k0, k1, k2, k3;
-			strcpy(subnetmask, w2);
-			sscanf(subnetmask, "%d.%d.%d.%d", &k0, &k1, &k2, &k3);
-			subnetmaski[0] = k0; subnetmaski[1] = k1; subnetmaski[2] = k2; subnetmaski[3] = k3;
-			printf("set subnetmask : %s\n", w2);
-		}
-	}
-	fclose(fp);
-
-	printf("End reading of Lan Support configuration file\n");
-	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("Doing final stage...\n");
-	//mmo_char_sync();
-	//inter_save();
-	do_final_itemdb();
-	//check SQL save progress.
-	//wait until save char complete
-
-	set_all_offline();
-
-	flush_fifos();
-
-	sprintf(tmp_sql,"DELETE FROM `ragsrvinfo");
-	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(char_dat)  {
-		aFree(char_dat);
-		char_dat = 0;
-	}
-
-	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("ok! all done...\n");
-}
-
-void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
-
-	printf("reading configure: %s\n", cfgName);
-
-	if ((fp = fopen(cfgName, "r")) == NULL) {
-		printf("file not found: %s\n", cfgName);
-		exit(1);
-	}
-
-	while(fgets(line, sizeof(line)-1, fp)){
-		if(line[0] == '/' && line[1] == '/')
-			continue;
-
-		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
-			continue;
-
-		if(strcmpi(w1, "login_db") == 0) {
-			strcpy(login_db, w2);
-		}else if(strcmpi(w1,"char_db")==0){
-			strcpy(char_db,w2);
-		}else if(strcmpi(w1,"cart_db")==0){
-			strcpy(cart_db,w2);
-		}else if(strcmpi(w1,"inventory_db")==0){
-			strcpy(inventory_db,w2);
-		}else if(strcmpi(w1,"charlog_db")==0){
-			strcpy(charlog_db,w2);
-		}else if(strcmpi(w1,"storage_db")==0){
-			strcpy(storage_db,w2);
-		}else if(strcmpi(w1,"reg_db")==0){
-			strcpy(reg_db,w2);
-		}else if(strcmpi(w1,"skill_db")==0){
-			strcpy(skill_db,w2);
-		}else if(strcmpi(w1,"interlog_db")==0){
-			strcpy(interlog_db,w2);
-		}else if(strcmpi(w1,"memo_db")==0){
-			strcpy(memo_db,w2);
-		}else if(strcmpi(w1,"guild_db")==0){
-			strcpy(guild_db,w2);
-		}else if(strcmpi(w1,"guild_alliance_db")==0){
-			strcpy(guild_alliance_db,w2);
-		}else if(strcmpi(w1,"guild_castle_db")==0){
-			strcpy(guild_castle_db,w2);
-		}else if(strcmpi(w1,"guild_expulsion_db")==0){
-			strcpy(guild_expulsion_db,w2);
-		}else if(strcmpi(w1,"guild_member_db")==0){
-			strcpy(guild_member_db,w2);
-		}else if(strcmpi(w1,"guild_skill_db")==0){
-			strcpy(guild_skill_db,w2);
-		}else if(strcmpi(w1,"guild_position_db")==0){
-			strcpy(guild_position_db,w2);
-		}else if(strcmpi(w1,"guild_storage_db")==0){
-			strcpy(guild_storage_db,w2);
-		}else if(strcmpi(w1,"party_db")==0){
-			strcpy(party_db,w2);
-		}else if(strcmpi(w1,"pet_db")==0){
-			strcpy(pet_db,w2);
-		}else if(strcmpi(w1,"db_path")==0){
-			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]
-			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){
-			strcpy(login_db_level,w2);
-		}else if(strcmpi(w1,"login_db_account_id")==0){
-			strcpy(login_db_account_id,w2);
-		}else if(strcmpi(w1,"lowest_gm_level")==0){
-			lowest_gm_level = atoi(w2);
-			printf("set lowest_gm_level : %s\n",w2);
-		//support the import command, just like any other config
-		}else if(strcmpi(w1,"import")==0){
-			sql_config_read(w2);
-		}
-
-	}
-	fclose(fp);
-	printf("reading configure done.....\n");
-}
-
-int char_config_read(const char *cfgName) {
-	struct hostent *h = NULL;
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
-
-	if ((fp = fopen(cfgName, "r")) == NULL) {
-		printf("Configuration file not found: %s.\n", cfgName);
-		exit(1);
-	}
-
-	while(fgets(line, sizeof(line)-1, fp)) {
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-
-		line[sizeof(line)-1] = '\0';
-		if (sscanf(line,"%[^:]: %[^\r\n]", w1, w2) != 2)
-			continue;
-
-		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 initialized\n", w2);
-		} else if (strcmpi(w1, "wisp_server_name") == 0) {
-			if (strlen(w2) >= 4) {
-				memcpy(wisp_server_name, w2, sizeof(wisp_server_name));
-				wisp_server_name[sizeof(wisp_server_name) - 1] = '\0';
-			}
-		} else if (strcmpi(w1, "login_ip") == 0) {
-			login_ip_set_ = 1;
-			h = gethostbyname (w2);
-			if (h != NULL) {
-				printf("Login server 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(login_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(login_ip_str,w2,16);
-		} else if (strcmpi(w1, "login_port") == 0) {
-			login_port=atoi(w2);
-		} else if (strcmpi(w1, "char_ip") == 0) {
-			char_ip_set_ = 1;
-			h = gethostbyname (w2);
-			if(h != NULL) {
-				printf("Character server 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(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) {
-			char_maintenance = atoi(w2);
-		} else if (strcmpi(w1, "char_new")==0){
-			char_new = atoi(w2);
-		} else if (strcmpi(w1, "max_connect_user") == 0) {
-			max_connect_user = atoi(w2);
-			if (max_connect_user < 0)
-				max_connect_user = 0; // unlimited online players
-		} else if(strcmpi(w1, "gm_allow_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) {
-			autosave_interval = atoi(w2)*1000;
-			if (autosave_interval <= 0)
-				autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
-		} else if (strcmpi(w1, "start_point") == 0) {
-			char map[32];
-			int x, y;
-			if (sscanf(w2,"%[^,],%d,%d", map, &x, &y) < 3)
-				continue;
-			if (strstr(map, ".gat") != NULL) { // Verify at least if '.gat' is in the map name
-				memcpy(start_point.map, map, 16);
-				start_point.x = x;
-				start_point.y = y;
-			}
-		} else if (strcmpi(w1, "start_zeny") == 0) {
-			start_zeny = atoi(w2);
-			if (start_zeny < 0)
-				start_zeny = 0;
-		} else if (strcmpi(w1, "start_weapon") == 0) {
-			start_weapon = atoi(w2);
-			if (start_weapon < 0)
-				start_weapon = 0;
-		} else if (strcmpi(w1, "start_armor") == 0) {
-			start_armor = atoi(w2);
-			if (start_armor < 0)
-				start_armor = 0;
-		} else if(strcmpi(w1,"imalive_on")==0){		//Added by Mugendai for I'm Alive mod
-			imalive_on = atoi(w2);			//Added by Mugendai for I'm Alive mod
-		} else if(strcmpi(w1,"imalive_time")==0){	//Added by Mugendai for I'm Alive mod
-			imalive_time = atoi(w2);		//Added by Mugendai for I'm Alive mod
-		} else if(strcmpi(w1,"flush_on")==0){		//Added by Mugendai for GUI
-			flush_on = atoi(w2);			//Added by Mugendai for GUI
-		} else if(strcmpi(w1,"flush_time")==0){		//Added by Mugendai for GUI
-			flush_time = atoi(w2);			//Added by Mugendai for GUI
-		} else if(strcmpi(w1,"log_char")==0){		//log char or not [devil]
-			log_char = atoi(w2);
-		} else if (strcmpi(w1, "unknown_char_name") == 0) {
-			strcpy(unknown_char_name, w2);
-			unknown_char_name[24] = 0;
-		} else if (strcmpi(w1, "name_ignoring_case") == 0) {
-			name_ignoring_case = config_switch(w2);
-		} else if (strcmpi(w1, "char_name_option") == 0) {
-			char_name_option = atoi(w2);
-		} else if (strcmpi(w1, "char_name_letters") == 0) {
-			strcpy(char_name_letters, w2);
-		} else if (strcmpi(w1, "check_ip_flag") == 0) {
-			check_ip_flag = config_switch(w2);
-                } 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) {
-			    if(strcmpi(w2,"on") == 0 || strcmpi(w2,"yes") == 0 )
-			        console = 1;
-        }
-	}
-	fclose(fp);
-
-	return 0;
-}
-
-//-----------------------------------------------------
-//I'm Alive Alert
-//Used to output 'I'm Alive' every few seconds
-//Intended to let frontends know if the app froze
-//-----------------------------------------------------
-int imalive_timer(int tid, unsigned int tick, int id, int data){
-	printf("I'm Alive\n");
-	return 0;
-}
-
-//-----------------------------------------------------
-//Flush stdout
-//stdout buffer needs flushed to be seen in GUI
-//-----------------------------------------------------
-int flush_timer(int tid, unsigned int tick, int id, int data){
-	fflush(stdout);
-	return 0;
-}
-
-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;
-	}
-
-	char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
-	char_lan_config_read((argc > 1) ? argv[1] : LAN_CONF_NAME);
-	sql_config_read(SQL_CONF_NAME);
-
-	printf("charserver configuration reading done.....\n");
-
-	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");
-
-	printf("set parser -> parse_char().....\n");
-	set_defaultparse(parse_char);
-
-	printf("set terminate function -> do_final().....\n");
-	set_termfunc(do_final);
-
-        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]);
-          if (naddr_ != 1)
-            printf("Multiple interfaces detected..  using %s as our IP address\n", buf);
-          else
-            printf("Defaulting to %s as our IP address\n", buf);
-          if (login_ip_set_ == 0)
-          	strcpy(login_ip_str, buf);
-          if (char_ip_set_ == 0)
-          	strcpy(char_ip_str, buf);
-
-          if (ptr[0] == 192 && ptr[1] == 168)
-            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);
-
-	//Added for Mugendais I'm Alive mod
-	if(imalive_on)
-		add_timer_interval(gettick()+10, imalive_timer,0,0,imalive_time*1000);
-
-	//Added by Mugendai for GUI support
-	if(flush_on)
-		add_timer_interval(gettick()+10, flush_timer,0,0,flush_time);
-
-	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 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
deleted file mode 100644
index 6ade96c36..000000000
--- a/src/char_sql/char.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "../common/core.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/mmo.h"
-#include "../common/version.h"
-#include "../common/db.h"
-
-#ifndef _CHAR_H_
-#define _CHAR_H_
-
-#define MAX_MAP_SERVERS 30
-
-#define LAN_CONF_NAME	"conf/lan_support.conf"
-
-#define DEFAULT_AUTOSAVE_INTERVAL 300*1000
-
-struct mmo_map_server{
-  long ip;
-  short port;
-  int users;
-  char map[MAX_MAP_PER_SERVER][16];
-};
-struct itemtmp {
-	int flag;//checked = 1 else 0
-	int id;
-	short nameid;
-	short amount;
-	unsigned short equip;
-	char identify;
-	char refine;
-	char attribute;
-	short card[4];
-};
-enum {
-	TABLE_INVENTORY,
-	TABLE_CART,
-	TABLE_STORAGE,
-	TABLE_GUILD_STORAGE,
-};
-struct itemtemp{
-	struct itemtmp equip[MAX_GUILD_STORAGE],notequip[MAX_GUILD_STORAGE];
-};
-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];
-extern char cart_db[256];
-extern char inventory_db[256];
-extern char charlog_db[256];
-extern char storage_db[256];
-extern char interlog_db[256];
-extern char reg_db[256];
-extern char skill_db[256];
-extern char memo_db[256];
-extern char guild_db[256];
-extern char guild_alliance_db[256];
-extern char guild_castle_db[256];
-extern char guild_expulsion_db[256];
-extern char guild_member_db[256];
-extern char guild_position_db[256];
-extern char guild_skill_db[256];
-extern char guild_storage_db[256];
-extern char party_db[256];
-extern char pet_db[256];
-
-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);
-
-#endif
-
-#include "inter.h"
-#include "int_pet.h"
-#include "int_guild.h"
-#include "int_party.h"
-#include "int_storage.h"
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
deleted file mode 100644
index 794f2e01f..000000000
--- a/src/char_sql/int_guild.c
+++ /dev/null
@@ -1,1719 +0,0 @@
-//
-// original code from athena
-// SQL conversion by hack
-//
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "char.h"
-#include "../common/strlib.h"
-#include "int_storage.h"
-#include "inter.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "mmo.h"
-#include "socket.h"
-#include "db.h"
-#include "malloc.h"
-
-static struct dbt *guild_db_;
-static struct dbt *castle_db_;
-
-static struct guild *guild_pt;
-static struct guild *guild_pt2;
-static struct guild_castle * guildcastle_pt;
-static int guild_newid=10000;
-
-static int guild_exp[100];
-
-int mapif_parse_GuildLeave(int fd,int guild_id,int account_id,int char_id,int flag,const char *mes);
-int mapif_guild_broken(int guild_id,int flag);
-int guild_check_empty(struct guild *g);
-int guild_calcinfo(struct guild *g);
-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)
-{
-	// 1 `guild` (`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`)
-	// 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`)
-	// 32 `guild_skill` (`guild_id`,`id`,`lv`)
-
-	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 i=0;
-	int guild_exist=0,guild_member=0,guild_online_member=0;
-
-	if (g->guild_id<=0) return -1;
-
-	printf("(\033[1;35m%d\033[0m)  Request save guild -(flag 0x%x) ",g->guild_id, flag);
-
-	jstrescapecpy(t_name, g->name);
-
-	//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){
-		//	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);
-			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);
-			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);
-			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);
-			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);
-			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);
-			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);
-			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);
-		}
-	}
-
-	guild_online_member = 0;
-	i=0;
-	while (i<g->max_member) {
-		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);
-		return -2;
-	}
-
-	// Insert new guild to sqlserver
-	if (flag&1||guild_member==0){
-		int len=0;
-		//printf("- Insert guild %d to guild\n",g->guild_id);
-		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);
-		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')",
-			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 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){
-		//printf("- Insert guild %d to guild_position\n",g->guild_id);
-		for(i=0;i<MAX_GUILDPOSITION;i++){
-			struct guild_position *p = &g->position[i];
-			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) );
-			}
-		}
-	}
-
-	if (flag&8||guild_member==0){
-		//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){
-				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) );
-				}
-			}
-		}
-	}
-
-	if (flag&16||guild_member==0){
-		//printf("- Insert guild %d to guild_expulsion\n",g->guild_id);
-		for(i=0;i<MAX_GUILDEXPLUSION;i++){
-			struct guild_explusion *e=&g->explusion[i];
-			if(e->account_id>0){
-				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) );
-				}
-			}
-		}
-	}
-
-	if (flag&32||guild_member==0){
-		//printf("- Insert guild %d to guild_skill\n",g->guild_id);
-		for(i=0;i<MAX_GUILDSKILL;i++){
-			if (g->skill[i].id>0){
-				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) );
-				}
-			}
-		}
-	}
-
-	printf("Save guild done\n");
-	return 0;
-}
-
-// Read guild from sql
-struct guild * inter_guild_fromsql(int guild_id)
-{
-	int i;
-	char emblem_data[4096];
-	char *pstr;
-	struct guild *g;
-
-	if (guild_id<=0) return 0;
-
-	g = (struct guild*)numdb_search(guild_db_,guild_id);
-	if (g != NULL)
-		return g;
-
-	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);
-
-	sprintf(tmp_sql,"SELECT `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` "
-		"FROM `%s` WHERE `guild_id`='%d'",guild_db, 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) );
-		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);
-			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]);
-                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]);
-		g->skill_point=atoi(sql_row[9]);
-		g->castle_id=atoi(sql_row[10]);
-		strncpy(g->mes1,sql_row[11],60);
-		strncpy(g->mes2,sql_row[12],120);
-		g->emblem_len=atoi(sql_row[13]);
-		g->emblem_id=atoi(sql_row[14]);
-		strncpy(emblem_data,sql_row[15],4096);
-		for(i=0,pstr=emblem_data;i<g->emblem_len;i++,pstr+=2){
-			int c1=pstr[0],c2=pstr[1],x1=0,x2=0;
-			if(c1>='0' && c1<='9')x1=c1-'0';
-			if(c1>='a' && c1<='f')x1=c1-'a'+10;
-			if(c1>='A' && c1<='F')x1=c1-'A'+10;
-			if(c2>='0' && c2<='9')x2=c2-'0';
-			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);
-
-	//printf("- Read guild_member %d from sql \n",guild_id);
-	sprintf(tmp_sql,"SELECT `guild_id`,`account_id`,`char_id`,`hair`,`hair_color`,`gender`,`class`,`lv`,`exp`,`exp_payper`,`online`,`position`,`rsv1`,`rsv2`,`name` "
-		"FROM `%s` WHERE `guild_id`='%d'  ORDER BY `position`", guild_member_db, 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) );
-		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<g->max_member);i++){
-			struct guild_member *m = &g->member[i];
-			m->account_id=atoi(sql_row[1]);
-			m->char_id=atoi(sql_row[2]);
-			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->lv=atoi(sql_row[7]);
-			m->exp=atoi(sql_row[8]);
-			m->exp_payper=atoi(sql_row[9]);
-                        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) );
-		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]);
-			struct guild_position *p = &g->position[position];
-			strncpy(p->name,sql_row[2],24);
-			p->mode=atoi(sql_row[3]);
-			p->exp_mode=atoi(sql_row[4]);
-		}
-	}
-	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) );
-		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_GUILDALLIANCE);i++){
-			struct guild_alliance *a = &g->alliance[i];
-			a->opposition=atoi(sql_row[1]);
-			a->guild_id=atoi(sql_row[2]);
-			strncpy(a->name,sql_row[3],24);
-		}
-	}
-	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) );
-		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_GUILDEXPLUSION);i++){
-			struct guild_explusion *e = &g->explusion[i];
-
-			strncpy(e->name,sql_row[1],24);
-			strncpy(e->mes,sql_row[2],40);
-			strncpy(e->acc,sql_row[3],24);
-			e->account_id=atoi(sql_row[4]);
-			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) );
-		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_GUILDSKILL);i++){
-			g->skill[i].id=atoi(sql_row[1]);
-			g->skill[i].lv=atoi(sql_row[2]);
-		}
-	}
-	mysql_free_result(sql_res);
-
-//	printf("Successfully retrieve guild information from sql!\n");
-
-	numdb_insert(guild_db_, guild_id,g);
-
-	return g;
-}
-
-#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)
-{
-        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;
-	}
-	//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`)"
-		"VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d')", 
-		guild_castle_db, gc->castle_id, gc->guild_id,  gc->economy, gc->defense, gc->triggerE, gc->triggerD, gc->nextTime, gc->payTime, 
-		gc->createTime, gc->visibleC, 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;
-	}
-
-        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");
-
-	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`, "
-		"`visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`,"
-		"`Ghp0`, `Ghp1`, `Ghp2`, `Ghp3`, `Ghp4`, `Ghp5`, `Ghp6`, `Ghp7`"
-        	" FROM `%s` WHERE `castle_id`='%d'",guild_castle_db, castle_id);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error - %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);
-		if (sql_row==NULL){
-			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]);
-		gc->triggerE = atoi (sql_row[4]);
-		gc->triggerD = atoi (sql_row[5]);
-		gc->nextTime = atoi (sql_row[6]);
-		gc->payTime = atoi (sql_row[7]);
-		gc->createTime = atoi (sql_row[8]);
-		gc->visibleC = atoi (sql_row[9]);
-		gc->visibleG0 = atoi (sql_row[10]);
-		gc->visibleG1 = atoi (sql_row[11]);
-		gc->visibleG2 = atoi (sql_row[12]);
-		gc->visibleG3 = atoi (sql_row[13]);
-		gc->visibleG4 = atoi (sql_row[14]);
-		gc->visibleG5 = atoi (sql_row[15]);
-		gc->visibleG6 = atoi (sql_row[16]);
-		gc->visibleG7 = atoi (sql_row[17]);
-		gc->Ghp0 = atoi (sql_row[18]);
-		gc->Ghp1 = atoi (sql_row[19]);
-		gc->Ghp2 = atoi (sql_row[20]);
-		gc->Ghp3 = atoi (sql_row[21]);
-		gc->Ghp4 = atoi (sql_row[22]);
-		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;
-}
-
-// Read exp_guild.txt
-int inter_guild_readdb()
-{
-	int i;
-	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");
-		return 1;
-	}
-	i=0;
-	while(fgets(line,256,fp) && i<100){
-		if(line[0]=='/' && line[1]=='/')
-			continue;
-		guild_exp[i]=atoi(line);
-		i++;
-	}
-	fclose(fp);
-
-	return 0;
-}
-
-
-// Initialize guild sql
-int inter_guild_sql_init()
-{
-	int i;
-
-        guild_db_=numdb_init();
-        castle_db_=numdb_init();
-
-	printf("interserver guild memory initialize.... (%d byte)\n",sizeof(struct guild));
-	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) );
-		exit(0);
-	}
-	sql_res = mysql_store_result(&mysql_handle) ;
-	sql_row = mysql_fetch_row(sql_res);
-	printf("total guild data -> '%s'.......\n",sql_row[0]);
-	i = atoi (sql_row[0]);
-	mysql_free_result(sql_res);
-
-	if (i > 0) {
-		//set party_newid
-		sprintf (tmp_sql , "SELECT max(`guild_id`) FROM `%s`",guild_db);
-		if(mysql_query(&mysql_handle, tmp_sql) ) {
-			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)
-{
-	char t_name[24];
-	int guild_id=0;
-	printf("search_guildname\n");
-	sprintf (tmp_sql , "SELECT `guild_id` FROM `%s` WHERE `name`='%s'",guild_db, jstrescapecpy(t_name,str));
-	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!=NULL && mysql_num_rows(sql_res)>0) {
-		sql_row = mysql_fetch_row(sql_res);
-		guild_id = atoi (sql_row[0]);
-	}
-	mysql_free_result(sql_res);
-	return inter_guild_fromsql(guild_id);
-}
-
-// Check if guild is empty
-int guild_check_empty(struct guild *g)
-{
-	int i;
-	for(i=0;i<g->max_member;i++){
-		if(g->member[i].account_id>0){
-			return 0;
-		}
-	}
-
-	// 誰もいないので解散
-	mapif_guild_broken(g->guild_id,0);
-	inter_guild_storage_delete(g->guild_id);
-	inter_guild_tosql(g,255);
-	memset(g,0,sizeof(struct guild));
-	return 1;
-}
-
-int guild_nextexp(int level)
-{
-	if(level < 100 && level >0) // Change by hack
-		return guild_exp[level-1];
-
-	return 0;
-}
-
-// ギルドスキルがあるか確認
-int guild_checkskill(struct guild *g,int id) {
-
-	int idx = id - GD_SKILLBASE;
-
-
-	if(idx < 0 || idx >= MAX_GUILDSKILL)
-
-		return 0;
-
-	return g->skill[idx].lv;
-
-}
-
-// ギルドの情報の再計算
-int guild_calcinfo(struct guild *g)
-{
-	int i,c,nextexp;
-	struct guild before=*g;
-
-	// スキルIDの設定
-	for(i=0;i<MAX_GUILDSKILL;i++)
-		g->skill[i].id=i+GD_SKILLBASE;
-
-	// ギルドレベル
-	if(g->guild_lv<=0) g->guild_lv=1;
-	nextexp = guild_nextexp(g->guild_lv);
-	if(nextexp > 0) {
-		while(g->exp >= nextexp && nextexp>0){	// Change by hack
-			g->exp-=nextexp;
-			g->guild_lv++;
-			g->skill_point++;
-			nextexp = guild_nextexp(g->guild_lv);
-		}
-	}
-
-	// ギルドの次の経験値
-	g->next_exp = guild_nextexp(g->guild_lv);
-
-	// メンバ上限（ギルド拡張適用）
-	g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 6; //  Guild Extention skill - adds by 6 people per level to Max Member [Lupus]
-
-	// 平均レベルとオンライン人数
-	g->average_lv=0;
-	g->connect_member=0;
-	for(i=c=0;i<g->max_member;i++){
-		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		||
-		g->skill_point!=before.skill_point	){
-		mapif_guild_info(-1,g);
-		return 1;
-	}
-
-	return 0;
-}
-
-//-------------------------------------------------------------------
-// map serverへの通信
-
-// ギルド作成可否
-int mapif_guild_created(int fd,int account_id,struct guild *g)
-{
-	WFIFOW(fd,0)=0x3830;
-	WFIFOL(fd,2)=account_id;
-	if(g!=NULL){
-		WFIFOL(fd,6)=g->guild_id;
-		printf("int_guild: created! %d %s\n",g->guild_id,g->name);
-	}else{
-		WFIFOL(fd,6)=0;
-	}
-	WFIFOSET(fd,10);
-	return 0;
-}
-// ギルド情報見つからず
-int mapif_guild_noinfo(int fd,int guild_id)
-{
-	WFIFOW(fd,0)=0x3831;
-	WFIFOW(fd,2)=8;
-	WFIFOL(fd,4)=guild_id;
-	WFIFOSET(fd,8);
-	printf("int_guild: info not found %d\n",guild_id);
-	return 0;
-}
-// ギルド情報まとめ送り
-int mapif_guild_info(int fd,struct guild *g)
-{
-	unsigned char buf[16384];
-	WBUFW(buf,0)=0x3831;
-	memcpy(buf+4,g,sizeof(struct guild));
-	WBUFW(buf,2)=4+sizeof(struct guild);
-//	printf("int_guild: sizeof(guild)=%d\n",sizeof(struct guild));
-	if(fd<0)
-		mapif_sendall(buf,WBUFW(buf,2));
-	else
-		mapif_send(fd,buf,WBUFW(buf,2));
-//	printf("int_guild: info %d %s\n",p->guild_id,p->name);
-	return 0;
-}
-
-// メンバ追加可否
-int mapif_guild_memberadded(int fd,int guild_id,int account_id,int char_id,int flag)
-{
-	WFIFOW(fd,0)=0x3832;
-	WFIFOL(fd,2)=guild_id;
-	WFIFOL(fd,6)=account_id;
-	WFIFOL(fd,10)=char_id;
-	WFIFOB(fd,14)=flag;
-	WFIFOSET(fd,15);
-	return 0;
-}
-// 脱退/追放通知
-int mapif_guild_leaved(int guild_id,int account_id,int char_id,int flag,
-	const char *name,const char *mes)
-{
-	unsigned char buf[128];
-	WBUFW(buf, 0)=0x3834;
-	WBUFL(buf, 2)=guild_id;
-	WBUFL(buf, 6)=account_id;
-	WBUFL(buf,10)=char_id;
-	WBUFB(buf,14)=flag;
-	memcpy(WBUFP(buf,15),mes,40);
-	memcpy(WBUFP(buf,55),name,24);
-	mapif_sendall(buf,79);
-	printf("int_guild: guild leaved %d %d %s %s\n",guild_id,account_id,name,mes);
-	return 0;
-}
-
-// オンライン状態とLv更新通知
-int mapif_guild_memberinfoshort(struct guild *g,int idx)
-{
-	unsigned char buf[32];
-	WBUFW(buf, 0)=0x3835;
-	WBUFL(buf, 2)=g->guild_id;
-	WBUFL(buf, 6)=g->member[idx].account_id;
-	WBUFL(buf,10)=g->member[idx].char_id;
-	WBUFB(buf,14)=(unsigned char)g->member[idx].online;
-	WBUFW(buf,15)=g->member[idx].lv;
-	WBUFW(buf,17)=g->member[idx].class_;
-	mapif_sendall(buf,19);
-	return 0;
-}
-
-// 解散通知
-int mapif_guild_broken(int guild_id,int flag)
-{
-	unsigned char buf[16];
-	WBUFW(buf,0)=0x3836;
-	WBUFL(buf,2)=guild_id;
-	WBUFB(buf,6)=flag;
-	mapif_sendall(buf,7);
-	printf("int_guild: broken %d\n",guild_id);
-	return 0;
-}
-
-// ギルド内発言
-int mapif_guild_message(int guild_id,int account_id,char *mes,int len, int sfd)
-{
-	unsigned char buf[512];
-	WBUFW(buf,0)=0x3837;
-	WBUFW(buf,2)=len+12;
-	WBUFL(buf,4)=guild_id;
-	WBUFL(buf,8)=account_id;
-	memcpy(WBUFP(buf,12),mes,len);
-	mapif_sendallwos(sfd, buf,len+12);
-	return 0;
-}
-
-// ギルド基本情報変更通知
-int mapif_guild_basicinfochanged(int guild_id,int type,const void *data,int len)
-{
-	unsigned char buf[2048];
-	WBUFW(buf, 0)=0x3839;
-	WBUFW(buf, 2)=len+10;
-	WBUFL(buf, 4)=guild_id;
-	WBUFW(buf, 8)=type;
-	memcpy(WBUFP(buf,10),data,len);
-	mapif_sendall(buf,len+10);
-	return 0;
-}
-// ギルドメンバ情報変更通知
-int mapif_guild_memberinfochanged(int guild_id,int account_id,int char_id,
-	int type,const void *data,int len)
-{
-	unsigned char buf[2048];
-	WBUFW(buf, 0)=0x383a;
-	WBUFW(buf, 2)=len+18;
-	WBUFL(buf, 4)=guild_id;
-	WBUFL(buf, 8)=account_id;
-	WBUFL(buf,12)=char_id;
-	WBUFW(buf,16)=type;
-	memcpy(WBUFP(buf,18),data,len);
-	mapif_sendall(buf,len+18);
-	return 0;
-}
-// ギルドスキルアップ通知
-int mapif_guild_skillupack(int guild_id,int skill_num,int account_id)
-{
-	unsigned char buf[16];
-	WBUFW(buf, 0)=0x383c;
-	WBUFL(buf, 2)=guild_id;
-	WBUFL(buf, 6)=skill_num;
-	WBUFL(buf,10)=account_id;
-	mapif_sendall(buf,14);
-	return 0;
-}
-// ギルド同盟/敵対通知
-int mapif_guild_alliance(int guild_id1,int guild_id2,int account_id1,int account_id2,
-	int flag,const char *name1,const char *name2)
-{
-	unsigned char buf[128];
-	WBUFW(buf, 0)=0x383d;
-	WBUFL(buf, 2)=guild_id1;
-	WBUFL(buf, 6)=guild_id2;
-	WBUFL(buf,10)=account_id1;
-	WBUFL(buf,14)=account_id2;
-	WBUFB(buf,18)=flag;
-	memcpy(WBUFP(buf,19),name1,24);
-	memcpy(WBUFP(buf,43),name2,24);
-	mapif_sendall(buf,67);
-	return 0;
-}
-
-// ギルド役職変更通知
-int mapif_guild_position(struct guild *g,int idx)
-{
-	unsigned char buf[128];
-	WBUFW(buf,0)=0x383b;
-	WBUFW(buf,2)=sizeof(struct guild_position)+12;
-	WBUFL(buf,4)=g->guild_id;
-	WBUFL(buf,8)=idx;
-	memcpy(WBUFP(buf,12),&g->position[idx],sizeof(struct guild_position));
-	mapif_sendall(buf,WBUFW(buf,2));
-	return 0;
-}
-
-// ギルド告知変更通知
-int mapif_guild_notice(struct guild *g)
-{
-	unsigned char buf[256];
-	WBUFW(buf,0)=0x383e;
-	WBUFL(buf,2)=g->guild_id;
-	memcpy(WBUFP(buf,6),g->mes1,60);
-	memcpy(WBUFP(buf,66),g->mes2,120);
-	mapif_sendall(buf,186);
-	return 0;
-}
-// ギルドエンブレム変更通知
-int mapif_guild_emblem(struct guild *g)
-{
-	unsigned char buf[2048];
-	WBUFW(buf,0)=0x383f;
-	WBUFW(buf,2)=g->emblem_len+12;
-	WBUFL(buf,4)=g->guild_id;
-	WBUFL(buf,8)=g->emblem_id;
-	memcpy(WBUFP(buf,12),g->emblem_data,g->emblem_len);
-	mapif_sendall(buf,WBUFW(buf,2));
-	return 0;
-}
-
-int mapif_guild_castle_dataload(int castle_id,int index,int value)      // <Agit>
-{
-	unsigned char buf[16];
-	WBUFW(buf, 0)=0x3840;
-	WBUFW(buf, 2)=castle_id;
-	WBUFB(buf, 4)=index;
-	WBUFL(buf, 5)=value;
-	mapif_sendall(buf,9);
-	return 0;
-}
-
-int mapif_guild_castle_datasave(int castle_id,int index,int value)      // <Agit>
-{
-	unsigned char buf[16];
-	WBUFW(buf, 0)=0x3841;
-	WBUFW(buf, 2)=castle_id;
-	WBUFB(buf, 4)=index;
-	WBUFL(buf, 5)=value;
-	mapif_sendall(buf,9);
-	return 0;
-}
-
-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;
-	sprintf(tmp_sql, "SELECT * FROM `%s` ORDER BY `castle_id`", guild_castle_db);
-	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 != NULL && mysql_num_rows(sql_res) > 0) {
-		for(i = 0; ((sql_row = mysql_fetch_row(sql_res)) && i < MAX_GUILDCASTLE); i++) {
-			memset(gc, 0, sizeof(struct guild_castle));
-			gc->castle_id = atoi(sql_row[0]);
-			gc->guild_id =  atoi(sql_row[1]);
-			gc->economy = atoi(sql_row[2]);
-			gc->defense = atoi(sql_row[3]);
-			gc->triggerE = atoi(sql_row[4]);
-			gc->triggerD = atoi(sql_row[5]);
-			gc->nextTime = atoi(sql_row[6]);
-			gc->payTime = atoi(sql_row[7]);
-			gc->createTime = atoi(sql_row[8]);
-			gc->visibleC = atoi(sql_row[9]);
-			gc->visibleG0 = atoi(sql_row[10]);
-			gc->visibleG1 = atoi(sql_row[11]);
-			gc->visibleG2 = atoi(sql_row[12]);
-			gc->visibleG3 = atoi(sql_row[13]);
-			gc->visibleG4 = atoi(sql_row[14]);
-			gc->visibleG5 = atoi(sql_row[15]);
-			gc->visibleG6 = atoi(sql_row[16]);
-			gc->visibleG7 = atoi(sql_row[17]);
-			gc->Ghp0 = atoi(sql_row[18]);
-			gc->Ghp1 = atoi(sql_row[19]);
-			gc->Ghp2 = atoi(sql_row[20]);
-			gc->Ghp3 = atoi(sql_row[21]);
-			gc->Ghp4 = atoi(sql_row[22]);
-			gc->Ghp5 = atoi(sql_row[23]);
-			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);
-		}
-	}
-	mysql_free_result(sql_res);
-	WFIFOW(fd,2) = len;
-	WFIFOSET(fd,len);
-
-	return 0;
-}
-
-
-//-------------------------------------------------------------------
-// map serverからの通信
-
-
-// ギルド作成要求
-int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member *master)
-{
-	struct guild *g;
-	int i;
-
-	printf("CreateGuild\n");
-	g=search_guildname(name);
-	if(g!=NULL&&g->guild_id>0){
-		printf("int_guild: same name guild exists [%s]\n",name);
-		mapif_guild_created(fd,account_id,NULL);
-		return 0;
-	}
-	g=guild_pt;
-	memset(g,0,sizeof(struct guild));
-	g->guild_id=guild_newid++;
-	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[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
-int mapif_parse_GuildInfo(int fd,int guild_id)
-{
-	struct guild * g = inter_guild_fromsql(guild_id);
-	if(g!=NULL&&g->guild_id>0){
-		guild_calcinfo(g);
-		mapif_guild_info(fd,g);
-		//inter_guild_tosql(g,1); // Change guild
-	}else
-		mapif_guild_noinfo(fd,guild_id);
-	return 0;
-}
-// Add member to guild
-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);
-			mapif_guild_info(-1,g);
-			inter_guild_tosql(g,3); // Change guild & guild_member
-			return 0;
-		}
-	}
-	mapif_guild_memberadded(fd,guild_id,m->account_id,m->char_id,1);
-	//inter_guild_tosql(g,3); // Change guild & guild_member
-	return 0;
-}
-// Delete member from guild
-int mapif_parse_GuildLeave(int fd,int guild_id,int account_id,int char_id,int flag,const char *mes)
-{
-	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++){
-			if( g->member[i].account_id==account_id &&
-				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++){
-						if(g->explusion[j].account_id==0)
-							break;
-					}
-					if(j==MAX_GUILDEXPLUSION){	// 一杯なので古いのを消す
-						for(j=0;j<MAX_GUILDEXPLUSION-1;j++)
-							g->explusion[j]=g->explusion[j+1];
-						j=MAX_GUILDEXPLUSION-1;
-					}
-					g->explusion[j].account_id=account_id;
-					memcpy(g->explusion[j].acc,"dummy",24);
-					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();	// 解散したので一営Zーブ
-				return 0;*/
-			}
-		}
-		guild_calcinfo(g);
-		inter_guild_tosql(g,19); // Change guild & guild_member & guild_expulsion
-	}else{
-		sprintf(tmp_sql, "UPDATE `%s` SET `guild_id`='0' WHERE `account_id`='%d' AND `char_id`='%d'",char_db, account_id,char_id);
-		if(mysql_query(&mysql_handle, tmp_sql) ) {
-			printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle) );
-		}
-		/* 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_)
-{
-	// Could speed up by manipulating only guild_member
-	struct guild * g= inter_guild_fromsql(guild_id);
-	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_;
-			mapif_guild_memberinfoshort(g,i);
-			idx = i;
-		}
-		if( g->member[i].account_id>0 ){
-			alv+=g->member[i].lv;
-			c++;
-		}
-		if( g->member[i].online )
-			g->connect_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;
-}
-
-// BreakGuild
-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);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error (delete `guild`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	//printf("- Delete guild %d from guild_member\n",guild_id);
-	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_member_db, guild_id);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error (delete `guild_member`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	//printf("- Delete guild %d from guild_skill\n",guild_id);
-	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_skill_db, guild_id);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error (delete `guild_skill`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	//printf("- Delete guild %d from guild_position\n",guild_id);
-	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_position_db, 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_expulsion\n",guild_id);
-	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_expulsion_db, guild_id);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error (delete `guild_expulsion`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	//printf("- Delete guild %d from guild_alliance\n",guild_id);
-	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d' OR `alliance_id`='%d'",guild_alliance_db, guild_id,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, fd);
-}
-// ギルド基本データ変更要求
-int mapif_parse_GuildBasicInfoChange(int fd,int guild_id,
-	int type,const char *data,int len)
-{
-	struct guild * g = inter_guild_fromsql(guild_id);
-//	int dd=*((int *)data);
-	short dw=*((short *)data);
-
-	if(g==NULL||g->guild_id<=0)
-		return 0;
-	switch(type){
-	case GBI_GUILDLV: {
-		printf("GBI_GUILDLV\n");
-			if(dw>0 && g->guild_lv+dw<=50){
-				g->guild_lv+=dw;
-				g->skill_point+=dw;
-			}else if(dw<0 && g->guild_lv+dw>=1)
-				g->guild_lv+=dw;
-			mapif_guild_info(-1,g);
-			inter_guild_tosql(g,1);
-		} return 0;
-	default:
-		printf("int_guild: GuildBasicInfoChange: Unknown type %d\n",type);
-		break;
-	}
-	mapif_guild_basicinfochanged(guild_id,type,data,len);
-	//inter_guild_tosql(g,1); // Change guild
-	return 0;
-}
-
-// ギルドメンバデータ変更要求
-int mapif_parse_GuildMemberInfoChange(int fd,int guild_id,int account_id,int char_id,
-	int type,const char *data,int len)
-{
-	// Could make some improvement in speed, because only change guild_member
-	int i;
-	struct guild * g = inter_guild_fromsql(guild_id);
-
-	//printf("GuildMemberInfoChange %s \n",(type==GMI_EXP)?"GMI_EXP":"OTHER");
-
-	if(g==NULL){
-		return 0;
-	}
-	for(i=0;i<g->max_member;i++)
-		if(	g->member[i].account_id==account_id &&
-			g->member[i].char_id==char_id )
-				break;
-	if(i==g->max_member){
-		printf("int_guild: GuildMemberChange: Not found %d,%d in %d[%s]\n",
-			account_id,char_id,guild_id,g->name);
-		return 0;
-	}
-	switch(type){
-	case GMI_POSITION:	// 役職
-	  {
-	    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;
-	}
-	return 0;
-}
-
-// ギルド役職名変更要求
-int mapif_parse_GuildPosition(int fd,int guild_id,int idx,struct guild_position *p)
-{
-	// Could make some improvement in speed, because only change guild_position
-	struct guild * g = inter_guild_fromsql(guild_id);
-
-	if(g==NULL || idx<0 || idx>=MAX_GUILDPOSITION){
-		return 0;
-	}
-	memcpy(&g->position[idx],p,sizeof(struct guild_position));
-	mapif_guild_position(g,idx);
-	printf("int_guild: position changed %d\n",idx);
-	inter_guild_tosql(g,4); // Change guild_position
-	return 0;
-}
-// ギルドスキルアップ要求
-int mapif_parse_GuildSkillUp(int fd,int guild_id,int skill_num,int account_id)
-{
-	// Could make some improvement in speed, because only change guild_position
-	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++;
-		g->skill_point--;
-		if(guild_calcinfo(g)==0)
-			mapif_guild_info(-1,g);
-		mapif_guild_skillupack(guild_id,skill_num,account_id);
-		printf("int_guild: skill %d up\n",skill_num);
-		inter_guild_tosql(g,33); // Change guild & guild_skill
-	}
-
-	return 0;
-}
-// ギルド同盟要求
-int mapif_parse_GuildAlliance(int fd,int guild_id1,int guild_id2,
-	int account_id1,int account_id2,int flag)
-{
-	// Could speed up
-	struct guild *g[2];
-	int j,i;
-	g[0]= inter_guild_fromsql(guild_id1);
-	g[1]= inter_guild_fromsql(guild_id2);
-
-	if(g[0]==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++)
-				if(g[i]->alliance[j].guild_id==0){
-					g[i]->alliance[j].guild_id=g[1-i]->guild_id;
-					memcpy(g[i]->alliance[j].name,g[1-i]->name,24);
-					g[i]->alliance[j].opposition=flag&1;
-					break;
-				}
-		}
-	}else{	// 関係解消
-		for(i=0;i<2-(flag&1);i++){
-			for(j=0;j<MAX_GUILDALLIANCE;j++)
-				if(	g[i]->alliance[j].guild_id==g[1-i]->guild_id &&
-					g[i]->alliance[j].opposition==(flag&1)){
-					g[i]->alliance[j].guild_id=0;
-					break;
-				}
-		}
-	}
-	mapif_guild_alliance(guild_id1,guild_id2,account_id1,account_id2,flag,
-		g[0]->name,g[1]->name);
-	inter_guild_tosql(g[0],8); // Change guild_alliance
-	inter_guild_tosql(g[1],8); // Change guild_alliance
-	return 0;
-}
-// ギルド告知変更要求
-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);
-	memcpy(g->mes2,mes2,120);
-	inter_guild_tosql(g,1); // Change mes of guild
-	return mapif_guild_notice(g);
-}
-// ギルドエンブレム変更要求
-int mapif_parse_GuildEmblem(int fd,int len,int guild_id,int dummy,const char *data)
-{
-	struct guild * g= inter_guild_fromsql(guild_id);
-
-	if(g==NULL||g->guild_id<=0)
-		return 0;
-	memcpy(g->emblem_data,data,len);
-	g->emblem_len=len;
-	g->emblem_id++;
-	inter_guild_tosql(g,1); // Change guild
-	return mapif_guild_emblem(g);
-}
-
-int mapif_parse_GuildCastleDataLoad(int fd,int castle_id,int index)     // <Agit>
-{
-	struct guild_castle *gc=guildcastle_pt;
-	inter_guildcastle_fromsql(castle_id, gc);
-	if(gc==NULL||gc->castle_id==-1){
-		return mapif_guild_castle_dataload(castle_id,0,0);
-	}
-	switch(index){
-	case 1: return mapif_guild_castle_dataload(gc->castle_id,index,gc->guild_id); break;
-	case 2: return mapif_guild_castle_dataload(gc->castle_id,index,gc->economy); break;
-	case 3: return mapif_guild_castle_dataload(gc->castle_id,index,gc->defense); break;
-	case 4: return mapif_guild_castle_dataload(gc->castle_id,index,gc->triggerE); break;
-	case 5: return mapif_guild_castle_dataload(gc->castle_id,index,gc->triggerD); break;
-	case 6: return mapif_guild_castle_dataload(gc->castle_id,index,gc->nextTime); break;
-	case 7: return mapif_guild_castle_dataload(gc->castle_id,index,gc->payTime); break;
-	case 8: return mapif_guild_castle_dataload(gc->castle_id,index,gc->createTime); break;
-	case 9: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleC); break;
-	case 10: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleG0); break;
-	case 11: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleG1); break;
-	case 12: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleG2); break;
-	case 13: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleG3); break;
-	case 14: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleG4); break;
-	case 15: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleG5); break;
-	case 16: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleG6); break;
-	case 17: return mapif_guild_castle_dataload(gc->castle_id,index,gc->visibleG7); break;
-	case 18: return mapif_guild_castle_dataload(gc->castle_id,index,gc->Ghp0); break;	// guardian HP [Valaris]
-	case 19: return mapif_guild_castle_dataload(gc->castle_id,index,gc->Ghp1); break;
-	case 20: return mapif_guild_castle_dataload(gc->castle_id,index,gc->Ghp2); break;
-	case 21: return mapif_guild_castle_dataload(gc->castle_id,index,gc->Ghp3); break;
-	case 22: return mapif_guild_castle_dataload(gc->castle_id,index,gc->Ghp4); break;
-	case 23: return mapif_guild_castle_dataload(gc->castle_id,index,gc->Ghp5); break;
-	case 24: return mapif_guild_castle_dataload(gc->castle_id,index,gc->Ghp6); break;
-	case 25: return mapif_guild_castle_dataload(gc->castle_id,index,gc->Ghp7); break;	// end additions [Valaris]
-	default:
-		printf("mapif_parse_GuildCastleDataLoad ERROR!! (Not found index=%d)\n", index);
-		return 0;
-	}
-}
-
-int mapif_parse_GuildCastleDataSave(int fd,int castle_id,int index,int value)   // <Agit>
-{
-	struct guild_castle *gc=guildcastle_pt;
-	inter_guildcastle_fromsql(castle_id, gc);
-	if(gc==NULL||gc->castle_id==-1){
-		return mapif_guild_castle_datasave(castle_id,index,value);
-	}
-	switch(index){
-	case 1:
-		if( gc->guild_id!=value ){
-			int gid=(value)?value:gc->guild_id;
-			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", castle_id);
-		}
-		gc->guild_id = value;
-		break;
-	case 2: gc->economy = value; break;
-	case 3: gc->defense = value; break;
-	case 4: gc->triggerE = value; break;
-	case 5: gc->triggerD = value; break;
-	case 6: gc->nextTime = value; break;
-	case 7: gc->payTime = value; break;
-	case 8: gc->createTime = value; break;
-	case 9: gc->visibleC = value; break;
-	case 10: gc->visibleG0 = value; break;
-	case 11: gc->visibleG1 = value; break;
-	case 12: gc->visibleG2 = value; break;
-	case 13: gc->visibleG3 = value; break;
-	case 14: gc->visibleG4 = value; break;
-	case 15: gc->visibleG5 = value; break;
-	case 16: gc->visibleG6 = value; break;
-	case 17: gc->visibleG7 = value; break;
-	case 18: gc->Ghp0 = value; break;	// guardian HP [Valaris]
-	case 19: gc->Ghp1 = value; break;
-	case 20: gc->Ghp2 = value; break;
-	case 21: gc->Ghp3 = value; break;
-	case 22: gc->Ghp4 = value; break;
-	case 23: gc->Ghp5 = value; break;
-	case 24: gc->Ghp6 = value; break;
-	case 25: gc->Ghp7 = value; break;	// end additions [Valaris]
-	default:
-		printf("mapif_parse_GuildCastleDataSave ERROR!! (Not found index=%d)\n", index);
-		return 0;
-	}
-	inter_guildcastle_tosql(gc);
-	return mapif_guild_castle_datasave(gc->castle_id,index,value);
-}
-
-// ギルドチェック要求
-int mapif_parse_GuildCheck(int fd,int guild_id,int account_id,int char_id)
-{
-	// What does this mean? Check if belong to another guild?
-	return 0;
-}
-
-// map server からの通信
-// ・１パケットのみ解析すること
-// ・パケット長データはinter.cにセットしておくこと
-// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない
-// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない
-int inter_guild_parse_frommap(int fd)
-{
-	switch(RFIFOW(fd,0)){
-	case 0x3030: mapif_parse_CreateGuild(fd,RFIFOL(fd,4),(char*)RFIFOP(fd,8),(struct guild_member *)RFIFOP(fd,32)); break;
-	case 0x3031: mapif_parse_GuildInfo(fd,RFIFOL(fd,2)); break;
-	case 0x3032: mapif_parse_GuildAddMember(fd,RFIFOL(fd,4),(struct guild_member *)RFIFOP(fd,8)); break;
-	case 0x3034: mapif_parse_GuildLeave(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),(const char*)RFIFOP(fd,15)); break;
-	case 0x3035: mapif_parse_GuildChangeMemberInfoShort(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOW(fd,17)); break;
-	case 0x3036: mapif_parse_BreakGuild(fd,RFIFOL(fd,2)); break;
-	case 0x3037: mapif_parse_GuildMessage(fd,RFIFOL(fd,4),RFIFOL(fd,8),(char*)RFIFOP(fd,12),RFIFOW(fd,2)-12); break;
-	case 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),(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),(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;
-
-	default:
-		return 0;
-	}
-	return 1;
-}
-
-int inter_guild_mapif_init(int fd)
-{
-	return mapif_guild_castle_alldataload(fd);
-}
-
-// サーバーから脱退要求（キャラ削除用）
-int inter_guild_leave(int guild_id,int account_id,int char_id)
-{
-	return mapif_parse_GuildLeave(-1,guild_id,account_id,char_id,0,"**サーバー命令**");
-}
diff --git a/src/char_sql/int_guild.h b/src/char_sql/int_guild.h
deleted file mode 100644
index 8257cf8f6..000000000
--- a/src/char_sql/int_guild.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _INT_GUILD_H_
-#define _INT_GUILD_H_
-
-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);
-
-#endif
diff --git a/src/char_sql/int_party.c b/src/char_sql/int_party.c
deleted file mode 100644
index 430385110..000000000
--- a/src/char_sql/int_party.c
+++ /dev/null
@@ -1,777 +0,0 @@
-//
-// original code from athena
-// SQL conversion by hack
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "char.h"
-#include "../common/strlib.h"
-#include "socket.h"
-
-static struct party *party_pt;
-static int party_newid=100;
-
-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); // TBR
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error - %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);
-		party_exist =  atoi (sql_row[0]);
-		//printf("- Check if party %d exists : %s\n",party_id,party_exist==0?"No":"Yes");
-	}
-	mysql_free_result(sql_res) ; //resource free
-
-	if (party_exist >0){
-		// Check members in party
-		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;
-		}
-		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.
-			sprintf(tmp_sql,"DELETE FROM `%s` WHERE `party_id`='%d'",party_db, party_id);
-			if(mysql_query(&mysql_handle, tmp_sql) ) {
-				printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
-			}
-		//	printf("No member in party %d, break it \n",party_id);
-			memset(p, 0, sizeof(struct party));
-			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' 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);
-			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 {
-		// Add new party, if not exist
-		int i = 0;
-		while (i<MAX_PARTY&&((p->member[i].account_id>0&&p->member[i].leader==0)||(p->member[i].account_id<0))) i++;
-		if (i<MAX_PARTY) leader_id = p->member[i].account_id;
-		sprintf(tmp_sql,"INSERT INTO `%s`  (`party_id`, `name`, `exp`, `item`, `leader_id`) VALUES ('%d', '%s', '%d', '%d', '%d')",
-			party_db, party_id, t_name, p->exp, p->item,leader_id);
-		if(mysql_query(&mysql_handle, tmp_sql) ) {
-			printf("DB server Error (inset/update `party`)- %s\n", mysql_error(&mysql_handle) );
-			return 0;
-		}
-
-		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("Party save success\n");
-	return 0;
-
-}
-
-// Read party from mysql
-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); // 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);
-	//	printf("- Read party %d from MySQL\n",party_id);
-		p->party_id = party_id;
-		strcpy(p->name, sql_row[1]);
-		p->exp = atoi(sql_row[2]);
-		p->item = atoi(sql_row[3]);
-		leader_id = atoi(sql_row[4]);
-	} else {
-		mysql_free_result(sql_res);
-	//	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); // 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) {
-		int i;
-		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++){
-			struct party_member *m = &p->member[i];
-			m->account_id = atoi(sql_row[0]);
-			if (m->account_id == leader_id) m->leader = 1; else m->leader = 0;
-			strncpy(m->name,sql_row[1],sizeof(m->name));
-			m->lv = atoi(sql_row[2]);
-			strncpy(m->map,sql_row[3],sizeof(m->map));
-			m->online = atoi(sql_row[4]);
-		}
-	//	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 = (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) );
-	}
-	sql_res = mysql_store_result(&mysql_handle) ;
-	sql_row = mysql_fetch_row(sql_res);
-	printf("total party data -> '%s'.......\n",sql_row[0]);
-	i = atoi (sql_row[0]);
-	mysql_free_result(sql_res);
-
-	if (i > 0) {
-		//set party_newid
-		sprintf (tmp_sql , "SELECT max(`party_id`) FROM `%s`", party_db);
-		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
-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));
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-			printf("DB server Error (select `party`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	sql_res = mysql_store_result(&mysql_handle) ;
-	if (sql_res==NULL || mysql_num_rows(sql_res)<=0) { mysql_free_result(sql_res); return p; }
-	sql_row = mysql_fetch_row(sql_res);
-	p = party_pt;
-	p->party_id = atoi(sql_row[0]);
-	strcpy(p->name, sql_row[1]);
-	p->exp = atoi(sql_row[2]);
-	p->item = atoi(sql_row[3]);
-	leader_id = atoi(sql_row[4]);
-	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, p->party_id);
-	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) {
-		int i;
-		for(i=0;(sql_row = mysql_fetch_row(sql_res));i++){
-			struct party_member *m = &p->member[i];
-			m->account_id = atoi(sql_row[0]);
-			if (m->account_id == leader_id) m->leader = 1; else m->leader = 0;
-			strncpy(m->name,sql_row[1],sizeof(m->name));
-			m->lv = atoi(sql_row[2]);
-			strncpy(m->map,sql_row[3],sizeof(m->map));
-			m->online = atoi(sql_row[4]);
-		}
-		printf("- %d members found in party %d \n",i,p->party_id);
-	}
-	mysql_free_result(sql_res);
-
-	return p;
-}
-
-// EXP公平分配できるかチェック
-int party_check_exp_share(struct party *p)
-{
-        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)
-{
-	int i;
-	if (p==NULL||p->party_id==0) return 1;
-//	printf("party check empty %08X\n",(int)p);
-	for(i=0;i<MAX_PARTY;i++){
-//		printf("%d acc=%d\n",i,p->member[i].account_id);
-		if(p->member[i].account_id>0){
-			return 0;
-		}
-	}
-	// If there is no member, then break the party
-	mapif_party_broken(p->party_id,0);
-	inter_party_tosql(p->party_id,p);
-	return 1;
-}
-
-
-// Check if a member is in two party, not necessary :)
-int party_check_conflict(int party_id,int account_id,char *nick)
-{
-	return 0;
-}
-
-//-------------------------------------------------------------------
-// map serverへの通信
-
-// パーティ作成可否
-int mapif_party_created(int fd,int account_id,struct party *p)
-{
-	WFIFOW(fd,0)=0x3820;
-	WFIFOL(fd,2)=account_id;
-	if(p!=NULL){
-		WFIFOB(fd,6)=0;
-		WFIFOL(fd,7)=p->party_id;
-		memcpy(WFIFOP(fd,11),p->name,24);
-		printf("int_party: created! %d %s\n",p->party_id,p->name);
-	}else{
-		WFIFOB(fd,6)=1;
-		WFIFOL(fd,7)=0;
-		memcpy(WFIFOP(fd,11),"error",24);
-	}
-	WFIFOSET(fd,35);
-	return 0;
-}
-
-// パーティ情報見つからず
-int mapif_party_noinfo(int fd,int party_id)
-{
-	WFIFOW(fd,0)=0x3821;
-	WFIFOW(fd,2)=8;
-	WFIFOL(fd,4)=party_id;
-	WFIFOSET(fd,8);
-	printf("int_party: info not found %d\n",party_id);
-	return 0;
-}
-// パーティ情報まとめ送り
-int mapif_party_info(int fd,struct party *p)
-{
-	unsigned char buf[1024];
-	WBUFW(buf,0)=0x3821;
-	memcpy(buf+4,p,sizeof(struct party));
-	WBUFW(buf,2)=4+sizeof(struct party);
-	if(fd<0)
-		mapif_sendall(buf,WBUFW(buf,2));
-	else
-		mapif_send(fd,buf,WBUFW(buf,2));
-//	printf("int_party: info %d %s\n",p->party_id,p->name);
-	return 0;
-}
-// パーティメンバ追加可否
-int mapif_party_memberadded(int fd,int party_id,int account_id,int flag)
-{
-	WFIFOW(fd,0)=0x3822;
-	WFIFOL(fd,2)=party_id;
-	WFIFOL(fd,6)=account_id;
-	WFIFOB(fd,10)=flag;
-	WFIFOSET(fd,11);
-	return 0;
-}
-// パーティ設定変更通知
-int mapif_party_optionchanged(int fd,struct party *p,int account_id,int flag)
-{
-	unsigned char buf[16];
-	WBUFW(buf,0)=0x3823;
-	WBUFL(buf,2)=p->party_id;
-	WBUFL(buf,6)=account_id;
-	WBUFW(buf,10)=p->exp;
-	WBUFW(buf,12)=p->item;
-	WBUFB(buf,14)=flag;
-	if(flag==0)
-		mapif_sendall(buf,15);
-	else
-		mapif_send(fd,buf,15);
-	//printf("int_party: option changed %d %d %d %d %d\n",p->party_id,account_id,p->exp,p->item,flag);
-	return 0;
-}
-// パーティ脱退通知
-int mapif_party_leaved(int party_id,int account_id,char *name)
-{
-	unsigned char buf[64];
-	WBUFW(buf,0)=0x3824;
-	WBUFL(buf,2)=party_id;
-	WBUFL(buf,6)=account_id;
-	memcpy(WBUFP(buf,10),name,24);
-	mapif_sendall(buf,34);
-	//printf("int_party: party leaved %d %d %s\n",party_id,account_id,name);
-	return 0;
-}
-// パーティマップ更新通知
-int mapif_party_membermoved(struct party *p,int idx)
-{
-	unsigned char buf[32];
-	WBUFW(buf,0)=0x3825;
-	WBUFL(buf,2)=p->party_id;
-	WBUFL(buf,6)=p->member[idx].account_id;
-	memcpy(WBUFP(buf,10),p->member[idx].map,16);
-	WBUFB(buf,26)=p->member[idx].online;
-	WBUFW(buf,27)=p->member[idx].lv;
-	mapif_sendall(buf,29);
-	return 0;
-}
-// パーティ解散通知
-int mapif_party_broken(int party_id,int flag)
-{
-	unsigned char buf[16];
-	WBUFW(buf,0)=0x3826;
-	WBUFL(buf,2)=party_id;
-	WBUFB(buf,6)=flag;
-	mapif_sendall(buf,7);
-	//printf("int_party: broken %d\n",party_id);
-	return 0;
-}
-// パーティ内発言
-int mapif_party_message(int party_id,int account_id,char *mes,int len, int sfd)
-{
-	unsigned char buf[512];
-	WBUFW(buf,0)=0x3827;
-	WBUFW(buf,2)=len+12;
-	WBUFL(buf,4)=party_id;
-	WBUFL(buf,8)=account_id;
-	memcpy(WBUFP(buf,12),mes,len);
-	mapif_sendallwos(sfd, buf,len+12);
-	return 0;
-}
-
-//-------------------------------------------------------------------
-// map serverからの通信
-
-
-// Create Party
-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){
-//		printf("int_party: same name party exists [%s]\n",name);
-		mapif_party_created(fd,account_id,NULL);
-		return 0;
-	}
-	p=party_pt;
-	if(p==NULL){
-		printf("int_party: out of memory !\n");
-		mapif_party_created(fd,account_id,NULL);
-		return 0;
-	}
-	memset(p,0,sizeof(struct party));
-	p->party_id=party_newid++;
-	memcpy(p->name,name,24);
-	p->exp=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;
-}
-// パーティ情報要求
-int mapif_parse_PartyInfo(int fd,int party_id)
-{
-	struct party *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_info(fd,p);
-	else
-		mapif_party_noinfo(fd,party_id);
-	return 0;
-}
-// パーティ追加要求
-int mapif_parse_PartyAddMember(int fd,int party_id,int account_id,char *nick,char *map,int lv)
-{
-	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);
-			p->member[i].leader=0;
-			p->member[i].online=1;
-			p->member[i].lv=lv;
-			mapif_party_memberadded(fd,party_id,account_id,0);
-			mapif_party_info(-1,p);
-
-			if( p->exp>0 && !party_check_exp_share(p) ){
-				p->exp=0;
-				flag=0x01;
-			}
-			if(flag)
-				mapif_party_optionchanged(fd,p,0,0);
-
-			inter_party_tosql(party_id, p);
-			return 0;
-		}
-	}
-	mapif_party_memberadded(fd,party_id,account_id,1);
-	//inter_party_tosql(party_id, p);
-	return 0;
-}
-// パーティー設定変更要求
-int mapif_parse_PartyChangeOption(int fd,int party_id,int account_id,int exp,int item)
-{
-	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);
-	inter_party_tosql(party_id, p);
-	return 0;
-}
-// パーティ脱退要求
-int mapif_parse_PartyLeave(int fd,int party_id,int account_id)
-{
-	char t_member[24];
-	struct party *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){
-		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' 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);
-
-				if (p->member[i].leader==1){
-					for(j=0;j<MAX_PARTY;j++)
-					{
-						//printf("j = %d , p->member[j].account_id = %d , p->member[j].account_id = %d \n",j,p->member[j].account_id,p->member[j].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' 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);
-						}
-					}
-					// Delete the party, if has no member.
-					sprintf(tmp_sql,"DELETE FROM `%s` WHERE `party_id`='%d'",party_db, party_id);
-					if(mysql_query(&mysql_handle, tmp_sql) ) {
-						printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
-					}
-//					printf("Leader breaks party %d \n",party_id);
-					memset(p, 0, sizeof(struct party));
-				}else memset(&p->member[i],0,sizeof(struct party_member));
-
-				break;
-
-			}
-		}
-		if( party_check_empty(p)==0 )
-			mapif_party_info(-1,p);// まだ人がいるのでデータ送信
-		/*
-		else
-			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);
-		if(mysql_query(&mysql_handle, tmp_sql) ) {
-			printf("DB server Error (update `char`)- %s\n", mysql_error(&mysql_handle) );
-		}
-	}
-	return 0;
-}
-// When member goes to other map
-int mapif_parse_PartyChangeMap(int fd,int party_id,int account_id,char *map,int online,int lv)
-{
-	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;
-			mapif_party_membermoved(p,i);
-
-			if( p->exp>0 && !party_check_exp_share(p) ){
-				p->exp=0;
-				flag=1;
-			}
-			if(flag)
-				mapif_party_optionchanged(fd,p,0,0);
-			break;
-		}
-	}
-	inter_party_tosql(party_id, p);
-	return 0;
-}
-// パーティ解散要求
-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, fd);
-}
-// パーティチェック要求
-int mapif_parse_PartyCheck(int fd,int party_id,int account_id,char *nick)
-{
-	return party_check_conflict(party_id,account_id,nick);
-}
-
-// map server からの通信
-// ・１パケットのみ解析すること
-// ・パケット長データはinter.cにセットしておくこと
-// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない
-// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない
-int inter_party_parse_frommap(int fd)
-{
-	switch(RFIFOW(fd,0)){
-	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),(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),(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),(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;
-	}
-	return 1;
-}
-
-// サーバーから脱退要求（キャラ削除用）
-int inter_party_leave(int party_id,int account_id)
-{
-	return mapif_parse_PartyLeave(-1,party_id,account_id);
-}
-
-
-
diff --git a/src/char_sql/int_party.h b/src/char_sql/int_party.h
deleted file mode 100644
index 686d70b04..000000000
--- a/src/char_sql/int_party.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _INT_PARTY_H_
-#define _INT_PARTY_H_
-
-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
deleted file mode 100644
index ea1fed67d..000000000
--- a/src/char_sql/int_pet.c
+++ /dev/null
@@ -1,329 +0,0 @@
-//
-// original code from athena
-// SQL conversion by Jioh L. Jung
-//
-#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;
-
-#define mysql_query(_x, _y)  debug_mysql_query(__FILE__, __LINE__, _x, _y)
-
-//---------------------------------------------------------
-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)
-		p->hungry = 100;
-	if(p->intimate < 0)
-		p->intimate = 0;
-	else if(p->intimate > 1000)
-		p->intimate = 1000;
-	sprintf(tmp_sql,"SELECT * 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) );
-	}
-	sql_res = mysql_store_result(&mysql_handle) ;
-	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,
-			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,
-			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) );
-			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);
-
-		p->pet_id = pet_id;
-		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]);
-		p->level = atoi(sql_row[5]);
-		p->egg_id = atoi(sql_row[6]);
-		p->equip = atoi(sql_row[7]);
-		p->intimate = atoi(sql_row[8]);
-		p->hungry = atoi(sql_row[9]);
-		p->rename_flag = atoi(sql_row[10]);
-		p->incuvate = atoi(sql_row[11]);
-	}
-	if(p->hungry < 0)
-		p->hungry = 0;
-	else if(p->hungry > 100)
-		p->hungry = 100;
-	if(p->intimate < 0)
-		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 = (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) ) {
-		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);
-	printf("total pet data -> '%s'.......\n",sql_row[0]);
-	i = atoi (sql_row[0]);
-	mysql_free_result(sql_res);
-
-	if (i > 0) {
-		//set pet_newid
-		sprintf (tmp_sql , "SELECT max(`pet_id`) FROM `%s`",pet_db );
-		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) );
-	}
-	return 0;
-}
-//------------------------------------------------------
-int mapif_pet_created(int fd, int account_id, struct s_pet *p)
-{
-	WFIFOW(fd, 0) =0x3880;
-	WFIFOL(fd, 2) =account_id;
-	if(p!=NULL){
-		WFIFOB(fd, 6)=0;
-		WFIFOL(fd, 7) =p->pet_id;
-		printf("int_pet: created! %d %s\n", p->pet_id, p->name);
-	}else{
-		WFIFOB(fd, 6)=1;
-		WFIFOL(fd, 7)=0;
-	}
-	WFIFOSET(fd, 11);
-
-	return 0;
-}
-
-int mapif_pet_info(int fd, int account_id, struct s_pet *p){
-	WFIFOW(fd, 0) =0x3881;
-	WFIFOW(fd, 2) =sizeof(struct s_pet) + 9;
-	WFIFOL(fd, 4) =account_id;
-	WFIFOB(fd, 8)=0;
-	memcpy(WFIFOP(fd, 9), p, sizeof(struct s_pet));
-	WFIFOSET(fd, WFIFOW(fd, 2));
-
-	return 0;
-}
-
-int mapif_pet_noinfo(int fd, int account_id){
-	WFIFOW(fd, 0) =0x3881;
-	WFIFOW(fd, 2) =sizeof(struct s_pet) + 9;
-	WFIFOL(fd, 4) =account_id;
-	WFIFOB(fd, 8)=1;
-	memset(WFIFOP(fd, 9), 0, sizeof(struct s_pet));
-	WFIFOSET(fd, WFIFOW(fd, 2));
-
-	return 0;
-}
-
-int mapif_save_pet_ack(int fd, int account_id, int flag){
-	WFIFOW(fd, 0) =0x3882;
-	WFIFOL(fd, 2) =account_id;
-	WFIFOB(fd, 6) =flag;
-	WFIFOSET(fd, 7);
-
-	return 0;
-}
-
-int mapif_delete_pet_ack(int fd, int flag){
-	WFIFOW(fd, 0) =0x3883;
-	WFIFOB(fd, 2) =flag;
-	WFIFOSET(fd, 3);
-
-	return 0;
-}
-
-int mapif_create_pet(int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id,
-	short pet_equip, short intimate, short hungry, char rename_flag, char incuvate, char *pet_name){
-
-	memset(pet_pt, 0, sizeof(struct s_pet));
-	pet_pt->pet_id = pet_newid++;
-	memcpy(pet_pt->name, pet_name, 24);
-	if(incuvate == 1)
-		pet_pt->account_id = pet_pt->char_id = 0;
-	else {
-		pet_pt->account_id = account_id;
-		pet_pt->char_id = char_id;
-	}
-	pet_pt->class_ = pet_class;
-	pet_pt->level = pet_lv;
-	pet_pt->egg_id = pet_egg_id;
-	pet_pt->equip = pet_equip;
-	pet_pt->intimate = intimate;
-	pet_pt->hungry = hungry;
-	pet_pt->rename_flag = rename_flag;
-	pet_pt->incuvate = incuvate;
-
-	if(pet_pt->hungry < 0)
-		pet_pt->hungry = 0;
-	else if(pet_pt->hungry > 100)
-		pet_pt->hungry = 100;
-	if(pet_pt->intimate < 0)
-		pet_pt->intimate = 0;
-	else if(pet_pt->intimate > 1000)
-		pet_pt->intimate = 1000;
-
-	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;
-			mapif_pet_info(fd, account_id, pet_pt);
-		}
-		else if(account_id == pet_pt->account_id && char_id == pet_pt->char_id)
-			mapif_pet_info(fd, account_id, pet_pt);
-		else
-			mapif_pet_noinfo(fd, account_id);
-	}
-	else
-		mapif_pet_noinfo(fd, account_id);
-
-	return 0;
-}
-
-int mapif_save_pet(int fd, int account_id, struct s_pet *data) {
-	//here process pet save request.
-	int len=RFIFOW(fd, 2);
-	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;
-		else if(data->hungry > 100)
-			data->hungry = 100;
-		if(data->intimate < 0)
-			data->intimate = 0;
-		else if(data->intimate > 1000)
-			data->intimate = 1000;
-		inter_pet_tosql(data->pet_id,data);
-		mapif_save_pet_ack(fd, account_id, 0);
-	}
-
-	return 0;
-}
-
-int mapif_delete_pet(int fd, int pet_id){
-	mapif_delete_pet_ack(fd, inter_pet_delete(pet_id));
-
-	return 0;
-}
-
-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), (char*)RFIFOP(fd, 24));
-	return 0;
-}
-
-int mapif_parse_LoadPet(int fd){
-	mapif_load_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10));
-	return 0;
-}
-
-int mapif_parse_SavePet(int fd){
-	mapif_save_pet(fd, RFIFOL(fd, 4), (struct s_pet *) RFIFOP(fd, 8));
-	return 0;
-}
-
-int mapif_parse_DeletePet(int fd){
-	mapif_delete_pet(fd, RFIFOL(fd, 2));
-	return 0;
-}
-
-int inter_pet_parse_frommap(int fd){
-	switch(RFIFOW(fd, 0)){
-	case 0x3080: mapif_parse_CreatePet(fd); break;
-	case 0x3081: mapif_parse_LoadPet(fd); break;
-	case 0x3082: mapif_parse_SavePet(fd); break;
-	case 0x3083: mapif_parse_DeletePet(fd); break;
-	default:
-		return 0;
-	}
-	return 1;
-}
-
diff --git a/src/char_sql/int_pet.h b/src/char_sql/int_pet.h
deleted file mode 100644
index 39f127262..000000000
--- a/src/char_sql/int_pet.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _INT_PET_H_
-#define _INT_PET_H_
-
-int inter_pet_init();
-void inter_pet_sql_final();
-int inter_pet_save();
-int inter_pet_delete(int pet_id);
-
-int inter_pet_parse_frommap(int fd);
-int inter_pet_sql_init();
-//extern char pet_txt[256];
-
-#endif
diff --git a/src/char_sql/int_storage.c b/src/char_sql/int_storage.c
deleted file mode 100644
index c13c782a6..000000000
--- a/src/char_sql/int_storage.c
+++ /dev/null
@@ -1,339 +0,0 @@
-//
-// original code from athena
-// SQL conversion by Jioh L. Jung
-//
-#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;
-	int count=0;
-	struct itemtmp mapitem[MAX_GUILD_STORAGE];
-	for(i=0;i<MAX_STORAGE;i++){
-		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, count, account_id,TABLE_STORAGE);
-
-	//printf ("storage dump to DB - id: %d (total: %d)\n", account_id, j);
-	return 0;
-}
-
-// 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_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;
-}
-
-// 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;
-	int count=0;
-	struct itemtmp mapitem[MAX_GUILD_STORAGE];
-	for(i=0;i<MAX_GUILD_STORAGE;i++){
-		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, count, guild_id,TABLE_GUILD_STORAGE);
-
-	printf ("guild storage save to DB - id: %d (total: %d)\n", guild_id,i);
-	return 0;
-}
-
-// Load guild_storage data to mem
-int guild_storage_fromsql(int guild_id, struct guild_storage *p){
-	int i=0;
-	struct guild_storage *gs=guild_storage_pt;
-	p=gs;
-
-	memset(p,0,sizeof(struct guild_storage)); //clean up memory
-	p->storage_amount = 0;
-	p->guild_id = guild_id;
-
-	// storage {`guild_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`attribute`/`card0`/`card1`/`card2`/`card3`}
-	sprintf(tmp_sql,"SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`card0`,`card1`,`card2`,`card3` FROM `%s` WHERE `guild_id`='%d'",guild_storage_db, guild_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_amount = ++i;
-			if (i >= MAX_GUILD_STORAGE)
-				break;
-		}
-		mysql_free_result(sql_res);
-	}
-	printf ("guild storage load complete from DB - id: %d (total: %d)\n", guild_id, p->storage_amount);
-	return 0;
-}
-
-//---------------------------------------------------------
-// storage data initialize
-int inter_storage_sql_init(){
-
-	//memory alloc
-	printf("interserver storage memory initialize....(%d byte)\n",sizeof(struct storage));
-	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);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error (delete `storage`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	return 0;
-}
-int inter_guild_storage_delete(int guild_id)
-{
-	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_storage_db, guild_id);
-	if(mysql_query(&mysql_handle, tmp_sql) ) {
-		printf("DB server Error (delete `guild_storage`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	return 0;
-}
-
-//---------------------------------------------------------
-// packet from map server
-
-// recive packet about storage data
-int mapif_load_storage(int fd,int account_id){
-	//load from DB
-	storage_fromsql(account_id, storage_pt);
-	WFIFOW(fd,0)=0x3810;
-	WFIFOW(fd,2)=sizeof(struct storage)+8;
-	WFIFOL(fd,4)=account_id;
-	memcpy(WFIFOP(fd,8),storage_pt,sizeof(struct storage));
-	WFIFOSET(fd,WFIFOW(fd,2));
-	return 0;
-}
-// send ack to map server which is "storage data save ok."
-int mapif_save_storage_ack(int fd,int account_id){
-	WFIFOW(fd,0)=0x3811;
-	WFIFOL(fd,2)=account_id;
-	WFIFOB(fd,6)=0;
-	WFIFOSET(fd,7);
-	return 0;
-}
-
-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);
-	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==1) {
-		guild_storage_fromsql(guild_id,guild_storage_pt);
-		WFIFOW(fd,2)=sizeof(struct guild_storage)+12;
-		WFIFOL(fd,4)=account_id;
-		WFIFOL(fd,8)=guild_id;
-		memcpy(WFIFOP(fd,12),guild_storage_pt,sizeof(struct guild_storage));
-	}
-	else {
-		WFIFOW(fd,2)=12;
-		WFIFOL(fd,4)=account_id;
-		WFIFOL(fd,8)=0;
-	}
-	WFIFOSET(fd,WFIFOW(fd,2));
-
-	return 0;
-}
-int mapif_save_guild_storage_ack(int fd,int account_id,int guild_id,int fail)
-{
-	WFIFOW(fd,0)=0x3819;
-	WFIFOL(fd,2)=account_id;
-	WFIFOL(fd,6)=guild_id;
-	WFIFOB(fd,10)=fail;
-	WFIFOSET(fd,11);
-	return 0;
-}
-
-//---------------------------------------------------------
-// packet from map server
-
-// recive request about storage data
-int mapif_parse_LoadStorage(int fd){
-	mapif_load_storage(fd,RFIFOL(fd,2));
-	return 0;
-}
-// storage data recive and save
-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{
-		memcpy(&storage_pt[0],RFIFOP(fd,8),sizeof(struct storage));
-		storage_tosql(account_id, storage_pt);
-		mapif_save_storage_ack(fd,account_id);
-	}
-	return 0;
-}
-
-int mapif_parse_LoadGuildStorage(int fd)
-{
-	mapif_load_guild_storage(fd,RFIFOL(fd,2),RFIFOL(fd,6));
-	return 0;
-}
-
-int mapif_parse_SaveGuildStorage(int fd)
-{
-	int guild_exist=0;
-	int guild_id=RFIFOL(fd,8);
-	int len=RFIFOW(fd,2);
-	if(sizeof(struct guild_storage)!=len-12){
-		printf("inter storage: data size error %d %d\n",sizeof(struct guild_storage),len-12);
-	}
-	else {
-		// 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);
-		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==1) {
-			memcpy(guild_storage_pt,RFIFOP(fd,12),sizeof(struct guild_storage));
-			guild_storage_tosql(guild_id,guild_storage_pt);
-			mapif_save_guild_storage_ack(fd,RFIFOL(fd,4),guild_id,0);
-		}
-		else
-			mapif_save_guild_storage_ack(fd,RFIFOL(fd,4),guild_id,1);
-	}
-	return 0;
-}
-
-
-int inter_storage_parse_frommap(int fd){
-	switch(RFIFOW(fd,0)){
-	case 0x3010: mapif_parse_LoadStorage(fd); break;
-	case 0x3011: mapif_parse_SaveStorage(fd); break;
-	case 0x3018: mapif_parse_LoadGuildStorage(fd); break;
-	case 0x3019: mapif_parse_SaveGuildStorage(fd); break;
-	default:
-		return 0;
-	}
-	return 1;
-}
-
diff --git a/src/char_sql/int_storage.h b/src/char_sql/int_storage.h
deleted file mode 100644
index 5541d1ed7..000000000
--- a/src/char_sql/int_storage.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _INT_STORAGE_H_
-#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);
-
-int inter_storage_parse_frommap(int fd);
-
-
-//extern char storage_txt[256];
-
-#endif
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
deleted file mode 100644
index 83fcc967f..000000000
--- a/src/char_sql/inter.c
+++ /dev/null
@@ -1,625 +0,0 @@
-//
-// original code from athena
-// SQL conversion by Jioh L. Jung
-//
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "char.h"
-#include "../common/strlib.h"
-#include "inter.h"
-#include "int_party.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "int_pet.h"
-#include "lock.h"
-
-#define WISDATA_TTL		(60*1000)	// Wisデータの生存時間(60秒)
-#define WISDELLIST_MAX	256			// Wisデータ削除リストの要素数
-
-
-struct accreg {
-	int account_id,reg_num;
-	struct global_reg reg[ACCOUNT_REG_NUM];
-};
-
-static struct accreg *accreg_pt;
-
-
-int party_share_level = 10;
-MYSQL mysql_handle;
-MYSQL_RES* 	sql_res ;
-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";
-char char_server_pw[32] = "ragnarok";
-char char_server_db[32] = "ragnarok";
-
-int login_server_port = 3306;
-char login_server_ip[32] = "127.0.0.1";
-char login_server_id[32] = "ragnarok";
-char login_server_pw[32] = "ragnarok";
-char login_server_db[32] = "ragnarok";
-
-// sending packet list
-int inter_send_packet_length[]={
-	-1,-1,27, 0, -1, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,
-	-1, 7, 0, 0,  0, 0, 0, 0, -1,11, 0, 0,  0, 0,  0, 0,
-	35,-1,11,15, 34,29, 7,-1,  0, 0, 0, 0,  0, 0,  0, 0,
-	10,-1,15, 0, 79,19, 7,-1,  0,-1,-1,-1, 14,67,186,-1,
-	 9, 9,-1, 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, 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, 0,
-	11,-1, 7, 3,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,
-};
-// recv. packet list
-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,
-	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,
-	 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,  0, 0,
-	48,14,-1, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,
-};
-
-struct WisData {
-	int id,fd,count,len;
-	unsigned long tick;
-	unsigned char src[24],dst[24],msg[512];
-};
-static struct dbt * wis_db = NULL;
-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')",
-				reg_db, reg->account_id, jstrescapecpy(temp_str,reg->reg[j].str), reg->reg[j].value);
-			if(mysql_query(&mysql_handle, tmp_sql) ) {
-				printf("DB server Error (insert `global_reg_value`)- %s\n", mysql_error(&mysql_handle) );
-			}
-		}
-	}
-	return 0;
-}
-
-// Load account_reg from sql (type=2)
-int inter_accreg_fromsql(int account_id,struct accreg *reg)
-{
-	int j=0;
-	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) ) {
-		printf("DB server Error (select `global_reg_value`)- %s\n", mysql_error(&mysql_handle) );
-	}
-	sql_res = mysql_store_result(&mysql_handle);
-
-	if (sql_res) {
-		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]);
-		}
-		mysql_free_result(sql_res);
-	}
-	reg->reg_num=j;
-	return 0;
-}
-
-// Initialize
-int inter_accreg_sql_init()
-{
-	CREATE(accreg_pt, struct accreg, 1);
-	return 0;
-
-}
-
-/*==========================================
- * read config file
- *------------------------------------------
- */
-int inter_config_read(const char *cfgName) {
-	int i;
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
-
-	printf ("start reading interserver configuration: %s\n",cfgName);
-
-	fp=fopen(cfgName,"r");
-	if(fp==NULL){
-		printf("file not found: %s\n", cfgName);
-		return 1;
-	}
-	while(fgets(line, 1020, fp)){
-		i=sscanf(line,"%[^:]: %[^\r\n]",w1,w2);
-		if(i!=2)
-			continue;
-
-		if(strcmpi(w1,"char_server_ip")==0){
-			strcpy(char_server_ip, w2);
-			printf ("set char_server_ip : %s\n",w2);
-		}
-		else if(strcmpi(w1,"char_server_port")==0){
-			char_server_port=atoi(w2);
-			printf ("set char_server_port : %s\n",w2);
-		}
-		else if(strcmpi(w1,"char_server_id")==0){
-			strcpy(char_server_id, w2);
-			printf ("set char_server_id : %s\n",w2);
-		}
-		else if(strcmpi(w1,"char_server_pw")==0){
-			strcpy(char_server_pw, w2);
-			printf ("set char_server_pw : %s\n",w2);
-		}
-		else if(strcmpi(w1,"char_server_db")==0){
-			strcpy(char_server_db, w2);
-			printf ("set char_server_db : %s\n",w2);
-		}
-		//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);
-		}
-		else if(strcmpi(w1,"login_server_port")==0){
-			login_server_port=atoi(w2);
-			printf ("set login_server_port : %s\n",w2);
-		}
-		else if(strcmpi(w1,"login_server_id")==0){
-			strcpy(login_server_id, w2);
-			printf ("set login_server_id : %s\n",w2);
-		}
-		else if(strcmpi(w1,"login_server_pw")==0){
-			strcpy(login_server_pw, w2);
-			printf ("set login_server_pw : %s\n",w2);
-		}
-		else if(strcmpi(w1,"login_server_db")==0){
-			strcpy(login_server_db, w2);
-			printf ("set login_server_db : %s\n",w2);
-		}
-		else if(strcmpi(w1,"party_share_level")==0){
-			party_share_level=atoi(w2);
-			if(party_share_level < 0) party_share_level = 0;
-		}else if(strcmpi(w1,"import")==0){
-			inter_config_read(w2);
-		}
-		else if(strcmpi(w1,"log_inter")==0){
-			log_inter = atoi(w2);
-		}
-		else if(strcmpi(w1,"login_server_db")==0){
-			strcpy(login_server_db, w2);
-			printf ("set login_server_db : %s\n",w2);
-		}
-	}
-	fclose(fp);
-
-	printf ("success reading interserver configuration\n");
-
-	return 0;
-}
-
-// Save interlog into sql
-int inter_log(char *fmt,...)
-{
-	char str[255];
-	char temp_str[255];
-	va_list ap;
-	va_start(ap,fmt);
-
-	vsprintf(str,fmt,ap);
-	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;
-}
-
-
-// initialize
-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 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, 0)) {
-			//pointer check
-			printf("%s\n",mysql_error(&mysql_handle));
-			exit(1);
-	}
-	else {
-		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);
-
-	return 0;
-}
-
-
-//--------------------------------------------------------
-
-// GM message sending
-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_sendallwos(sfd, buf, len);
-	printf("\033[1;34m inter server: GM[len:%d] - '%s' \033[0m\n", len, mes);
-	return 0;
-}
-
-// Wis sending
-int mapif_wis_message(struct WisData *wd) {
-	unsigned char buf[56 + wd->len];
-
-	WBUFW(buf, 0) = 0x3801;
-	WBUFW(buf, 2) = 56 +wd->len;
-	WBUFL(buf, 4) = wd->id;
-	memcpy(WBUFP(buf, 8), wd->src, 24);
-	memcpy(WBUFP(buf,32), wd->dst, 24);
-	memcpy(WBUFP(buf,56), wd->msg, wd->len);
-	wd->count = mapif_sendall(buf,WBUFW(buf,2));
-
-	return 0;
-}
-// Wis sending result
-int mapif_wis_end(struct WisData *wd,int flag)
-{
-	unsigned char buf[27];
-
-	WBUFW(buf, 0)=0x3802;
-	memcpy(WBUFP(buf, 2),wd->src,24);
-	WBUFB(buf,26)=flag;
-	mapif_send(wd->fd,buf,27);
-//	printf("inter server wis_end %d\n",flag);
-	return 0;
-}
-
-int mapif_account_reg(int fd,unsigned char *src)
-{
-	unsigned char buf[WBUFW(src,2)];
-	memcpy(WBUFP(buf,0),src,WBUFW(src,2));
-	WBUFW(buf, 0)=0x3804;
-	mapif_sendallwos(fd,buf,WBUFW(buf,2));
-	return 0;
-}
-
-// Send the requested account_reg
-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){
-		WFIFOW(fd,2)=8;
-	}else{
-		int j,p;
-		for(j=0,p=8;j<reg->reg_num;j++,p+=36){
-			memcpy(WFIFOP(fd,p),reg->reg[j].str,32);
-			WFIFOL(fd,p+32)=reg->reg[j].value;
-		}
-		WFIFOW(fd,2)=p;
-	}
-	WFIFOSET(fd,WFIFOW(fd,2));
-	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
-int check_ttl_wisdata_sub(void *key, void *data, va_list ap) {
-	unsigned long tick;
-	struct WisData *wd = (struct WisData *)data;
-	tick = va_arg(ap, unsigned long);
-
-	if (DIFF_TICK(tick, wd->tick) > WISDATA_TTL && wis_delnum < WISDELLIST_MAX)
-		wis_dellist[wis_delnum++] = wd->id;
-
-	return 0;
-}
-
-int check_ttl_wisdata() {
-	unsigned long tick = gettick();
-	int i;
-
-	do {
-		wis_delnum = 0;
-		numdb_foreach(wis_db, check_ttl_wisdata_sub, tick);
-		for(i = 0; i < wis_delnum; 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);
-			aFree(wd);
-		}
-	} while(wis_delnum >= WISDELLIST_MAX);
-
-	return 0;
-}
-
-//--------------------------------------------------------
-
-// GM message sending
-int mapif_parse_GMmessage(int fd)
-{
-	mapif_GMmessage(RFIFOP(fd, 4), RFIFOW(fd, 2), fd);
-	return 0;
-}
-
-
-// Wisp/page request to send
-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");
-		return 0;
-	} else if (RFIFOW(fd,2)-52 <= 0) { // normaly, impossible, but who knows...
-		printf("inter: Wis message doesn't exist.\n");
-		return 0;
-	}
-	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) );
-	}
-	sql_res = mysql_store_result(&mysql_handle);
-
-	// search if character exists before to ask all map-servers
-	if (!(sql_row = mysql_fetch_row(sql_res))) {
-		unsigned char buf[27];
-		WBUFW(buf, 0) = 0x3802;
-		memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), 24);
-		WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
-		mapif_send(fd, buf, 27);
-	// Character exists. So, ask all map-servers
-	} else {
-		// to be sure of the correct name, rewrite it
-		memset(RFIFOP(fd,28), 0, 24);
-		strncpy((char*)RFIFOP(fd,28), sql_row[0], 24);
-		// if source is destination, don't ask other servers.
-		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);
-			WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
-			mapif_send(fd, buf, 27);
-		} else {
-
-	CREATE(wd, struct WisData, 1);
-
-			// Whether the failure of previous wisp/page transmission (timeout)
-			check_ttl_wisdata();
-
-			wd->id = ++wisid;
-			wd->fd = fd;
-			wd->len= RFIFOW(fd,2)-52;
-			memcpy(wd->src, RFIFOP(fd, 4), 24);
-			memcpy(wd->dst, RFIFOP(fd,28), 24);
-			memcpy(wd->msg, RFIFOP(fd,52), wd->len);
-			wd->tick = gettick();
-			numdb_insert(wis_db, wd->id, wd);
-			mapif_wis_message(wd);
-		}
-	}
-	
-	//Freeing ... O.o 
-	if(sql_res){
-		mysql_free_result(sql_res);
-	}
-	
-	return 0;
-}
-
-
-// Wisp/page transmission result
-int mapif_parse_WisReply(int fd) {
-	int id = RFIFOL(fd,2), flag = RFIFOB(fd,6);
-	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
-
-	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);
-		aFree(wd);
-	}
-
-	return 0;
-}
-
-
-// Save account_reg into sql (type=2)
-int mapif_parse_AccReg(int fd)
-{
-	int j,p;
-	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;
-}
-
-// Request the value of account_reg
-int mapif_parse_AccRegRequest(int fd)
-{
-//	printf("mapif: accreg request\n");
-	return mapif_account_reg_reply(fd,RFIFOL(fd,2));
-}
-
-
-
-//--------------------------------------------------------
-int inter_parse_frommap(int fd)
-{
-	int cmd=RFIFOW(fd,0);
-	int len=0;
-
-	// inter鯖管轄かを調べる
-	if(cmd<0x3000 || cmd>=0x3000+( sizeof(inter_recv_packet_length)/
-		sizeof(inter_recv_packet_length[0]) ) )
-		return 0;
-
-	// パケット長を調べる
-	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;
-	case 0x3002: mapif_parse_WisReply(fd); break;
-	case 0x3004: mapif_parse_AccReg(fd); break;
-	case 0x3005: mapif_parse_AccRegRequest(fd); break;
-	default:
-		if( inter_party_parse_frommap(fd) )
-			break;
-		if( inter_guild_parse_frommap(fd) )
-			break;
-		if( inter_storage_parse_frommap(fd) )
-			break;
-		if( inter_pet_parse_frommap(fd) )
-			break;
-		return 0;
-	}
-	RFIFOSKIP(fd, len );
-	return 1;
-}
-
-// RFIFO check
-int inter_check_length(int fd, int length)
-{
-	if(length==-1){	// v-len packet
-		if(RFIFOREST(fd)<4)	// packet not yet
-			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
deleted file mode 100644
index 9265a8d82..000000000
--- a/src/char_sql/inter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _INTER_H_
-#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);
-
-int inter_log(char *fmt,...);
-
-#define inter_cfgName "conf/inter_athena.conf"
-
-extern int party_share_level;
-extern char inter_log_filename[1024];
-
-//add include for DBMS(mysql)
-#include <mysql.h>
-
-extern MYSQL mysql_handle;
-extern char tmp_sql[65535];
-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];
-extern char char_server_pw[32];
-extern char char_server_db[32];
-
-extern int login_db_server_port;
-extern char login_db_server_ip[32];
-extern char login_db_server_id[32];
-extern char login_db_server_pw[32];
-extern char login_db_server_db[32];
-
-extern int log_inter;
-
-#endif
diff --git a/src/char_sql/itemdb.c b/src/char_sql/itemdb.c
deleted file mode 100644
index bc3e8603e..000000000
--- a/src/char_sql/itemdb.c
+++ /dev/null
@@ -1,247 +0,0 @@
-// $Id: itemdb.c,v 1.1.1.1 2004/09/10 17:44:48 MagicalTux Exp $
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "itemdb.h"
-#include "db.h"
-#include "inter.h"
-#include "char.h"
-#include "utils.h"
-
-#ifdef MEMWATCH
-#include "memwatch.h"
-#endif
-
-#define MAX_RANDITEM	2000
-
-// ** ITEMDB_OVERRIDE_NAME_VERBOSE **
-//   定義すると、itemdb.txtとgrfで名前が異なる場合、表示します.
-//#define ITEMDB_OVERRIDE_NAME_VERBOSE	1
-
-char item_db_db[256]="item_db"; // added to specify item_db sql table [Valaris]
-
-static struct dbt* item_db;
-
-/*==========================================
- * DBの検索
- *------------------------------------------
- */
-struct item_data* itemdb_search(int nameid)
-{
-	struct item_data *id;
-
-	id = (struct item_data*)numdb_search(item_db,nameid);
-	if(id) return id;
-
-	CREATE(id, struct item_data, 1);
-
-	numdb_insert(item_db,nameid,id);
-
-
-	if(nameid>500 && nameid<600)
-		id->type=0;   //heal item
-	else if(nameid>600 && nameid<700)
-		id->type=2;   //use item
-	else if((nameid>700 && nameid<1100) ||
-			(nameid>7000 && nameid<8000))
-		id->type=3;   //correction
-	else if(nameid>=1750 && nameid<1771)
-		id->type=10;  //arrow
-	else if(nameid>1100 && nameid<2000)
-		id->type=4;   //weapon
-	else if((nameid>2100 && nameid<3000) ||
-			(nameid>5000 && nameid<6000))
-		id->type=5;   //armor
-	else if(nameid>4000 && nameid<5000)
-		id->type=6;   //card
-	else if(nameid>9000 && nameid<10000)
-		id->type=7;   //egg
-	else if(nameid>10000)
-		id->type=8;   //petequip
-
-	return id;
-}
-
-/*==========================================
- *
- *------------------------------------------
- */
-int itemdb_isequip(int nameid)
-{
-	int type=itemdb_type(nameid);
-	if(type==0 || type==2 || type==3 || type==6 || type==10)
-		return 0;
-	return 1;
-}
-/*==========================================
- *
- *------------------------------------------
- */
-int itemdb_isequip2(struct item_data *data)
-{
-	if(data) {
-		int type=data->type;
-		if(type==0 || type==2 || type==3 || type==6 || type==10)
-			return 0;
-		else
-			return 1;
-	}
-	return 0;
-}
-
-
-
-/*==========================================
- * アイテムデータベースの読み込み
- *------------------------------------------
- */
-static int itemdb_readdb(void)
-{
-	FILE *fp;
-	char line[1024];
-	int ln=0;
-	int nameid,j;
-	char *str[32],*p,*np;
-	struct item_data *id;
-
-	fp=fopen("db/item_db.txt","r");
-	if(fp==NULL){
-		printf("can't read db/item_db.txt\n");
-		exit(1);
-	}
-	while(fgets(line,1020,fp)){
-		if(line[0]=='/' && line[1]=='/')
-			continue;
-		memset(str,0,sizeof(str));
-		for(j=0,np=p=line;j<17 && p;j++){
-			str[j]=p;
-			p=strchr(p,',');
-			if(p){ *p++=0; np=p; }
-		}
-		if(str[0]==NULL)
-			continue;
-
-		nameid=atoi(str[0]);
-		if(nameid<=0 || nameid>=20000)
-			continue;
-		ln++;
-
-		//ID,Name,Jname,Type,Price,Sell,Weight,ATK,DEF,Range,Slot,Job,Gender,Loc,wLV,eLV,View
-		id=itemdb_search(nameid);
-		memcpy(id->name,str[1],24);
-		memcpy(id->jname,str[2],24);
-		id->type=atoi(str[3]);
-
-	}
-	fclose(fp);
-	printf("read db/item_db.txt done (count=%d)\n",ln);
-	return 0;
-}
-
-static int itemdb_read_sqldb(void) // sql item_db read, shortened version of map-server item_db read [Valaris]
-{
-	unsigned int nameid; 	// Type should be "unsigned short int", but currently isn't for compatibility with numdb_insert()
-	struct item_data *id;
-
-	// ----------
-
-	// Output query to retrieve all rows from the item database table
-	sprintf(tmp_sql, "SELECT * FROM `%s`", item_db_db);
-
-	// Execute the query; if the query execution fails, output an error
-	if (mysql_query(&mysql_handle, tmp_sql)) {
-		printf("Database server error (executing query for %s): %s\n", item_db_db, mysql_error(&mysql_handle));
-	}
-
-	// Store the query result
-	sql_res = mysql_store_result(&mysql_handle);
-
-	// If the storage of the query result succeeded
-	if (sql_res) {
-		// Parse each row in the query result into sql_row
-		while ((sql_row = mysql_fetch_row(sql_res))) {
-			nameid = atoi(sql_row[0]);
-
-			// If the identifier is not within the valid range, process the next row
-			if (nameid == 0 || nameid >= 20000)	{	// Should ">= 20000" be "> 20000"?
-				continue;
-			}
-
-			// ----------
-
-			// Insert a new row into the item database
-/*
-			id = aCalloc(sizeof(struct item_data), 1);
-
-			if (id == NULL) {
-				printf("out of memory : itemdb_read_sqldb\n");
-				exit(1);
-			}
-
-			memset(id, 0, sizeof(struct item_data));
-			numdb_insert(item_db, nameid, id);
-
-			// ----------
-*/
-            id=itemdb_search(nameid);
-
-			memcpy(id->name, sql_row[1], 24);
-			memcpy(id->jname, sql_row[2], 24);
-
-			id->type = atoi(sql_row[3]);
-		}
-
-		// If the retrieval failed, output an error
-		if (mysql_errno(&mysql_handle)) {
-			printf("Database server error (retrieving rows from %s): %s\n", item_db_db, mysql_error(&mysql_handle));
-		}
-
-		printf("read %s done (count = %lu)\n", item_db_db, (unsigned long) mysql_num_rows(sql_res));
-
-		// Free the query result
-		mysql_free_result(sql_res);
-	} else {
-		printf("MySQL error (storing query result for %s): %s\n", item_db_db, mysql_error(&mysql_handle));
-	}
-
-	return 0;
-}
-
-static int itemdb_final(void *key,void *data,va_list ap)
-{
-	struct item_data *id;
-
-	id = (struct item_data*)data;
-	if(id->use_script)
-		aFree(id->use_script);
-	if(id->equip_script)
-		aFree(id->equip_script);
-	aFree(id);
-
-	return 0;
-}
-
-
-/*==========================================
- *
- *------------------------------------------
- */
-void do_final_itemdb(void)
-{
-	if(item_db){
-		numdb_final(item_db,itemdb_final);
-		item_db=NULL;
-	}
-}
-int do_init_itemdb(void)
-{
-	item_db = numdb_init();
-
-	if (db_use_sqldbs) // it db_use_sqldbs in inter config are yes, will read from item_db for char server display [Valaris]
-		itemdb_read_sqldb();
-	else
-	itemdb_readdb();
-	return 0;
-}
-
diff --git a/src/char_sql/itemdb.h b/src/char_sql/itemdb.h
deleted file mode 100644
index 762873c8e..000000000
--- a/src/char_sql/itemdb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _ITEMDB_H_
-#define _ITEMDB_H_
-
-struct item_data {
-	int nameid;
-	char name[24],jname[24];
-	int value_buy,value_sell,value_notdc,value_notoc;
-	int type;
-	int class_;
-	int sex;
-	int equip;
-	int weight;
-	int atk;
-	int def;
-	int range;
-	int slot;
-	int look;
-	int elv;
-	int wlv;
-	char *use_script;	// 回復とかも全部この中でやろうかなと
-	char *equip_script;	// 攻撃,防御の属性設定もこの中で可能かな?
-	char available;
-};
-
-struct item_data* itemdb_search(int nameid);
-#define itemdb_type(n) itemdb_search(n)->type
-
-int itemdb_isequip(int);
-int itemdb_isequip2(struct item_data *);
-
-void do_final_itemdb(void);
-int do_init_itemdb(void);
-
-#endif
diff --git a/src/char_sql/make.sh b/src/char_sql/make.sh
deleted file mode 100644
index 6ee175f73..000000000
--- a/src/char_sql/make.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-	rsqlt=`rm -rf *.o`
-	gcc -c char.c -I/usr/local/include/mysql/
-	gcc -c int_guild.c -I/usr/local/include/mysql/
-	gcc -c int_party.c -I/usr/local/include/mysql/
-	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 itemdb.c -I../common/
-	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/readme.txt b/src/char_sql/readme.txt
deleted file mode 100644
index 41b114405..000000000
--- a/src/char_sql/readme.txt
+++ /dev/null
@@ -1,250 +0,0 @@
-�ｻｿ//Encoded with UTF-8 (UNICODE)
-//---------------------------------------------
-// V.018 - Aarlex
-1. ADD Makefile & GNUmakefile
-2. fix guild_leave.
-3. fix char select windows HP & SP value error.
-
-// V.017 - Aarlex
-1. fix guild member view job update.(For mod-0728)
-   inter.c
-   int_guild.c
-
-// V.016 - by Aarlex
-1. Add e-mail check when you Delete char data.
-2. modify storage save func like 014.
-2. remove Lan_support func.
-
-// v.014 - by Aarlex
-I rewrite save function.
-besause myfriend find that Mysql will use more than 40% CPU.
-And log file is too big (4 days 22G ..= =+)
-(maybe he sets autosave_time less then 1 min.)
-but. i still rewrite save func.
-char server will delete all of user item(inventory & Cart) data then insert them again before.
-so i use two struct to save item data from map & database.
-then compare two struct to get different .
-AND add some debug message.but message maybe too much XD.
-
-
-1. ADDED itemdb.c itemdb.h
-2. modify mmo_char_tosql().
-3. ADDED memitemdata_to_sql().
-4. ADDED some debug message in memitemdata_to_sql().
-5. modify make.sh 
-
-// v.013 - by Aarlex
-1. some SQL sentance fix in old version Mysql .
-
-2. in_guild.c mapif_guild_leaved() 
-   unsigned char buf[64] -> unsigned char buf[128]
-
-3. in_pet.c inter_pet_tosql()
-   if (sql_res) - > if (mysql_num_rows(sql_res)!=0)
-
-4. in_char.c mmo_char_send006b()
-
-   WFIFOW(fd, offset+(i*106)+42) = char_dat[0].hp     -> WFIFOW(fd,offset+(i*106)+42) = (char_dat[j].hp > 0x7fff)? 0x7fff:char_dat[j].hp;
-   WFIFOW(fd, offset+(i*106)+44) = char_dat[0].max_hp -> WFIFOW(fd,offset+(i*106)+44) = (char_dat[j].max_hp > 0x7fff)? 0x7fff:char_dat[j].max_hp;
-   WFIFOW(fd, offset+(i*106)+46) = char_dat[0].sp     -> WFIFOW(fd,offset+(i*106)+46) = (char_dat[j].sp > 0x7fff)? 0x7fff:char_dat[j].sp
-   WFIFOW(fd, offset+(i*106)+48) = char_dat[0].max_sp -> WFIFOW(fd,offset+(i*106)+48) = (char_dat[j].max_sp > 0x7fff)? 0x7fff:char_dat[j].max_sp;
-
-   in_char.c parse_char()  
-
-   WFIFOW(fd, offset+(i*106)+42) = char_dat[0].hp     -> WFIFOW(fd,offset+(i*106)+42) = (char_dat[j].hp > 0x7fff)? 0x7fff:char_dat[j].hp;
-   WFIFOW(fd, offset+(i*106)+44) = char_dat[0].max_hp -> WFIFOW(fd,offset+(i*106)+44) = (char_dat[j].max_hp > 0x7fff)? 0x7fff:char_dat[j].max_hp;
-   WFIFOW(fd, offset+(i*106)+46) = char_dat[0].sp     -> WFIFOW(fd,offset+(i*106)+46) = (char_dat[j].sp > 0x7fff)? 0x7fff:char_dat[j].sp
-   WFIFOW(fd, offset+(i*106)+48) = char_dat[0].max_sp -> WFIFOW(fd,offset+(i*106)+48) = (char_dat[j].max_sp > 0x7fff)? 0x7fff:char_dat[j].max_sp;
-
-// v.012 - by Jazz
-1. 0627 official version縺ｫ蜷医ｏ縺帙※菫ｮ豁｣縺励∪縺励◆.
-2. no more binary files are supplied.
-
-//---------------------------------------------
-// v.011 - by Mark
-1. Fixed a couple bugs which would cause segfaults under linux :)
-
-//---------------------------------------------
-// v.010 - by Jazz
-1. added some debug info - for reporting.
-
-//---------------------------------------------
-// v.009 - by Jazz
-1. code added for debug.
-2. some SQL sentance fix.
-
-//---------------------------------------------
-// v.009 - by Jazz
-1. fix crash bug. - pet db.
-
-//---------------------------------------------
-// v.008 - by Jazz
-1. DB table fix. - char.fix-from.007.to.008.sql
-
-譌｢蟄倥�ｮ table 讒矩��縺ｫ縺ｯ遏｢縺瑚｣�逹�隗｣髯､縺輔ｌ繧句�ｴ蜷医′縺ゅｊ縺ｾ縺�.
-
-item.equip縺ｯ 'unsigned short' 蠖｢蠑上〒縺�. 
-縺薙�ｮ縺溘ａ縺ｫ SQL table繧剃ｿｮ豁｣縺励↑縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ.
-
-菫ｮ豁｣繧ｳ繝ｼ繝峨�ｯ char.fix-from.007.to.008.sql 縺ｧ縺�.
-MySQL縺ｧ荳�蠎ｦ陦後▲縺ｦ縺上ｌ繧後�ｰ驕ｩ逕ｨ縺輔ｌ縺ｾ縺�. 譌｢蟄倥�ｮ繝�繝ｼ繧ｿ縺ｯ螳牙�ｨ縺ｧ縺�.
-
-//---------------------------------------------
-// v.007 - by Jazz
-1. domain 隗｣驥医↓蟇ｾ縺吶ｋ蝠城｡後ｒ菫ｮ豁｣縺励∪縺励◆.
-
-//---------------------------------------------
-// v.006 - by Jazz
-1. crash bug fix. - when your pet DB is empty
-
-//---------------------------------------------
-// v.005 - by Jazz
-1. 0590 official version縺ｫ蜷医ｏ縺帙※菫ｮ豁｣縺励∪縺励◆.
-
-//---------------------------------------------
-// v.004 - by Jazz
-1. 0586 official version縺ｫ蜷医ｏ縺帙※菫ｮ豁｣縺励∪縺励◆.
-
-//---------------------------------------------
-// v.003 - by Jazz
-1. official縺ｮ guild.c 縺ｨ party.c 繝輔ぃ繧､繝ｫ縺ｧ縺ｾ縺溷�堺ｿｮ豁｣縺励∪縺励◆.
-
-//---------------------------------------------
-// v.002 - by Jazz
-1. aphostropy 蝠城｡後ｒ隗｣豎ｺ縺励∪縺励◆. 縺薙ｌ縺ｯ菫晏ｮ峨→騾｣髢｢縺後≠繧句撫鬘後〒縺�.
-2. SQL縺ｮ讒矩��繧剃ｿｮ豁｣縺励∪縺励◆.
-
-//---------------------------------------------
-// v.001 - by Jazz
-1. 荳�逡ｪ逶ｮ螳牙ｮ� version縺ｧ縺�. alpha version縺ｫ蝠城｡檎せ繧貞､壽焚菫ｮ豁｣縺励∪縺励◆.
-
-//------------------------------------------------------------------------
-//For JAPANESE USER
-Athena Char-Server for MySQL. 005
-
-荳�蠢� guild縺ｨ party縺ｯ繧医￥蜻ｼ縺ｳ蜃ｺ縺励＆繧後ｋ驛ｨ蛻�縺ｪ縺ｮ縺ｧ譌｢蟄倥�ｮ athena char-server縺御ｽｿ縺｣縺ｦ縺�繧� file 蝓ｺ逶､縺ｮ讒矩��繧呈戟縺｣縺ｦ陦後″縺ｾ縺�.
-縺薙ｌ縺ｯ, 荳�蠎ｦ縺ｫ繝｡繝｢繝ｪ繝ｼ縺ｧ逧�隱ｭ繧薙〒, 繧ゅ≧荳�蠎ｦ縺ｫ逧� file縺ｧ菴ｿ縺�譁ｹ縺碁Κ荳九′蟆代↑縺上°縺九ｋ縺ｨ諤昴＞縺ｾ縺�.
-縺昴＠縺ｦ char 繝�繝ｼ繧ｿ縺ｫ豈斐∋縺ｦ, lost縺ｫ縺ｪ縺｣縺ｦ繧ょ撫鬘後′繧ゅ▲縺ｨ蟆代↑縺�縺ｨ蛻､譁ｭ縺励※縺昴≧縺励∪縺励◆.
-
-MySQL繝舌�ｼ繧ｸ繝ｧ繝ｳ縺ｮ compile縺ｯ MySQL Clients Library縺悟ｿ�隕√〒縺�. windows(cygwin) 繝舌�ｼ繧ｸ繝ｧ繝ｳ縺ｫ繧ｳ繝ｳ繝代う繝ｫ縺輔ｌ縺� binary繧呈ｷｻ莉倥＠縺ｾ縺励◆.
-
-險ｭ鄂ｮ:
-縺ｾ縺� text->DB縺ｮ converter縺ｯ縺ｾ縺ｨ繧ゅ↓謾ｯ謠ｴ縺励↑縺�縺ｧ縺�. 蜀�驛ｨ逧�縺ｫ縺｡繧�縺｣縺ｨ繝舌げ縺檎匱隕九＆繧後※繝舌げ繧剃ｿｮ豁｣荳ｭ縺ｧ縺�.
-縺ｧ縺阪ｋ縺�縺第掠縺� upload繧偵＠縺ｾ縺�.
-
-1. char.sql繧� MySQL縺ｫ dump縺励∪縺�.
-
-2. inter_athena.conf縺ｫ谺｡繧定ｿｽ蜉�縺励∪縺�. 縺昴＠縺ｦ閾ｪ蛻�縺ｮ DB繧ｵ繝ｼ繝舌�ｼ縺ｮ諠�蝣ｱ縺ｫ蜷医ｏ縺帙※縺上ｌ縺ｾ縺�.
-縺薙％縺ｧ windows(cygwin)縺ｮ蝣ｴ蜷医↓縺ｯ localhost繧剃ｽｿ縺｣縺ｦ縺ｯ縺�縺代↑縺�縺ｧ縺�. ip縺ｧ譖ｸ縺�縺ｦ縺上ｌ縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ.
-localhost縺ｧ菴ｿ縺�蝣ｴ蜷� UNIX domain socket縺御ｽ懷虚縺吶ｋ縺九ｉ騾｣邨舌′荳榊庄閭ｽ縺ｫ縺ｪ繧翫∪縺�.
-
-//3306 is default
-db_server_port: 3306
-//DB ip
-db_server_ip: 127.0.0.1
-//DB id
-db_server_id: ragnarok
-//DB pass
-db_server_pw: ragnarok
-//DB name
-db_server_logindb: ragnarok
-
-3. MySQL 繝舌�ｼ繧ｸ繝ｧ繝ｳ縺ｯ 2蛟九�ｮ MySQL connect session繧呈戟縺｡縺ｾ縺�.
-荳�縺､縺ｯ繧ｭ繝｣繝ｩ繧ｯ繧ｿ繝ｼ繝�繝ｼ繧ｿ繧定ｪｭ繧薙〒譖ｸ縺上�ｮ縺ｫ菴ｿ繧上ｌ縺ｦ, 莠檎分逶ｮ縺ｯ inter server縺ｮ縺溘ａ縺ｫ騾｣邨舌＠縺ｾ縺�.
-
-髢狗匱縺ｨ繝�繧ｹ繝育腸蠅�縺ｯ P4 2.4a/1024MB/WinXP pro(MediaCenter Edition 2K4 KR)/Cygwin GCC 縺ｧ縺�.
-譛ｬ莠ｺ縺碁沒蝗ｽ莠ｺ縺�縺九ｉ髻灘嵜隱樣幕逋ｺ閠�縺ｮ騾｣邨｡繧よｭ楢ｿ弱＠縺ｾ縺�.
-髻灘嵜隱槭→譌･譛ｬ隱槭�ｮ荳頑焔縺ｪ譁ｹ縺ｯ騾｣邨｡繧偵￥縺�縺輔＞. 譌･譛ｬ隱槭�ｮ菴ｿ逕ｨ縺ｫ髮｣縺励＆繧呈─縺倥※縺�縺ｾ縺�.
-
-迴ｾ蝨ｨ DarkWeiss縺� login server縺ｫ MySQL繧呈髪謠ｴ縺怜ｧ九ａ縺ｾ縺励◆.
-縺励°縺� athena縺ｮ縺昴ｌ縺ｯ DarkWeiss 繧医ｊ繧ゅ▲縺ｨ繧医￥菴懷虚縺吶ｋ縺ｨ諤昴＞縺ｾ縺�.
-
-contact : jazz@creper.com
-
-//------------------------------------------------------------------------
-//For KOREAN USER
-Athena Char-Server for MySQL. 005
-
-�攵�卿 guild�凰 party�株 �梵�｣ｼ �从�ｶ罹据�株 �ｶ��ｶ��擽�攵��� �ｸｰ�｡ｴ�攪 athena char-server�ｰ� �ぎ�圸�葺�ｳ� �梭�株 file �ｸｰ�ｰ們攪 �ｵｬ�｡ｰ�･ｼ �ｰ��ｧ��ｳ� �ｰ瀧笈�共.
-�擽 �ｲ��捩, �復�ｲ溢乱 �ｩ罷ｪｨ�ｦｬ�｡� �ｪｨ�草 �攷�ｳ�, �共�亨 �復�ｲ溢乱 �ｪｨ�草 file�｡� �堂�株 �ｪｽ�擽 �ｶ��葺�ｰ� ����ｲ� �ｱｸ�ｦｰ�共�ｳ� ��晝ｰ��鮒�笈�共.
-�ｷｸ�ｦｬ�ｳ� char �魂�擽�┣�乱 �ｹ��紛, lost�ｰ� �据�鵠�攵�巡 �ｬｸ��懋ｰ� �鵠 ����共�ｳ� �倹�卿�紛��� �ｷｸ����ｲ� �葺����慣�笈�共.
-
-MySQL�ｲ�����攪 compile�捩 MySQL Clients Library�ｰ� �符�囈�鮒�笈�共. windows(cygwin) �ｲ�����愍�｡� �ｻｴ�血�攵�頗 binary�･ｼ �ｲｨ�ｶ��葺����慣�笈�共.
-
-�└�ｹ�:
-�符�ｧ� text->DB�攪 converter�株 ��罹劇�｡� �ｧ��寳�葺�ｧ� �賦�慣�笈�共. �ざ�ｶ�����愍�｡� �平�ｰ� �ｲ��ｷｸ�ｰ� �ｰ懋ｲｬ�据�牟 �ｲ��ｷｸ�･ｼ ��們�菩､卓桿�笈�共.
-�据�巡�｡� �ｹｨ�ｦｬ upload�･ｼ �葺�ｲ��慣�笈�共.
-
-1. char.sql�揆 MySQL�乱 dump�鮒�笈�共.
-
-2. inter_athena.conf�乱 �共�搆�揆 �ｶ緋ｰ� �鮒�笈�共. �ｷｸ�ｦｬ�ｳ� �梵�侠�攪 DB��罹ｲ��攪 ��簿ｳｴ�乱 �ｧ樌ｶ肥牟 �､鷺笈�共.
-�流�ｸｰ�乱��� windows(cygwin)�攪 �ｲｽ�垈�乱�株 localhost�･ｼ �堂�ｩｴ �譜�姓�笈�共. ip�｡� ����牟�｣ｼ�牟�幣 �鮒�笈�共.
-localhost�｡� �ぎ�圸�葺�株 �ｲｽ�垈 UNIX domain socket�擽 �梠�徐 �葺�ｸｰ �阜�ｬｸ�乱 �硫�ｲｰ�擽 �ｶ一ｰ��冠�紛 �ｧ瀧笈�共.
-
-//3306 is default
-db_server_port: 3306
-//DB ip
-db_server_ip: 127.0.0.1
-//DB id
-db_server_id: ragnarok
-//DB pass
-db_server_pw: ragnarok
-//DB name
-db_server_logindb: ragnarok
-
-3. MySQL �ｲ�����捩 2�ｰ懍攪 MySQL connect session�揆 �ｰ��ｧ瀧笈�共.
-�葺�ｘ�株 �ｺ尖ｦｭ�┣ �魂�擽�┣�･ｼ �攷�ｳ� �堂�株�魂 �ぎ�圸�据�ｩｰ, �草�ｲ溢ｧｸ�株 inter server�･ｼ �怱�紛��� �硫�ｲｰ�鮒�笈�共.
-
-�ｰ罹ｰ懋ｳｼ ��護侃�敢 �劍�ｲｽ�捩 P4 2.4a/1024MB/WinXP pro(MediaCenter Edition 2K4 KR)/Cygwin GCC �桿�笈�共.
-�ｳｸ�攤�擽 �復�ｵｭ�攤�擽�ｸｰ �阜�ｬｸ�乱 �復�ｵｭ�牟 �ｰ罹ｰ懍梵�攪 �硫�攷�巡 �劍����鮒�笈�共.
-�復�ｵｭ�牟�凰 �攵�ｳｸ�牟�ｰ� �冠��呰復 �ｶ��捩 �硫�攷�揆 �｣ｼ�┷�囈. �攵�ｳｸ�牟�攪 �ぎ�圸�乱 �牟��､�它�揆 �叶�⊂�ｳ� �梭�慣�笈�共.
-
-����椪 DarkWeiss�ｰ� login server�乱 MySQL�揆 �ｧ��寳�葺�ｸｰ �亨�梠�毎�慣�笈�共.
-�葺�ｧ��ｧ� athena�攪 �ｷｸ�ｲ��捩 DarkWeiss �ｳｴ�共 �鵠 �椈 �梠�徐�復�共�ｳ� ��晝ｰ��鮒�笈�共.
-
-contact : jazz@creper.com
-
-//------------------------------------------------------------------------
-//For ENGLISH USER
-Athena Char-Server for MySQL. alpha 005
-
-= hehe. My English is poor. and I have no time to write. :)
-
-anyway this version use guild and party data on text file base system.
-It accesses many times, so memory dumping is useful for less cpu consume.
-
-MySQL version need MySQL Clients Library to compile. This include Win32-binary compiled by cygwin-gcc.
-
-Install:
-not yet text->DB converter. I found some bug on it, so It's under debug progress.
-
-1. dump char.sql to MySQL.
-
-2. add below on inter_athena.conf. and set your own information.
-do not use 'localhost' as domain on cygwin. you must set as ip.
-if you use localhost on cygwin, cygwin tries to connect MySQL as UNIX domain socket.
-but, MySQL does not support UNIX domain socket on windows.
-
-//3306 is default
-db_server_port: 3306
-//DB ip
-db_server_ip: 127.0.0.1
-//DB id
-db_server_id: ragnarok
-//DB pass
-db_server_pw: ragnarok
-//DB name
-db_server_logindb: ragnarok
-
-3. MySQL version has 2 MySQL connect session.
-one is for char-server and the other one is for inter-server.
-
-developement enviroment)
- P4 2.4a/1024MB/WinXP pro(MediaCenter Edition 2K4 KR)/Cygwin GCC
-
-I'm korean, so contect if U're Korean developer.
-Please contact me, If U can use Korean & Japanese well.
-
-DarkWeiss starts to support MySQL version of login server, but Athena's one works better, I thnik.
-
-contact : jazz@creper.com