Clearing trunk.

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

13 files changed, 0 insertions, 7326 deletions

diff --git a/src/char/Makefile b/src/char/Makefile
deleted file mode 100644
index aee0e69e2..000000000
--- a/src/char/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-all: char-server
-txt: char-server
-
-COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o ../common/obj/db.o ../common/obj/lock.o ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/strlib.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/lock.h ../common/timer.h ../common/malloc.h ../common/showmsg.h ../common/strlib.h
-char-server: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o $(COMMON_OBJ)
-	$(CC) -o ../../$@ $> $(LIB_S)
-
-char.o: char.c char.h inter.h int_pet.h $(COMMON_H) ../common/version.h
-inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h char.h $(COMMON_H)
-int_party.o: int_party.c int_party.h inter.h char.h $(COMMON_H)
-int_guild.o: int_guild.c int_guild.h int_storage.h inter.h char.h $(COMMON_H)
-int_storage.o: int_storage.c int_storage.h int_guild.h inter.h char.h $(COMMON_H)
-int_pet.o: int_pet.c int_pet.h inter.h char.h $(COMMON_H)
-
-clean:
-	rm -f *.o ../../char-server
diff --git a/src/char/char.c b/src/char/char.c
deleted file mode 100644
index 73efbc864..000000000
--- a/src/char/char.c
+++ /dev/null
@@ -1,3615 +0,0 @@
-// $Id: char.c,v 1.3 2004/09/13 16:52:16 Yor Exp $
-// original : char2.c 2003/03/14 11:58:35 Rev.1.5
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef _WIN32
-#include <winsock.h>
-typedef long in_addr_t;
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-#include <time.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "../common/strlib.h"
-#include "core.h"
-#include "socket.h"
-#include "timer.h"
-#include "mmo.h"
-#include "db.h"
-#include "version.h"
-#include "lock.h"
-#include "char.h"
-#include "showmsg.h"
-#include "buffer.h"
-
-#include "inter.h"
-#include "int_pet.h"
-#include "int_guild.h"
-#include "int_party.h"
-#include "int_storage.h"
-
-#ifdef MEMWATCH
-#include "memwatch.h"
-#endif
-
-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[16];
-in_addr_t login_ip;
-int login_port = 6900;
-int char_ip_set_ = 0;
-char char_ip_str[16];
-int bind_ip_set_ = 0;
-char bind_ip_str[16];
-in_addr_t char_ip;
-int char_port = 6121;
-int char_maintenance;
-int char_new;
-int email_creation = 0; // disabled by default
-char char_txt[1024]="save/athena.txt";
-char backup_txt[1024]="save/backup.txt"; //By zanetheinsane
-char friends_txt[1024]="save/friends.txt"; // davidsiaw
-char backup_txt_flag = 0; // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. => option By [Yor]
-char unknown_char_name[1024] = "Unknown";
-char char_log_filename[1024] = "log/char.log";
-char db_path[1024]="db";
-//Added for lan support
-char lan_map_ip[128];
-int subneti[4];
-int subnetmaski[4];
-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 authorised (or not) in a character name. by [Yor]
-
-int log_char = 1;	// loggin char or not [devil]
-int log_inter = 1;	// loggin inter or not [devil]
-
-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)
-};
-
-//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;
-
-#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;
-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;
-
-// Initial position (it's possible to set it in conf file)
-struct point start_point = {"new_1-1.gat", 53, 111};
-
-struct gm_account *gm_account = NULL;
-int GM_num = 0;
-
-// online players by [Yor]
-char online_txt_filename[1024] = "online.txt";
-char online_html_filename[1024] = "online.html";
-int online_sorting_option = 0; // sorting option to display online players in online files
-int online_display_option = 1; // display options: to know which columns must be displayed
-int online_players_max;
-int online_refresh_html = 20; // refresh time (in sec) of the html file in the explorer
-int online_gm_display_min_level = 20; // minimum GM level to display 'GM' when we want to display it
-
-struct online_chars {
-	int char_id;
-	int server;
-} *online_chars;
-
-time_t update_online; // to update online files when we receiving information from a server (not less than 8 seconds)
-
-int console = 0;
-
-//------------------------------
-// Writing function of logs file
-//------------------------------
-int char_log(char *fmt, ...) {
-	if(log_char)
-	{
-		FILE *logfp;
-		va_list ap;
-		struct timeval tv;
-		char tmpstr[2048];
-
-		va_start(ap, fmt);
-
-		logfp = fopen(char_log_filename, "a");
-		if (logfp) {
-			if (fmt[0] == '\0') // jump a line if no message
-				fprintf(logfp, RETCODE);
-			else {
-				gettimeofday(&tv, NULL);
-				strftime(tmpstr, 24, "%d-%m-%Y %H:%M:%S", localtime((const time_t*)&(tv.tv_sec)));
-				sprintf(tmpstr + 19, ".%03d: %s", (int)tv.tv_usec / 1000, fmt);
-				vfprintf(logfp, tmpstr, ap);
-			}
-			fclose(logfp);
-		}
-		va_end(ap);
-	}
-	return 0;
-}
-
-//----------------------------------------------------------------------
-// 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)
-//----------------------------------------------------------------------
-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;
-}
-
-//----------------------------------------------
-// Search an character id
-//   (return character index or -1 (if not found))
-//   If exact character name is not found,
-//   the function checks without case sensitive
-//   and returns index if only 1 character is found
-//   and similar to the searched name.
-//----------------------------------------------
-int search_character_index(char* character_name) {
-	int i, quantity, index;
-
-	quantity = 0;
-	index = -1;
-	for(i = 0; i < char_num; i++) {
-		// Without case sensitive check (increase the number of similar character names found)
-		if (stricmp(char_dat[i].name, character_name) == 0) {
-			// Strict comparison (if found, we finish the function immediatly with correct value)
-			if (strcmp(char_dat[i].name, character_name) == 0)
-				return i;
-			quantity++;
-			index = i;
-		}
-	}
-	// Here, the exact character name is not found
-	// We return the found index of a similar account ONLY if there is 1 similar character
-	if (quantity == 1)
-		return index;
-
-	// Exact character name is not found and 0 or more than 1 similar characters have been found ==> we say not found
-	return -1;
-}
-
-//-------------------------------------
-// Return character name with the index
-//-------------------------------------
-char * search_character_name(int index) {
-
-	if (index >= 0 && index < char_num)
-		return char_dat[index].name;
-
-	return unknown_char_name;
-}
-
-//-------------------------------------------------
-// Set Character online/offline [Wizputer]
-//-------------------------------------------------
-
-void set_char_online(int char_id, int account_id) {
-	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_char_offline(int char_id, int account_id) {
-    if (login_fd <= 0 || session[login_fd]->eof)
-		return;
-	WFIFOW(login_fd,0) = 0x272c;
-	WFIFOL(login_fd,2) = account_id;
-	WFIFOSET(login_fd,6);
-}
-
-/*---------------------------------------------------
-  Make a data line for friends list
- --------------------------------------------------*/
-
-int mmo_friends_list_data_str(char *str, struct mmo_charstatus *p) {
-	int i;
-	char *str_p = str;
-	str_p += sprintf(str_p, "%d", p->char_id);
-
-	for (i=0;i<20;i++)
-	{
-		str_p += sprintf(str_p, ",%d,%s", p->friend_id[i],p->friend_name[i]);
-	}
-	return 0;
-}
-
-//-------------------------------------------------
-// Function to create the character line (for save)
-//-------------------------------------------------
-int mmo_char_tostr(char *str, struct mmo_charstatus *p) {
-	int i;
-	char *str_p = str;
-
-	// on multi-map server, sometimes it's posssible that last_point become void. (reason???) We check that to not lost character at restart.
-	if (p->last_point.map[0] == '\0') {
-		memcpy(p->last_point.map, "prontera.gat", 16);
-		p->last_point.x = 273;
-		p->last_point.y = 354;
-	}
-
-	str_p += sprintf(str_p, "%d\t%d,%d\t%s\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d"
-	  "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d"
-	  "\t%s,%d,%d\t%s,%d,%d,%d,%d,%d,%d\t",
-	  p->char_id, p->account_id, p->char_num, p->name, //
-	  p->class_, p->base_level, p->job_level,
-	  p->base_exp, p->job_exp, p->zeny,
-	  p->hp, p->max_hp, p->sp, p->max_sp,
-	  p->str, p->agi, p->vit, p->int_, p->dex, p->luk,
-	  p->status_point, p->skill_point,
-	  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);
-	for(i = 0; i < 10; i++)
-		if (p->memo_point[i].map[0]) {
-			str_p += sprintf(str_p, "%s,%d,%d", p->memo_point[i].map, p->memo_point[i].x, p->memo_point[i].y);
-		}
-	*(str_p++) = '\t';
-
-	for(i = 0; i < MAX_INVENTORY; i++)
-		if (p->inventory[i].nameid) {
-			str_p += sprintf(str_p, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ",
-			         p->inventory[i].id, p->inventory[i].nameid, p->inventory[i].amount, p->inventory[i].equip,
-			         p->inventory[i].identify, p->inventory[i].refine, p->inventory[i].attribute,
-			         p->inventory[i].card[0], p->inventory[i].card[1], p->inventory[i].card[2], p->inventory[i].card[3]);
-		}
-	*(str_p++) = '\t';
-
-	for(i = 0; i < MAX_CART; i++)
-		if (p->cart[i].nameid) {
-			str_p += sprintf(str_p, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ",
-			         p->cart[i].id, p->cart[i].nameid, p->cart[i].amount, p->cart[i].equip,
-			         p->cart[i].identify, p->cart[i].refine, p->cart[i].attribute,
-			         p->cart[i].card[0], p->cart[i].card[1], p->cart[i].card[2], p->cart[i].card[3]);
-		}
-	*(str_p++) = '\t';
-
-	for(i = 0; i < MAX_SKILL; i++)
-		if (p->skill[i].id && p->skill[i].flag != 1) {
-			str_p += sprintf(str_p, "%d,%d ", p->skill[i].id, (p->skill[i].flag == 0) ? p->skill[i].lv : p->skill[i].flag-2);
-		}
-	*(str_p++) = '\t';
-
-	for(i = 0; i < p->global_reg_num; i++)
-		if (p->global_reg[i].str[0])
-			str_p += sprintf(str_p, "%s,%d ", p->global_reg[i].str, p->global_reg[i].value);
-	*(str_p++) = '\t';
-
-	*str_p = '\0';
-	return 0;
-}
-
-//-------------------------------------------------------------------------
-// Function to set the character from the line (at read of characters file)
-//-------------------------------------------------------------------------
-int mmo_char_fromstr(char *str, struct mmo_charstatus *p) {
-	int tmp_int[256];
-	int set, next, len, i;
-
-	// initilialise character
-	memset(p, '\0', sizeof(struct mmo_charstatus));
-	
-	// If it's not char structure of version 1363 and after
-	if ((set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d"
-	   "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d"
-	   "\t%[^,],%d,%d\t%[^,],%d,%d,%d,%d,%d,%d%n",
-	   &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, //
-	   &tmp_int[3], &tmp_int[4], &tmp_int[5],
-           &tmp_int[6], &tmp_int[7], &tmp_int[8],
-           &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12],
-           &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18],
-           &tmp_int[19], &tmp_int[20],
-           &tmp_int[21], &tmp_int[22], &tmp_int[23], //
-           &tmp_int[24], &tmp_int[25], &tmp_int[26],
-           &tmp_int[27], &tmp_int[28], &tmp_int[29],
-           &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34],
-           p->last_point.map, &tmp_int[35], &tmp_int[36], //
-           p->save_point.map, &tmp_int[37], &tmp_int[38], &tmp_int[39], 
-	   &tmp_int[40], &tmp_int[41], &tmp_int[42], &next)) != 46) {
-		tmp_int[40] = 0; // father
-		tmp_int[41] = 0; // mother
-		tmp_int[42] = 0; // child
-	// If it's not char structure of version 1008 and before 1363
-	if ((set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d"
-	   "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d"
-	   "\t%[^,],%d,%d\t%[^,],%d,%d,%d%n",
-	   &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, //
-	   &tmp_int[3], &tmp_int[4], &tmp_int[5],
-	   &tmp_int[6], &tmp_int[7], &tmp_int[8],
-	   &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12],
-	   &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18],
-	   &tmp_int[19], &tmp_int[20],
-	   &tmp_int[21], &tmp_int[22], &tmp_int[23], //
-	   &tmp_int[24], &tmp_int[25], &tmp_int[26],
-	   &tmp_int[27], &tmp_int[28], &tmp_int[29],
-	   &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34],
-	   p->last_point.map, &tmp_int[35], &tmp_int[36], //
-	   p->save_point.map, &tmp_int[37], &tmp_int[38], &tmp_int[39], &next)) != 43) {
-		tmp_int[39] = 0; // partner id
-		// If not char structure from version 384 to 1007
-		if ((set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d"
-		   "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d"
-		   "\t%[^,],%d,%d\t%[^,],%d,%d%n",
-		   &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, //
-		   &tmp_int[3], &tmp_int[4], &tmp_int[5],
-		   &tmp_int[6], &tmp_int[7], &tmp_int[8],
-		   &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12],
-		   &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18],
-		   &tmp_int[19], &tmp_int[20],
-		   &tmp_int[21], &tmp_int[22], &tmp_int[23], //
-		   &tmp_int[24], &tmp_int[25], &tmp_int[26],
-		   &tmp_int[27], &tmp_int[28], &tmp_int[29],
-		   &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34],
-		   p->last_point.map, &tmp_int[35], &tmp_int[36], //
-		   p->save_point.map, &tmp_int[37], &tmp_int[38], &next)) != 42) {
-			// It's char structure of a version before 384
-			tmp_int[26] = 0; // pet id
-			set = sscanf(str, "%d\t%d,%d\t%[^\t]\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d"
-			      "\t%d,%d,%d\t%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d"
-			      "\t%[^,],%d,%d\t%[^,],%d,%d%n",
-			      &tmp_int[0], &tmp_int[1], &tmp_int[2], p->name, //
-			      &tmp_int[3], &tmp_int[4], &tmp_int[5],
-			      &tmp_int[6], &tmp_int[7], &tmp_int[8],
-			      &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12],
-			      &tmp_int[13], &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18],
-			      &tmp_int[19], &tmp_int[20],
-			      &tmp_int[21], &tmp_int[22], &tmp_int[23], //
-			      &tmp_int[24], &tmp_int[25], //
-			      &tmp_int[27], &tmp_int[28], &tmp_int[29],
-			      &tmp_int[30], &tmp_int[31], &tmp_int[32], &tmp_int[33], &tmp_int[34],
-			      p->last_point.map, &tmp_int[35], &tmp_int[36], //
-			      p->save_point.map, &tmp_int[37], &tmp_int[38], &next);
-			set += 2;
-			//printf("char: old char data ver.1\n");
-		// Char structure of version 1007 or older
-		} else {
-			set++;
-			//printf("char: old char data ver.2\n");
-		}
-	// Char structure of version 1008+
-	} else {
-		set+=3;
-		//printf("char: new char data ver.3\n");
-	}
-	// Char structture of version 1363+
-	} else {
-		//printf("char: new char data ver.4\n");
-	}
-	if (set != 46)
-		return 0;
-
-	p->char_id = tmp_int[0];
-	p->account_id = tmp_int[1];
-	p->char_num = tmp_int[2];
-	p->class_ = tmp_int[3];
-	p->base_level = tmp_int[4];
-	p->job_level = tmp_int[5];
-	p->base_exp = tmp_int[6];
-	p->job_exp = tmp_int[7];
-	p->zeny = tmp_int[8];
-	p->hp = tmp_int[9];
-	p->max_hp = tmp_int[10];
-	p->sp = tmp_int[11];
-	p->max_sp = tmp_int[12];
-	p->str = tmp_int[13];
-	p->agi = tmp_int[14];
-	p->vit = tmp_int[15];
-	p->int_ = tmp_int[16];
-	p->dex = tmp_int[17];
-	p->luk = tmp_int[18];
-	p->status_point = tmp_int[19];
-	p->skill_point = tmp_int[20];
-	p->option = tmp_int[21];
-	p->karma = tmp_int[22];
-	p->manner = tmp_int[23];
-	p->party_id = tmp_int[24];
-	p->guild_id = tmp_int[25];
-	p->pet_id = tmp_int[26];
-	p->hair = tmp_int[27];
-	p->hair_color = tmp_int[28];
-	p->clothes_color = tmp_int[29];
-	p->weapon = tmp_int[30];
-	p->shield = tmp_int[31];
-	p->head_top = tmp_int[32];
-	p->head_mid = tmp_int[33];
-	p->head_bottom = tmp_int[34];
-	p->last_point.x = tmp_int[35];
-	p->last_point.y = tmp_int[36];
-	p->save_point.x = tmp_int[37];
-	p->save_point.y = tmp_int[38];
-	p->partner_id = tmp_int[39];
-	p->father = tmp_int[40];
-	p->mother = tmp_int[41];
-	p->child = tmp_int[42];
-
-	// Some checks
-	for(i = 0; i < char_num; i++) {
-		if (char_dat[i].char_id == p->char_id) {
-			printf("\033[1;31mmmo_auth_init: ******Error: a character has an identical id to another.\n");
-			printf("               character id #%d -> new character not readed.\n", p->char_id);
-			printf("               Character saved in log file.\033[0m\n");
-			return -1;
-		} else if (strcmp(char_dat[i].name, p->name) == 0) {
-			printf("\033[1;31mmmo_auth_init: ******Error: character name already exists.\n");
-			printf("               character name '%s' -> new character not readed.\n", p->name);
-			printf("               Character saved in log file.\033[0m\n");
-			return -2;
-		}
-	}
-
-	if (strcmpi(wisp_server_name, p->name) == 0) {
-		printf("mmo_auth_init: ******WARNING: character name has wisp server name.\n");
-		printf("               Character name '%s' = wisp server name '%s'.\n", p->name, wisp_server_name);
-		printf("               Character readed. Suggestion: change the wisp server name.\n");
-		char_log("mmo_auth_init: ******WARNING: character name has wisp server name: Character name '%s' = wisp server name '%s'." RETCODE,
-		          p->name, wisp_server_name);
-	}
-
-	if (str[next] == '\n' || str[next] == '\r')
-		return 1;	// 新規データ
-
-	next++;
-
-	for(i = 0; str[next] && str[next] != '\t'; i++) {
-		if (sscanf(str+next, "%[^,],%d,%d%n", p->memo_point[i].map, &tmp_int[0], &tmp_int[1], &len) != 3)
-			return -3;
-		p->memo_point[i].x = tmp_int[0];
-		p->memo_point[i].y = tmp_int[1];
-		next += len;
-		if (str[next] == ' ')
-			next++;
-	}
-
-	next++;
-
-	for(i = 0; str[next] && str[next] != '\t'; i++) {
-		if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-		    &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		    &tmp_int[4], &tmp_int[5], &tmp_int[6],
-		    &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[10], &len) == 12) {
-			// do nothing, it's ok
-		} else if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-		          &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		          &tmp_int[4], &tmp_int[5], &tmp_int[6],
-		          &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) {
-		} else // invalid structure
-			return -4;
-		p->inventory[i].id = tmp_int[0];
-		p->inventory[i].nameid = tmp_int[1];
-		p->inventory[i].amount = tmp_int[2];
-		p->inventory[i].equip = tmp_int[3];
-		p->inventory[i].identify = tmp_int[4];
-		p->inventory[i].refine = tmp_int[5];
-		p->inventory[i].attribute = tmp_int[6];
-		p->inventory[i].card[0] = tmp_int[7];
-		p->inventory[i].card[1] = tmp_int[8];
-		p->inventory[i].card[2] = tmp_int[9];
-		p->inventory[i].card[3] = tmp_int[10];
-		next += len;
-		if (str[next] == ' ')
-			next++;
-	}
-
-	next++;
-
-	for(i = 0; str[next] && str[next] != '\t'; i++) {
-		if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-		    &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		    &tmp_int[4], &tmp_int[5], &tmp_int[6],
-		    &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[10], &len) == 12) {
-			// do nothing, it's ok
-		} else if (sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-		           &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		           &tmp_int[4], &tmp_int[5], &tmp_int[6],
-		           &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) {
-		} else // invalid structure
-			return -5;
-		p->cart[i].id = tmp_int[0];
-		p->cart[i].nameid = tmp_int[1];
-		p->cart[i].amount = tmp_int[2];
-		p->cart[i].equip = tmp_int[3];
-		p->cart[i].identify = tmp_int[4];
-		p->cart[i].refine = tmp_int[5];
-		p->cart[i].attribute = tmp_int[6];
-		p->cart[i].card[0] = tmp_int[7];
-		p->cart[i].card[1] = tmp_int[8];
-		p->cart[i].card[2] = tmp_int[9];
-		p->cart[i].card[3] = tmp_int[10];
-		next += len;
-		if (str[next] == ' ')
-			next++;
-	}
-
-	next++;
-
-	for(i = 0; str[next] && str[next] != '\t'; i++) {
-		if (sscanf(str + next, "%d,%d%n", &tmp_int[0], &tmp_int[1], &len) != 2)
-			return -6;
-		p->skill[tmp_int[0]].id = tmp_int[0];
-		p->skill[tmp_int[0]].lv = tmp_int[1];
-		next += len;
-		if (str[next] == ' ')
-			next++;
-	}
-
-	next++;
-
-	for(i = 0; str[next] && str[next] != '\t' && str[next] != '\n' && str[next] != '\r'; i++) { // global_reg実装以前のathena.txt互換のため一応'\n'チェック
-		if (sscanf(str + next, "%[^,],%d%n", p->global_reg[i].str, &p->global_reg[i].value, &len) != 2) {
-			// because some scripts are not correct, the str can be "". So, we must check that.
-			// If it's, we must not refuse the character, but just this REG value.
-			// Character line will have something like: nov_2nd_cos,9 ,9 nov_1_2_cos_c,1 (here, ,9 is not good)
-			if (str[next] == ',' && sscanf(str + next, ",%d%n", &p->global_reg[i].value, &len) == 1)
-				i--;
-			else
-				return -7;
-		}
-		next += len;
-		if (str[next] == ' ')
-			next++;
-	}
-	p->global_reg_num = i;
-
-	return 1;
-}
-//---------------------------------
-// Function to read friend list
-//---------------------------------
-
-int parse_friend_txt(struct mmo_charstatus *p)
-{
-	char line[1024];
-	int i,cid=0,temp[20];
-	FILE *fp;
-
-	// Open the file and look for the ID
-	fp = fopen(friends_txt, "r");
-
-	if(fp == NULL)
-		return 1;
-
-
-	while(fgets(line, sizeof(line)-1, fp)) {
-
-		if(line[0] == '/' && line[1] == '/')
-			continue;
-
-		sscanf(line, "%d,%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%[^,],%d,%s",&cid,
-		&temp[0],p->friend_name[0],
-		&temp[1],p->friend_name[1],
-		&temp[2],p->friend_name[2],
-		&temp[3],p->friend_name[3],
-		&temp[4],p->friend_name[4],
-		&temp[5],p->friend_name[5],
-		&temp[6],p->friend_name[6],
-		&temp[7],p->friend_name[7],
-		&temp[8],p->friend_name[8],
-		&temp[9],p->friend_name[9],
-		&temp[10],p->friend_name[10],
-		&temp[11],p->friend_name[11],
-		&temp[12],p->friend_name[12],
-		&temp[13],p->friend_name[13],
-		&temp[14],p->friend_name[14],
-		&temp[15],p->friend_name[15],
-		&temp[16],p->friend_name[16],
-		&temp[17],p->friend_name[17],
-		&temp[18],p->friend_name[18],
-		&temp[19],p->friend_name[19]);
-		if (cid == p->char_id)
-			break;
-	}
-
-	// No register of friends list
-	if (cid == 0) {
-		fclose(fp);
-		return 0;
-	}
-
-	// Fill in the list
-
-	for (i=0; i<20; i++)
-		p->friend_id[i] = temp[i];
-
-	fclose(fp);
-	return 0;
-}
-
-//---------------------------------
-// Function to read characters file
-//---------------------------------
-int mmo_char_init(void) {
-	char line[65536];
-	int i;
-	int ret, line_count;
-	FILE *fp;
-
-	char_max = 256;
-	char_dat = (struct mmo_charstatus*)aCalloc(sizeof(struct mmo_charstatus) * 256, 1);
-	if (!char_dat) {
-		printf("out of memory: mmo_char_init (calloc of char_dat).\n");
-		exit(1);
-	}
-	for(i = 0; i < char_max; i++)
-	{
-		online_chars[i].char_id = -1;
-		online_chars[i].server = -1;
-	}
-
-	char_num = 0;
-
-	fp = fopen(char_txt, "r");
-
-	if (fp == NULL) {
-		printf("Characters file not found: %s.\n", char_txt);
-		char_log("Characters file not found: %s." RETCODE, char_txt);
-		char_log("Id for the next created character: %d." RETCODE, char_id_count);
-		return 0;
-	}
-
-	line_count = 0;
-	while(fgets(line, sizeof(line)-1, fp)) {
-		int i, j;
-		line_count++;
-
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-		line[sizeof(line)-1] = '\0';
-
-		j = 0;
-		if (sscanf(line, "%d\t%%newid%%%n", &i, &j) == 1 && j > 0) {
-			if (char_id_count < i)
-				char_id_count = i;
-			continue;
-		}
-
-		if (char_num >= char_max) {
-			char_max += 256;
-			char_dat = (struct mmo_charstatus*)aRealloc(char_dat, sizeof(struct mmo_charstatus) * char_max);
-			if (!char_dat) {
-				printf("Out of memory: mmo_char_init (realloc of char_dat).\n");
-				char_log("Out of memory: mmo_char_init (realloc of char_dat)." RETCODE);
-				exit(1);
-			}
-			online_chars = (struct online_chars*)aRealloc(online_chars, sizeof(struct online_chars) * char_max);
-			if (!online_chars) {
-				printf("Out of memory: mmo_char_init (realloc of online_chars).\n");
-				char_log("Out of memory: mmo_char_init (realloc of online_chars)." RETCODE);
-				exit(1);
-			}
-			for(i = char_max - 256; i < char_max; i++)
-			{
-				online_chars[i].char_id = -1;
-				online_chars[i].server = -1;
-			}
-		}
-
-		ret = mmo_char_fromstr(line, &char_dat[char_num]);
-
-		// Initialize friends list
-		parse_friend_txt(&char_dat[char_num]);  // Grab friends for the character
-
-		if (ret > 0) { // negative value or zero for errors
-			if (char_dat[char_num].char_id >= char_id_count)
-				char_id_count = char_dat[char_num].char_id + 1;
-			char_num++;
-		} else {
-			printf("mmo_char_init: in characters file, unable to read the line #%d.\n", line_count);
-			printf("               -> Character saved in log file.\n");
-			switch (ret) {
-			case -1:
-				char_log("Duplicate character id in the next character line (character not readed):" RETCODE);
-				break;
-			case -2:
-				char_log("Duplicate character name in the next character line (character not readed):" RETCODE);
-				break;
-			case -3:
-				char_log("Invalid memo point structure in the next character line (character not readed):" RETCODE);
-				break;
-			case -4:
-				char_log("Invalid inventory item structure in the next character line (character not readed):" RETCODE);
-				break;
-			case -5:
-				char_log("Invalid cart item structure in the next character line (character not readed):" RETCODE);
-				break;
-			case -6:
-				char_log("Invalid skill structure in the next character line (character not readed):" RETCODE);
-				break;
-			case -7:
-				char_log("Invalid register structure in the next character line (character not readed):" RETCODE);
-				break;
-			default: // 0
-				char_log("Unabled to get a character in the next line - Basic structure of line (before inventory) is incorrect (character not readed):" RETCODE);
-				break;
-			}
-			char_log("%s", line);
-		}
-	}
-	fclose(fp);
-
-	if (char_num == 0) {
-		printf("mmo_char_init: No character found in %s.\n", char_txt);
-		char_log("mmo_char_init: No character found in %s." RETCODE, char_txt);
-	} else if (char_num == 1) {
-		printf("mmo_char_init: 1 character read in %s.\n", char_txt);
-		char_log("mmo_char_init: 1 character read in %s." RETCODE, char_txt);
-	} else {
-		printf("mmo_char_init: %d characters read in %s.\n", char_num, char_txt);
-		char_log("mmo_char_init: %d characters read in %s." RETCODE, char_num, char_txt);
-	}
-
-	char_log("Id for the next created character: %d." RETCODE, char_id_count);
-
-	return 0;
-}
-
-//---------------------------------------------------------
-// Function to save characters in files (speed up by [Yor])
-//---------------------------------------------------------
-void mmo_char_sync(void) {
-	char line[65536],f_line[1024];
-	int i, j, k;
-	int lock;
-	FILE *fp,*f_fp;
-	//int *id = (int *) aMalloc(sizeof(int) * char_num);
-	CREATE_BUFFER(id, int, char_num);
-
-	// Sorting before save (by [Yor])
-	for(i = 0; i < char_num; i++) {
-		id[i] = i;
-		for(j = 0; j < i; j++) {
-			if ((char_dat[i].account_id < char_dat[id[j]].account_id) ||
-			    // if same account id, we sort by slot.
-			    (char_dat[i].account_id == char_dat[id[j]].account_id &&
-			     char_dat[i].char_num < char_dat[id[j]].char_num)) {
-				for(k = i; k > j; k--)
-					id[k] = id[k-1];
-				id[j] = i; // id[i]
-				break;
-			}
-		}
-	}
-
-	// Data save
-	fp = lock_fopen(char_txt, &lock);
-	if (fp == NULL) {
-		printf("WARNING: Server can't not save characters.\n");
-		char_log("WARNING: Server can't not save characters." RETCODE);
-	} else {
-		for(i = 0; i < char_num; i++) {
-			// create only once the line, and save it in the 2 files (it's speeder than repeat twice the loop and create twice the line)
-			mmo_char_tostr(line, &char_dat[id[i]]); // use of sorted index
-				fprintf(fp, "%s" RETCODE, line);
-		}
-		fprintf(fp, "%d\t%%newid%%" RETCODE, char_id_count);
-		lock_fclose(fp, char_txt, &lock);
-	}
-
-	// Data save (backup)
-	if (backup_txt_flag) { // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. => option By [Yor]
-		fp = lock_fopen(backup_txt, &lock);
-		if (fp == NULL) {
-			printf("WARNING: Server can't not create backup of characters file.\n");
-			char_log("WARNING: Server can't not create backup of characters file." RETCODE);
-			//aFree(id); // free up the memory before leaving -.- [Ajarn]
-			DELETE_BUFFER(id);
-			return;
-		}
-		for(i = 0; i < char_num; i++) {
-			// create only once the line, and save it in the 2 files (it's speeder than repeat twice the loop and create twice the line)
-			mmo_char_tostr(line, &char_dat[id[i]]); // use of sorted index
-				fprintf(fp, "%s" RETCODE, line);
-		}
-		fprintf(fp, "%d\t%%newid%%" RETCODE, char_id_count);
-		lock_fclose(fp, backup_txt, &lock);
-	}
-
-	// Friends List data save (davidsiaw)
-	f_fp = lock_fopen(friends_txt, &lock);
-	for(i = 0; i < char_num; i++) {
-		mmo_friends_list_data_str(f_line, &char_dat[id[i]]);
-		fprintf(f_fp, "%s" RETCODE, f_line);
-	}
-
-	lock_fclose(f_fp, friends_txt, &lock);
-
-	//aFree(id);
-	DELETE_BUFFER(id);
-
-	return;
-}
-
-//----------------------------------------------------
-// Function to save (in a periodic way) datas in files
-//----------------------------------------------------
-int mmo_char_sync_timer(int tid, unsigned int tick, int id, int data) {
-	mmo_char_sync();
-	inter_save();
-	return 0;
-}
-
-//-----------------------------------
-// Function to create a new character
-//-----------------------------------
-int make_new_char(int fd, unsigned char *dat) {
-	int i, j;
-	struct char_session_data *sd;
-
-	sd = (struct char_session_data*)session[fd]->session_data;
-
-	// remove control characters from the name
-	dat[23] = '\0';
-	if (remove_control_chars((unsigned char *)(char*)dat)) {
-		char_log("Make new char error (control char received in the name): (connection #%d, account: %d)." RETCODE,
-		         fd, sd->account_id);
-		return -1;
-	}
-
-	// check lenght of character name
-	if (strlen((const char*)dat) < 4) {
-		char_log("Make new char error (character name too small): (connection #%d, account: %d, name: '%s')." RETCODE,
-		         fd, sd->account_id, dat);
-		return -1;
-	}
-
-	// 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; dat[i]; i++)
-			if (strchr(char_name_letters, dat[i]) == NULL) {
-				char_log("Make new char error (invalid letter in the name): (connection #%d, account: %d), name: %s, invalid letter: %c." RETCODE,
-				         fd, sd->account_id, dat, dat[i]);
-				return -1;
-			}
-	} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
-		for (i = 0; dat[i]; i++)
-			if (strchr(char_name_letters, dat[i]) != NULL) {
-				char_log("Make new char error (invalid letter in the name): (connection #%d, account: %d), name: %s, invalid letter: %c." RETCODE,
-				         fd, sd->account_id, dat, dat[i]);
-				return -1;
-			}
-	} // else, all letters/symbols are authorised (except control char removed before)
-
-	if (dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29] != 5*6 || // stats
-	    dat[30] >= 9 || // slots (dat[30] can not be negativ)
-	    dat[33] <= 0 || dat[33] >= 20 || // hair style
-	    dat[31] >= 9) { // hair color (dat[31] can not be negativ)
-		char_log("Make new char error (invalid values): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d" RETCODE,
-		         fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]);
-		return -1;
-	}
-
-	// check individual stat value
-	for(i = 24; i <= 29; i++) {
-		if (dat[i] < 1 || dat[i] > 9) {
-			char_log("Make new char error (invalid stat value: not between 1 to 9): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d" RETCODE,
-			         fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]);
-			return -1;
-		}
-	}
-
-	for(i = 0; i < char_num; i++) {
-		if ((name_ignoring_case != 0 && strcmp(char_dat[i].name, (const char*)dat) == 0) ||
-			(name_ignoring_case == 0 && strcmpi(char_dat[i].name, (const char*)dat) == 0)) {
-			char_log("Make new char error (name already exists): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE,
-			         fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]);
-			return -1;
-		}
-		if (char_dat[i].account_id == sd->account_id && char_dat[i].char_num == dat[30]) {
-			char_log("Make new char error (slot already used): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE,
-			         fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]);
-			return -1;
-		}
-	}
-
-	if (strcmp(wisp_server_name, (const char*)dat) == 0) {
-		char_log("Make new char error (name used is wisp name for server): (connection #%d, account: %d) slot %d, name: %s (actual name of other char: %d), stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE,
-		         fd, sd->account_id, dat[30], dat, char_dat[i].name, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]);
-		return -1;
-	}
-
-	if (char_num >= char_max) {
-		char_max += 256;
-		char_dat = (struct mmo_charstatus*)aRealloc(char_dat, sizeof(struct mmo_charstatus) * char_max);
-		if (!char_dat) {
-			printf("Out of memory: make_new_char (realloc of char_dat).\n");
-			char_log("Out of memory: make_new_char (realloc of char_dat)." RETCODE);
-			exit(1);
-		}
-		online_chars = (struct online_chars*)aRealloc(online_chars, sizeof(struct online_chars) * char_max);
-		if (!online_chars) {
-			printf("Out of memory: make_new_char (realloc of online_chars).\n");
-			char_log("Out of memory: make_new_char (realloc of online_chars)." RETCODE);
-			exit(1);
-		}
-		for(j = char_max - 256; j < char_max; j++) {
-			online_chars[j].char_id = -1;
-			online_chars[j].server = -1;
-		}
-	}
-
-	char_log("Creation of New Character: (connection #%d, account: %d) slot %d, character Name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d." RETCODE,
-	         fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]);
-
-	memset(&char_dat[i], 0, sizeof(struct mmo_charstatus));
-
-	char_dat[i].char_id = char_id_count++;
-	char_dat[i].account_id = sd->account_id;
-	char_dat[i].char_num = dat[30];
-	strcpy(char_dat[i].name, (const char*)dat);
-	char_dat[i].class_ = 0;
-	char_dat[i].base_level = 1;
-	char_dat[i].job_level = 1;
-	char_dat[i].base_exp = 0;
-	char_dat[i].job_exp = 0;
-	char_dat[i].zeny = start_zeny;
-	char_dat[i].str = dat[24];
-	char_dat[i].agi = dat[25];
-	char_dat[i].vit = dat[26];
-	char_dat[i].int_ = dat[27];
-	char_dat[i].dex = dat[28];
-	char_dat[i].luk = dat[29];
-	char_dat[i].max_hp = 40 * (100 + char_dat[i].vit) / 100;
-	char_dat[i].max_sp = 11 * (100 + char_dat[i].int_) / 100;
-	char_dat[i].hp = char_dat[i].max_hp;
-	char_dat[i].sp = char_dat[i].max_sp;
-	char_dat[i].status_point = 0;
-	char_dat[i].skill_point = 0;
-	char_dat[i].option = 0;
-	char_dat[i].karma = 0;
-	char_dat[i].manner = 0;
-	char_dat[i].party_id = 0;
-	char_dat[i].guild_id = 0;
-	char_dat[i].hair = dat[33];
-	char_dat[i].hair_color = dat[31];
-	char_dat[i].clothes_color = 0;
-	char_dat[i].inventory[0].nameid = start_weapon; // Knife
-	char_dat[i].inventory[0].amount = 1;
-	char_dat[i].inventory[0].equip = 0x02;
-	char_dat[i].inventory[0].identify = 1;
-	char_dat[i].inventory[1].nameid = start_armor; // Cotton Shirt
-	char_dat[i].inventory[1].amount = 1;
-	char_dat[i].inventory[1].equip = 0x10;
-	char_dat[i].inventory[1].identify = 1;
-	char_dat[i].weapon = 1;
-	char_dat[i].shield = 0;
-	char_dat[i].head_top = 0;
-	char_dat[i].head_mid = 0;
-	char_dat[i].head_bottom = 0;
-	memcpy(&char_dat[i].last_point, &start_point, sizeof(start_point));
-	memcpy(&char_dat[i].save_point, &start_point, sizeof(start_point));
-	char_num++;
-
-	mmo_char_sync();
-	return i;
-}
-
-//----------------------------------------------------
-// This function return the name of the job (by [Yor])
-//----------------------------------------------------
-char * job_name(int class_) {
-	switch (class_) {
-	case 0:    return "Novice";
-	case 1:    return "Swordsman";
-	case 2:    return "Mage";
-	case 3:    return "Archer";
-	case 4:    return "Acolyte";
-	case 5:    return "Merchant";
-	case 6:    return "Thief";
-	case 7:    return "Knight";
-	case 8:    return "Priest";
-	case 9:    return "Wizard";
-	case 10:   return "Blacksmith";
-	case 11:   return "Hunter";
-	case 12:   return "Assassin";
-	case 13:   return "Knight 2";
-	case 14:   return "Crusader";
-	case 15:   return "Monk";
-	case 16:   return "Sage";
-	case 17:   return "Rogue";
-	case 18:   return "Alchemist";
-	case 19:   return "Bard";
-	case 20:   return "Dancer";
-	case 21:   return "Crusader 2";
-	case 22:   return "Wedding";
-	case 23:   return "Super Novice";
-	case 4001: return "Novice High";
-	case 4002: return "Swordsman High";
-	case 4003: return "Mage High";
-	case 4004: return "Archer High";
-	case 4005: return "Acolyte High";
-	case 4006: return "Merchant High";
-	case 4007: return "Thief High";
-	case 4008: return "Lord Knight";
-	case 4009: return "High Priest";
-	case 4010: return "High Wizard";
-	case 4011: return "Whitesmith";
-	case 4012: return "Sniper";
-	case 4013: return "Assassin Cross";
-	case 4014: return "Peko Knight";
-	case 4015: return "Paladin";
-	case 4016: return "Champion";
-	case 4017: return "Professor";
-	case 4018: return "Stalker";
-	case 4019: return "Creator";
-	case 4020: return "Clown";
-	case 4021: return "Gypsy";
-	case 4022: return "Peko Paladin";
-	case 4023: return "Baby Novice";
-	case 4024: return "Baby Swordsman";
-	case 4025: return "Baby Mage";
-	case 4026: return "Baby Archer";
-	case 4027: return "Baby Acolyte";
-	case 4028: return "Baby Merchant";
-	case 4029: return "Baby Thief";
-	case 4030: return "Baby Knight";
-	case 4031: return "Baby Priest";
-	case 4032: return "Baby Wizard";
-	case 4033: return "Baby Blacksmith";
-	case 4034: return "Baby Hunter";
-	case 4035: return "Baby Assassin";
-	case 4036: return "Baby Peco Knight";
-	case 4037: return "Baby Crusader";
-	case 4038: return "Baby Monk";
-	case 4039: return "Baby Sage";
-	case 4040: return "Baby Rogue";
-	case 4041: return "Baby Alchemist";
-	case 4042: return "Baby Bard";
-	case 4043: return "Baby Dancer";
-	case 4044: return "Baby Peco Crusader";
-	case 4045: return "Super Baby";
-	}
-	return "Unknown Job";
-}
-
-//-------------------------------------------------------------
-// Function to create the online files (txt and html). by [Yor]
-//-------------------------------------------------------------
-void create_online_files(void) {
-	int i, j, k, l; // for loops
-	int players;    // count the number of players
-	FILE *fp;       // for the txt file
-	FILE *fp2;      // for the html file
-	char temp[256];      // to prepare what we must display
-	time_t time_server;  // for number of seconds
-	struct tm *datetime; // variable for time in structure ->tm_mday, ->tm_sec, ...
-	int id[4096];
-
-	// don't return here if we display nothing, because server[j].users is updated in the first loop.
-
-	// Get number of online players, id of each online players, and verify if a server is offline
-	players = 0;
-	for (i = 0; i < online_players_max; i++) {
-		if (online_chars[i].char_id != -1) {
-			// check if map-server is online
-			j = online_chars[i].server;
-			if (j == -1) {
-				online_chars[i].char_id = -1;
-				continue;
-			} else if (server_fd[j] < 0) {
-				server[j].users = 0;
-				online_chars[i].char_id = -1;
-				online_chars[i].server = -1;
-				continue;
-			}
-			// check if the character is twice or more in the list
-			// (multiple map-servers and player have successfully connected twice!)
-			for(j = i + 1; j < online_players_max; j++)
-				if (online_chars[i].char_id == online_chars[j].char_id) {
-					k = online_chars[j].server;
-					if (k != -1 && server_fd[k] >= 0 && server[k].users > 0)
-						server[k].users--;
-					online_chars[j].char_id = -1;
-					online_chars[j].server = -1;
-				}
-			// search position of character in char_dat and sort online characters.
-			for(j = 0; j < char_num; j++) {
-				if (char_dat[j].char_id == online_chars[i].char_id) {
-					id[players] = j;
-					// use sorting option
-					switch (online_sorting_option) {
-					case 1: // by name (without case sensitive)
-						for(k = 0; k < players; k++)
-							if (stricmp(char_dat[j].name, char_dat[id[k]].name) < 0 ||
-							   // if same name, we sort with case sensitive.
-							   (stricmp(char_dat[j].name, char_dat[id[k]].name) == 0 &&
-							    strcmp(char_dat[j].name, char_dat[id[k]].name) < 0)) {
-								for(l = players; l > k; l--)
-									id[l] = id[l-1];
-								id[k] = j; // id[players]
-								break;
-							}
-						break;
-					case 2: // by zeny
-						for(k = 0; k < players; k++)
-							if (char_dat[j].zeny < char_dat[id[k]].zeny ||
-							   // if same number of zenys, we sort by name.
-							   (char_dat[j].zeny == char_dat[id[k]].zeny &&
-							    stricmp(char_dat[j].name, char_dat[id[k]].name) < 0)) {
-								for(l = players; l > k; l--)
-									id[l] = id[l-1];
-								id[k] = j; // id[players]
-								break;
-							}
-						break;
-					case 3: // by base level
-						for(k = 0; k < players; k++)
-							if (char_dat[j].base_level < char_dat[id[k]].base_level ||
-							   // if same base level, we sort by base exp.
-							   (char_dat[j].base_level == char_dat[id[k]].base_level &&
-							    char_dat[j].base_exp < char_dat[id[k]].base_exp)) {
-								for(l = players; l > k; l--)
-									id[l] = id[l-1];
-								id[k] = j; // id[players]
-								break;
-							}
-						break;
-					case 4: // by job (and job level)
-						for(k = 0; k < players; k++)
-							if (char_dat[j].class_ < char_dat[id[k]].class_ ||
-							   // if same job, we sort by job level.
-							   (char_dat[j].class_ == char_dat[id[k]].class_ &&
-							    char_dat[j].job_level < char_dat[id[k]].job_level) ||
-							   // if same job and job level, we sort by job exp.
-							   (char_dat[j].class_ == char_dat[id[k]].class_ &&
-							    char_dat[j].job_level == char_dat[id[k]].job_level &&
-							    char_dat[j].job_exp < char_dat[id[k]].job_exp)) {
-								for(l = players; l > k; l--)
-									id[l] = id[l-1];
-								id[k] = j; // id[players]
-								break;
-							}
-						break;
-					case 5: // by location map name
-						for(k = 0; k < players; k++)
-							if (stricmp(char_dat[j].last_point.map, char_dat[id[k]].last_point.map) < 0 ||
-							   // if same map name, we sort by name.
-							   (stricmp(char_dat[j].last_point.map, char_dat[id[k]].last_point.map) == 0 &&
-							    stricmp(char_dat[j].name, char_dat[id[k]].name) < 0)) {
-								for(l = players; l > k; l--)
-									id[l] = id[l-1];
-								id[k] = j; // id[players]
-								break;
-							}
-						break;
-					default: // 0 or invalid value: no sorting
-						break;
-					}
-					players++;
-					break;
-				}
-			}
-		}
-	}
-
-	if (online_display_option == 0) // we display nothing, so return
-		return;
-
-	// write files
-	fp = fopen(online_txt_filename, "w");
-	if (fp != NULL) {
-		fp2 = fopen(online_html_filename, "w");
-		if (fp2 != NULL) {
-			// get time
-			time(&time_server); // get time in seconds since 1/1/1970
-			datetime = localtime(&time_server); // convert seconds in structure
-			strftime(temp, sizeof(temp), "%d %b %Y %X", datetime); // like sprintf, but only for date/time (05 dec 2003 15:12:52)
-			// write heading
-			fprintf(fp2, "<HTML>\n");
-			fprintf(fp2, "  <META http-equiv=\"Refresh\" content=\"%d\">\n", online_refresh_html); // update on client explorer every x seconds
-			fprintf(fp2, "  <HEAD>\n");
-			fprintf(fp2, "    <TITLE>Online Players on %s</TITLE>\n", server_name);
-			fprintf(fp2, "  </HEAD>\n");
-			fprintf(fp2, "  <BODY>\n");
-			fprintf(fp2, "    <H3>Online Players on %s (%s):</H3>\n", server_name, temp);
-			fprintf(fp, "Online Players on %s (%s):\n", server_name, temp);
-			fprintf(fp, "\n");
-
-			for (i = 0; i < players; i++) {
-				// if it's the first player
-				if (i == 0) {
-					j = 0; // count the number of characters for the txt version and to set the separate line
-					fprintf(fp2, "    <table border=\"1\" cellspacing=\"1\">\n");
-					fprintf(fp2, "      <tr>\n");
-					if ((online_display_option & 1) || (online_display_option & 64)) {
-						fprintf(fp2, "        <td><b>Name</b></td>\n");
-						if (online_display_option & 64) {
-							fprintf(fp, "Name                          "); // 30
-							j += 30;
-						} else {
-							fprintf(fp, "Name                     "); // 25
-							j += 25;
-						}
-					}
-					if ((online_display_option & 6) == 6) {
-						fprintf(fp2, "        <td><b>Job (levels)</b></td>\n");
-						fprintf(fp, "Job                 Levels "); // 27
-						j += 27;
-					} else if (online_display_option & 2) {
-						fprintf(fp2, "        <td><b>Job</b></td>\n");
-						fprintf(fp, "Job                "); // 19
-						j += 19;
-					} else if (online_display_option & 4) {
-						fprintf(fp2, "        <td><b>Levels</b></td>\n");
-						fprintf(fp, " Levels "); // 8
-						j += 8;
-					}
-					if (online_display_option & 24) { // 8 or 16
-						fprintf(fp2, "        <td><b>Location</b></td>\n");
-						if (online_display_option & 16) {
-							fprintf(fp, "Location     ( x , y ) "); // 23
-							j += 23;
-						} else {
-							fprintf(fp, "Location     "); // 13
-							j += 13;
-						}
-					}
-					if (online_display_option & 32) {
-						fprintf(fp2, "        <td ALIGN=CENTER><b>zenys</b></td>\n");
-						fprintf(fp, "          Zenys "); // 16
-						j += 16;
-					}
-					fprintf(fp2, "      </tr>\n");
-					fprintf(fp, "\n");
-					for (k = 0; k < j; k++)
-						fprintf(fp, "-");
-					fprintf(fp, "\n");
-				}
-				fprintf(fp2, "      <tr>\n");
-				// get id of the character (more speed)
-				j = id[i];
-				// displaying the character name
-				if ((online_display_option & 1) || (online_display_option & 64)) { // without/with 'GM' display
-					strcpy(temp, char_dat[j].name);
-					l = isGM(char_dat[j].account_id);
-					if (online_display_option & 64) {
-						if (l >= online_gm_display_min_level)
-							fprintf(fp, "%-24s (GM) ", temp);
-						else
-							fprintf(fp, "%-24s      ", temp);
-					} else
-						fprintf(fp, "%-24s ", temp);
-					// name of the character in the html (no < >, because that create problem in html code)
-					fprintf(fp2, "        <td>");
-					if ((online_display_option & 64) && l >= online_gm_display_min_level)
-						fprintf(fp2, "<b>");
-					for (k = 0; k < strlen(temp); k++) {
-						switch(temp[k]) {
-						case '<': // <
-							fprintf(fp2, "&lt;");
-							break;
-						case '>': // >
-							fprintf(fp2, "&gt;");
-							break;
-						default:
-							fprintf(fp2, "%c", temp[k]);
-							break;
-						};
-					}
-					if ((online_display_option & 64) && l >= online_gm_display_min_level)
-						fprintf(fp2, "</b> (GM)");
-					fprintf(fp2, "</td>\n");
-				}
-				// displaying of the job
-				if (online_display_option & 6) {
-					char * jobname = job_name(char_dat[j].class_);
-					if ((online_display_option & 6) == 6) {
-						fprintf(fp2, "        <td>%s %d/%d</td>\n", jobname, char_dat[j].base_level, char_dat[j].job_level);
-						fprintf(fp, "%-18s %3d/%3d ", jobname, char_dat[j].base_level, char_dat[j].job_level);
-					} else if (online_display_option & 2) {
-						fprintf(fp2, "        <td>%s</td>\n", jobname);
-						fprintf(fp, "%-18s ", jobname);
-					} else if (online_display_option & 4) {
-						fprintf(fp2, "        <td>%d/%d</td>\n", char_dat[j].base_level, char_dat[j].job_level);
-						fprintf(fp, "%3d/%3d ", char_dat[j].base_level, char_dat[j].job_level);
-					}
-				}
-				// displaying of the map
-				if (online_display_option & 24) { // 8 or 16
-					// prepare map name
-					memset(temp, 0, 17);
-					strncpy(temp, char_dat[j].last_point.map, 16);
-					if (strstr(temp, ".gat") != NULL) {
-						temp[strstr(temp, ".gat") - temp] = 0; // suppress the '.gat'
-					}
-					// write map name
-					if (online_display_option & 16) { // map-name AND coordonates
-						fprintf(fp2, "        <td>%s (%d, %d)</td>\n", temp, char_dat[j].last_point.x, char_dat[j].last_point.y);
-						fprintf(fp, "%-12s (%3d,%3d) ", temp, char_dat[j].last_point.x, char_dat[j].last_point.y);
-					} else {
-						fprintf(fp2, "        <td>%s</td>\n", temp);
-						fprintf(fp, "%-12s ", temp);
-					}
-				}
-				// displaying nimber of zenys
-				if (online_display_option & 32) {
-					// write number of zenys
-					if (char_dat[j].zeny == 0) { // if no zeny
-						fprintf(fp2, "        <td ALIGN=RIGHT>no zeny</td>\n");
-						fprintf(fp, "        no zeny ");
-					} else {
-						fprintf(fp2, "        <td ALIGN=RIGHT>%d z</td>\n", char_dat[j].zeny);
-						fprintf(fp, "%13d z ", char_dat[j].zeny);
-					}
-				}
-				fprintf(fp, "\n");
-				fprintf(fp2, "      </tr>\n");
-			}
-			// If we display at least 1 player
-			if (players > 0) {
-				fprintf(fp2, "    </table>\n");
-				fprintf(fp, "\n");
-			}
-
-			// Displaying number of online players
-			if (players == 0) {
-				fprintf(fp2, "    <p>No user is online.</p>\n");
-				fprintf(fp, "No user is online.\n");
-			} else if (players == 1) {
-				fprintf(fp2, "    <p>%d user is online.</p>\n", players);
-				fprintf(fp, "%d user is online.\n", players);
-			} else {
-				fprintf(fp2, "    <p>%d users are online.</p>\n", players);
-				fprintf(fp, "%d users are online.\n", players);
-			}
-			fprintf(fp2, "  </BODY>\n");
-			fprintf(fp2, "</HTML>\n");
-			fclose(fp2);
-		}
-		fclose(fp);
-	}
-
-	return;
-}
-
-//---------------------------------------------------------------------
-// This function return the number of online players in all map-servers
-//---------------------------------------------------------------------
-int count_users(void) {
-	int i, users;
-
-	users = 0;
-	for(i = 0; i < MAX_MAP_SERVERS; i++)
-		if (server_fd[i] >= 0)
-			users += server[i].users;
-
-	return users;
-}
-
-//----------------------------------------
-// Function to send characters to a player
-//----------------------------------------
-int mmo_char_send006b(int fd, struct char_session_data *sd) {
-	int i, j, found_num;
-	struct mmo_charstatus *p;
-#ifdef NEW_006b
-	const int offset = 24;
-#else
-	const int offset = 4;
-#endif
-
-	found_num = 0;
-	for(i = 0; i < char_num; i++) {
-		if (char_dat[i].account_id == sd->account_id) {
-			sd->found_char[found_num] = i;
-			found_num++;
-			if (found_num == 9)
-				break;
-		}
-	}
-	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;
-
-	for(i = 0; i < found_num; i++) {
-		p = &char_dat[sd->found_char[i]];
-		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));
-
-	return 0;
-}
-
-int set_account_reg2(int acc, int num, struct global_reg *reg) {
-	int i, c;
-
-	c = 0;
-	for(i = 0; i < char_num; i++) {
-		if (char_dat[i].account_id == acc) {
-			memcpy(char_dat[i].account_reg2, reg, sizeof(char_dat[i].account_reg2));
-			char_dat[i].account_reg2_num = num;
-			c++;
-		}
-	}
-	return c;
-}
-
-// 離婚(char削除時に使用)
-int char_divorce(struct mmo_charstatus *cs) {
-	if (cs == NULL)
-		return 0;
-
-	if (cs->partner_id > 0){
-		int i, j;
-		for(i = 0; i < char_num; i++) {
-			if (char_dat[i].char_id == cs->partner_id && char_dat[i].partner_id == cs->char_id) {
-				cs->partner_id = 0;
-				char_dat[i].partner_id = 0;
-				for(j = 0; j < MAX_INVENTORY; j++)
-					if (char_dat[i].inventory[j].nameid == WEDDING_RING_M || char_dat[i].inventory[j].nameid == WEDDING_RING_F)
-						memset(&char_dat[i].inventory[j], 0, sizeof(char_dat[i].inventory[0]));
-					if (cs->inventory[j].nameid == WEDDING_RING_M || cs->inventory[j].nameid == WEDDING_RING_F)
-						memset(&cs->inventory[j], 0, sizeof(cs->inventory[0]));
-				return 0;
-			}
-		}
-	}
-	return 0;
-}
-
-//------------------------------------------------------------
-// E-mail check: return 0 (not correct) or 1 (valid). by [Yor]
-//------------------------------------------------------------
-int e_mail_check(char *email) {
-	char ch;
-	char* last_arobas;
-
-	// athena limits
-	if (strlen(email) < 3 || strlen(email) > 39)
-		return 0;
-
-	// part of RFC limits (official reference of e-mail description)
-	if (strchr(email, '@') == NULL || email[strlen(email)-1] == '@')
-		return 0;
-
-	if (email[strlen(email)-1] == '.')
-		return 0;
-
-	last_arobas = strrchr(email, '@');
-
-	if (strstr(last_arobas, "@.") != NULL ||
-	    strstr(last_arobas, "..") != NULL)
-		return 0;
-
-	for(ch = 1; ch < 32; ch++) {
-		if (strchr(last_arobas, ch) != NULL) {
-			return 0;
-			break;
-		}
-	}
-
-	if (strchr(last_arobas, ' ') != NULL ||
-	    strchr(last_arobas, ';') != NULL)
-		return 0;
-
-	// all correct
-	return 1;
-}
-
-//----------------------------------------------------------------------
-// Force disconnection of an online player (with account value) by [Yor]
-//----------------------------------------------------------------------
-int disconnect_player(int accound_id) {
-	int i;
-	struct char_session_data *sd;
-
-	// 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 == accound_id) {
-				session[i]->eof = 1;
-				return 1;
-			}
-		}
-	}
-
-	return 0;
-}
-
-// キャラ削除に伴うデータ削除
-static int char_delete(struct mmo_charstatus *cs) {
-	int j;
-
-	// ペット削除
-	if (cs->pet_id)
-		inter_pet_delete(cs->pet_id);
-	for (j = 0; j < MAX_INVENTORY; j++)
-		if (cs->inventory[j].card[0] == (short)0xff00)
-			inter_pet_delete(*((long *)(&cs->inventory[j].card[2])));
-	for (j = 0; j < MAX_CART; j++)
-		if (cs->cart[j].card[0] == (short)0xff00)
-			inter_pet_delete(*((long *)(&cs->cart[j].card[2])));
-	// ギルド脱退
-	if (cs->guild_id)
-		inter_guild_leave(cs->guild_id, cs->account_id, cs->char_id);
-	// パーティー脱退
-	if (cs->party_id)
-		inter_party_leave(cs->party_id, cs->account_id);
-	// 離婚
-	if (cs->partner_id){
-		// 離婚情報をmapに通知
-		unsigned char buf[10];
-		WBUFW(buf,0) = 0x2b12;
-		WBUFL(buf,2) = cs->char_id;
-		WBUFL(buf,6) = cs->partner_id;
-		mapif_sendall(buf,10);
-		// 離婚
-		char_divorce(cs);
-	}
-	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 (fd != login_fd).
-	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;
-
-	while(RFIFOREST(fd) >= 2) {
-//		printf("parse_tologin: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd));
-
-		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 accounts file (default: accounts.txt) has those values present.\n");
-				printf("If you changed the communication passwords, change them back at map_athena.conf and char_athena.conf\n");
-				exit(1);
-			} else {
-				printf("Connected to login-server (connection #%d).\n", fd);
-				// 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;
-//			printf("parse_tologin 2713 : %d\n", RFIFOB(fd,6));
-			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);
-						memcpy(sd->email, RFIFOP(fd, 7), 40);
-						if (e_mail_check(sd->email) == 0)
-							strncpy(sd->email, "a@a.com", 40); // default e-mail
-						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);
-					}
-					break;
-				}
-			}
-			RFIFOSKIP(fd,51);
-			break;
-
-		// Receiving of an e-mail/time limit from the login-server (answer of a request because a player comes back from map-server to char-server) by [Yor]
-		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)) {
-						memcpy(sd->email, RFIFOP(fd,6), 40);
-						if (e_mail_check(sd->email) == 0)
-							strncpy(sd->email, "a@a.com", 40); // default e-mail
-						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
-			if (RFIFOREST(fd) < 10)
-				return 0;
-		  {
-			unsigned char buf[10];
-			WBUFW(buf,0) = 0x2b0b;
-			WBUFL(buf,2) = RFIFOL(fd,2); // account
-			WBUFL(buf,6) = RFIFOL(fd,6); // GM level
-			mapif_sendall(buf,10);
-//			printf("parse_tologin: To become GM answer: char -> map.\n");
-		  }
-			RFIFOSKIP(fd,10);
-			break;
-
-		case 0x2723:	// changesex reply (modified by [Yor])
-			if (RFIFOREST(fd) < 7)
-				return 0;
-		  {
-			int acc, sex, i, j;
-			unsigned char buf[7];
-			acc = RFIFOL(fd,2);
-			sex = RFIFOB(fd,6);
-			RFIFOSKIP(fd, 7);
-			if (acc > 0) {
-				for (i = 0; i < char_num; i++) {
-					if (char_dat[i].account_id == acc) {
-						int jobclass = char_dat[i].class_;
-						char_dat[i].sex = sex;
-						auth_fifo[i].sex = sex;
-						if (jobclass == 19 || jobclass == 20 ||
-						    jobclass == 4020 || jobclass == 4021 ||
-						    jobclass == 4042 || jobclass == 4043) {
-							// job modification
-							if (jobclass == 19 || jobclass == 20) {
-								char_dat[i].class_ = (sex) ? 19 : 20;
-							} else if (jobclass == 4020 || jobclass == 4021) {
-								char_dat[i].class_ = (sex) ? 4020 : 4021;
-							} else if (jobclass == 4042 || jobclass == 4043) {
-								char_dat[i].class_ = (sex) ? 4042 : 4043;
-							}
-							// remove specifical skills of classes 19, 4020 and 4042
-							for(j = 315; j <= 322; j++) {
-								if (char_dat[i].skill[j].id > 0 && !char_dat[i].skill[j].flag) {
-									char_dat[i].skill_point += char_dat[i].skill[j].lv;
-									char_dat[i].skill[j].id = 0;
-									char_dat[i].skill[j].lv = 0;
-								}
-							}
-							// remove specifical skills of classes 20, 4021 and 4043
-							for(j = 323; j <= 330; j++) {
-								if (char_dat[i].skill[j].id > 0 && !char_dat[i].skill[j].flag) {
-									char_dat[i].skill_point += char_dat[i].skill[j].lv;
-									char_dat[i].skill[j].id = 0;
-									char_dat[i].skill[j].lv = 0;
-								}
-							}
-						}
-						// to avoid any problem with equipment and invalid sex, equipment is unequiped.
-						for (j = 0; j < MAX_INVENTORY; j++) {
-							if (char_dat[i].inventory[j].nameid && char_dat[i].inventory[j].equip)
-								char_dat[i].inventory[j].equip = 0;
-						}
-						char_dat[i].weapon = 0;
-						char_dat[i].shield = 0;
-						char_dat[i].head_top = 0;
-						char_dat[i].head_mid = 0;
-						char_dat[i].head_bottom = 0;
-					}
-				}
-				// disconnect player if online on char-server
-				disconnect_player(acc);
-			}
-			WBUFW(buf,0) = 0x2b0d;
-			WBUFL(buf,2) = acc;
-			WBUFB(buf,6) = sex;
-			mapif_sendall(buf, 7);
-		  }
-			break;
-
-		case 0x2726:	// Request to send a broadcast message (no answer)
-			if (RFIFOREST(fd) < 8 || RFIFOREST(fd) < (8 + RFIFOL(fd,4)))
-				return 0;
-			if (RFIFOL(fd,4) < 1)
-				char_log("Receiving a message for broadcast, but message is void." RETCODE);
-			else {
-				// at least 1 map-server
-				for(i = 0; i < MAX_MAP_SERVERS; i++)
-					if (server_fd[i] >= 0)
-						break;
-				if (i == MAX_MAP_SERVERS)
-					char_log("'ladmin': Receiving a message for broadcast, but no map-server is online." RETCODE);
-				else {
-					unsigned char buf[128];
-					char message[4096]; // +1 to add a null terminated if not exist in the packet
-					int lp;
-					char *p;
-					memset(message, '\0', sizeof(message));
-					memcpy(message, RFIFOP(fd,8), RFIFOL(fd,4));
-					message[sizeof(message)-1] = '\0';
-					remove_control_chars((unsigned char *)message);
-					// remove all first spaces
-					p = message;
-					while(p[0] == ' ')
-						p++;
-					// if message is only composed of spaces
-					if (p[0] == '\0')
-						char_log("Receiving a message for broadcast, but message is only a lot of spaces." RETCODE);
-					// else send message to all map-servers
-					else {
-						if (RFIFOW(fd,2) == 0) {
-							char_log("'ladmin': Receiving a message for broadcast (message (in yellow): %s)" RETCODE,
-							         message);
-							lp = 4;
-						} else {
-							char_log("'ladmin': Receiving a message for broadcast (message (in blue): %s)" RETCODE,
-							         message);
-							lp = 8;
-						}
-						// split message to max 80 char
-						while(p[0] != '\0') { // if not finish
-							if (p[0] == ' ') // jump if first char is a space
-								p++;
-							else {
-								char split[80];
-								char* last_space;
-								sscanf(p, "%79[^\t]", split); // max 79 char, any char (\t is control char and control char was removed before)
-								split[sizeof(split)-1] = '\0'; // last char always \0
-								if ((last_space = strrchr(split, ' ')) != NULL) { // searching space from end of the string
-									last_space[0] = '\0'; // replace it by NULL to have correct length of split
-									p++; // to jump the new NULL
-								}
-								p += strlen(split);
-								// send broadcast to all map-servers
-								WBUFW(buf,0) = 0x3800;
-								WBUFW(buf,2) = lp + strlen(split) + 1;
-								WBUFL(buf,4) = 0x65756c62; // only write if in blue (lp = 8)
-								memcpy(WBUFP(buf,lp), split, strlen(split) + 1);
-								mapif_sendall(buf, WBUFW(buf,2));
-							}
-						}
-					}
-				}
-			}
-			RFIFOSKIP(fd,8 + RFIFOL(fd,4));
-			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;
-
-		// Account deletion notification (from login-server)
-		case 0x2730:
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			// Deletion of all characters of the account
-			for(i = 0; i < char_num; i++) {
-				if (char_dat[i].account_id == RFIFOL(fd,2)) {
-					char_delete(&char_dat[i]);
-					if (i < char_num - 1) {
-						memcpy(&char_dat[i], &char_dat[char_num-1], sizeof(struct mmo_charstatus));
-						// if moved character owns to deleted account, check again it's character
-						if (char_dat[i].account_id == RFIFOL(fd,2)) {
-							i--;
-						// Correct moved character reference in the character's owner by [Yor]
-						} else {
-							int j, k;
-							struct char_session_data *sd2;
-							for (j = 0; j < fd_max; j++) {
-								if (session[j] && (sd2 = (struct char_session_data*)session[j]->session_data) &&
-									sd2->account_id == char_dat[char_num-1].account_id) {
-									for (k = 0; k < 9; k++) {
-										if (sd2->found_char[k] == char_num-1) {
-											sd2->found_char[k] = i;
-											break;
-										}
-									}
-									break;
-								}
-							}
-						}
-					}
-					char_num--;
-				}
-			}
-			// Deletion of the storage
-			inter_storage_delete(RFIFOL(fd,2));
-			// send to all map-servers to disconnect the player
-			{
-				unsigned char buf[6];
-				WBUFW(buf,0) = 0x2b13;
-				WBUFL(buf,2) = RFIFOL(fd,2);
-				mapif_sendall(buf, 6);
-			}
-			// disconnect player if online on char-server
-			disconnect_player(RFIFOL(fd,2));
-			RFIFOSKIP(fd,6);
-			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[11];
-				WBUFW(buf,0) = 0x2b14;
-				WBUFL(buf,2) = RFIFOL(fd,2);
-				WBUFB(buf,6) = RFIFOB(fd,6); // 0: change of statut, 1: ban
-				WBUFL(buf,7) = RFIFOL(fd,7); // status or final date of a banishment
-				mapif_sendall(buf, 11);
-			}
-			// disconnect player if online on char-server
-			disconnect_player(RFIFOL(fd,2));
-			RFIFOSKIP(fd,11);
-			break;
-
-		// Receiving GM acounts info from login-server (by [Yor])
-		case 0x2732:
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		  {
-			unsigned char buf[32000];
-			if (gm_account != NULL)
-				aFree(gm_account);
-			gm_account = (struct gm_account*)aCalloc(sizeof(struct gm_account) * ((RFIFOW(fd,2) - 4) / 5), 1);
-			GM_num = 0;
-			for (i = 4; i < RFIFOW(fd,2); i = i + 5) {
-				gm_account[GM_num].account_id = RFIFOL(fd,i);
-				gm_account[GM_num].level = (int)RFIFOB(fd,i+4);
-				//printf("GM account: %d -> level %d\n", gm_account[GM_num].account_id, gm_account[GM_num].level);
-				GM_num++;
-			}
-			printf("From login-server: receiving of %d GM accounts information.\n", GM_num);
-			char_log("From login-server: receiving of %d GM accounts information." RETCODE, GM_num);
-			create_online_files(); // update online players files (perhaps some online players change of GM level)
-			// send new gm acccounts level to map-servers
-			memcpy(buf, RFIFOP(fd,0), RFIFOW(fd,2));
-			WBUFW(buf,0) = 0x2b15;
-			mapif_sendall(buf, RFIFOW(fd,2));
-		  }
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-			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;
-			{
-				unsigned char buf[32000];
-				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");
-							char_log("***WARNING: 4000 GM accounts found. Next GM accounts are not readed." RETCODE);
-						}
-					}
-				}
-				if (new_level == 1) {
-					int len;
-					printf("From login-server: receiving a GM account information (%d: level %d).\n", RFIFOL(fd,2), (int)RFIFOB(fd,6));
-					char_log("From login-server: receiving a GM account information (%d: level %d)." RETCODE, RFIFOL(fd,2), (int)RFIFOB(fd,6));
-					//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
-					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);
-				}
-			}
-			RFIFOSKIP(fd,7);
-			break;
-
-		default:
-			printf("parse_tologin: unknown packet %x! \n", RFIFOW(fd,0));
-			session[fd]->eof = 1;
-			return 0;
-		}
-	}
-	RFIFOFLUSH(fd);
-
-	return 0;
-}
-
-int parse_frommap(int fd) {
-	int i, j;
-	int id;
-
-	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){
-		for(i = 0; i < MAX_MAP_SERVERS; i++)
-			if (server_fd[i] == fd) {
-				printf("Map-server %d has disconnected.\n", i);
-				server_fd[i] = -1;
-			}
-		close(fd);
-		delete_session(fd);
-		create_online_files();
-		return 0;
-	}
-
-	while(RFIFOREST(fd) >= 2) {
-//		printf("parse_frommap: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd));
-
-		switch(RFIFOW(fd,0)) {
-
-		// map-server alive packet
-		case 0x2718:
-			if (RFIFOREST(fd) < 2)
-				return 0;
-			RFIFOSKIP(fd,2);
-			break;
-
-		// request from map-server to reload GM accounts. Transmission to login-server (by Yor)
-		case 0x2af7:
-			if (login_fd > 0) { // don't send request if no login-server
-				WFIFOW(login_fd,0) = 0x2709;
-				WFIFOSET(login_fd, 2);
-//				printf("char : request from map-server to reload GM accounts -> login-server.\n");
-			}
-			RFIFOSKIP(fd,2);
-			break;
-
-		// Receiving map names list from the map-server
-		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++;
-			}
-			{
-				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);
-				char_log("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d. Map-server %d loading complete." RETCODE,
-				         id, j, p[0], p[1], p[2], p[3], server[id].port, id);
-			}
-			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 map.\n", id);
-					char_log("WARNING: Map-Server %d have NO map." RETCODE, 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;
-
-		// 認証要�
-		// Send character data to map-server�
-		case 0x2afc:
-			if (RFIFOREST(fd) < 22)
-				return 0;
-			//printf("auth_fifo search: account: %d, char: %d, secure: %08x-%08x\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOL(fd,14));
-			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;
-					char_dat[auth_fifo[i].char_pos].sex = auth_fifo[i].sex;
-					memcpy(WFIFOP(fd,16), &char_dat[auth_fifo[i].char_pos], 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_fifo search error! account %d not authentified.\n", RFIFOL(fd,2));
-			}
-			RFIFOSKIP(fd,22);
-			break;
-
-		// MAPサーバー上のユーザー数受信
-		// Recieve alive message from map-server
-		case 0x2aff:
-			if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-			server[id].users = RFIFOW(fd,4);
-			// remove all previously online players of the server
-			for(i = 0; i < online_players_max; i++)
-				if (online_chars[i].server == id) {
-					online_chars[i].char_id = -1;
-					online_chars[i].server = -1;
-				}
-			// add online players in the list by [Yor]
-			j = 0;
-			for(i = 0; i < server[id].users; i++) {
-				for(; j < online_players_max; j++)
-					if (online_chars[j].char_id == -1) {
-						online_chars[j].char_id = RFIFOL(fd,6+i*4);
-						online_chars[j].server = id;
-						//printf("%d\n", online_chars[j].char_id);
-						break;
-					}
-				// no available slots...
-				if (j == online_players_max) {
-					// create 256 new slots
-					online_players_max += 256;
-					online_chars = (struct online_chars*)aRealloc(online_chars, sizeof(struct online_chars) * online_players_max);
-					if (!online_chars) {
-						printf("out of memory: parse_frommap - online_chars (realloc).\n");
-						exit(1);
-					}
-					for( ; j < online_players_max; j++) {
-						online_chars[j].char_id = -1;
-						online_chars[j].server = -1;
-					}
-					// save data
-					j = online_players_max - 256;
-					online_chars[j].char_id = RFIFOL(fd,6+i*4);
-					online_chars[j].server = id;
-				}
-			}
-			if (update_online < time(NULL)) { // Time is done
-				update_online = time(NULL) + 8;
-				create_online_files(); // only every 8 sec. (normally, 1 server send users every 5 sec.) Don't update every time, because that takes time, but only every 2 connection.
-				                       // it set to 8 sec because is more than 5 (sec) and if we have more than 1 map-server, informations can be received in shifted.
-			}
-			RFIFOSKIP(fd,6+i*4);
-			break;
-
-		// キャラデータ保存
-		// Recieve character data from map-server
-		case 0x2b01:
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-			for(i = 0; i < char_num; i++) {
-				if (char_dat[i].account_id == RFIFOL(fd,4) &&
-				    char_dat[i].char_id == RFIFOL(fd,8))
-					break;
-			}
-			if (i != char_num)
-				memcpy(&char_dat[i], RFIFOP(fd,12), sizeof(struct mmo_charstatus));
-			RFIFOSKIP(fd,RFIFOW(fd,2));
-			break;
-
-		// キャラセレ要求
-		case 0x2b02:
-			if (RFIFOREST(fd) < 18)
-				return 0;
-			if (auth_fifo_pos >= AUTH_FIFO_SIZE)
-				auth_fifo_pos = 0;
-			//printf("auth_fifo set (auth #%d) - account: %d, secure: %08x-%08x\n", auth_fifo_pos, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
-			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;
-
-		// マップサーバー間移動要求
-		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("auth_fifo set (auth#%d) - account: %d, secure: 0x%08x-0x%08x\n", auth_fifo_pos, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
-			auth_fifo[auth_fifo_pos].account_id = RFIFOL(fd,2);
-			auth_fifo[auth_fifo_pos].char_id = RFIFOL(fd,14);
-			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 = 0;
-			auth_fifo[auth_fifo_pos].sex = RFIFOB(fd,44);
-			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,45);
-			for(i = 0; i < char_num; i++)
-				if (char_dat[i].account_id == RFIFOL(fd,2) &&
-				    char_dat[i].char_id == RFIFOL(fd,14)) {
-					auth_fifo[auth_fifo_pos].char_pos = i;
-					auth_fifo_pos++;
-					WFIFOL(fd,6) = 0;
-					break;
-				}
-			if (i == char_num)
-				WFIFOW(fd,6) = 1;
-			WFIFOSET(fd,44);
-			RFIFOSKIP(fd,49);
-			break;
-
-		// キャラ名検索
-		case 0x2b08:
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			for(i = 0; i < char_num; i++) {
-				if (char_dat[i].char_id == RFIFOL(fd,2))
-					break;
-			}
-			WFIFOW(fd,0) = 0x2b09;
-			WFIFOL(fd,2) = RFIFOL(fd,2);
-			if (i != char_num)
-				memcpy(WFIFOP(fd,6), char_dat[i].name, 24);
-			else
-				memcpy(WFIFOP(fd,6), unknown_char_name, 24);
-			WFIFOSET(fd,30);
-			RFIFOSKIP(fd,6);
-			break;
-
-		// it is a request to become GM
-		case 0x2b0a:
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-//			printf("parse_frommap: change gm -> login, account: %d, pass: '%s'.\n", RFIFOL(fd,4), RFIFOP(fd,8));
-			if (login_fd > 0) { // don't send request if no login-server
-				WFIFOW(login_fd,0) = 0x2720;
-				memcpy(WFIFOP(login_fd,2), RFIFOP(fd,2), RFIFOW(fd,2)-2);
-				WFIFOSET(login_fd, RFIFOW(fd,2));
-			} else {
-				WFIFOW(fd,0) = 0x2b0b;
-				WFIFOL(fd,2) = RFIFOL(fd,4);
-				WFIFOL(fd,6) = 0;
-				WFIFOSET(fd, 10);
-			}
-			RFIFOSKIP(fd, RFIFOW(fd,2));
-			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;
-
-		// Map server ask char-server about a character name to do some operations (all operations are transmitted to login-server)
-		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, 5-changesex
-			// search character
-			i = search_character_index(character_name);
-			if (i >= 0) {
-				memcpy(WFIFOP(fd,6), search_character_name(i), 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(char_dat[i].account_id)) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd,0) = 0x2724;
-							WFIFOL(login_fd,2) = char_dat[i].account_id; // 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(char_dat[i].account_id)) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd, 0) = 0x2725;
-							WFIFOL(login_fd, 2) = char_dat[i].account_id; // 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(char_dat[i].account_id)) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd,0) = 0x2724;
-							WFIFOL(login_fd,2) = char_dat[i].account_id; // 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(char_dat[i].account_id)) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd, 0) = 0x272a;
-							WFIFOL(login_fd, 2) = char_dat[i].account_id; // 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(char_dat[i].account_id)) {
-						if (login_fd > 0) { // don't send request if no login-server
-							WFIFOW(login_fd, 0) = 0x2727;
-							WFIFOL(login_fd, 2) = char_dat[i].account_id; // 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;
-		  }
-
-//		case 0x2b0f: not more used (available for futur usage)
-
-		// account_reg保存要求
-		case 0x2b10:
-			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
-				return 0;
-		  {
-			struct global_reg reg[ACCOUNT_REG2_NUM];
-			int 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;
-		}
-		// 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;
-
-		// 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処理に渡す
-			{
-				int r = inter_parse_frommap(fd);
-				if (r == 1) // 処理できた
-					break;
-				if (r == 2) // パケット長が足りない
-					return 0;
-			}
-			// inter server処理でもない場合は切断
-			printf("char: unknown packet 0x%04x (%d bytes to read in buffer)! (from map).\n", RFIFOW(fd,0), RFIFOREST(fd));
-			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;
-}
-
-// char_mapifの初期化処理（現在はinter_mapif初期化のみ）
-static 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;
-
-//	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;
-	unsigned short cmd;
-	char email[40];
-	struct char_session_data *sd;
-	unsigned char *p = (unsigned char *) &session[fd]->client_addr.sin_addr;
-
-	if (login_fd < 0)
-		session[fd]->eof = 1;
-	if(session[fd]->eof) { // disconnect any player (already connected to char-server or coming back from map-server) if login-server is diconnected.
-		if (fd == login_fd)
-			login_fd = -1;
-		close(fd);
-		delete_session(fd);
-		return 0;
-	}
-
-	sd = (struct char_session_data*)session[fd]->session_data;
-
-	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暗号化ragexe対応
-			if (RFIFOREST(fd) < 19)
-				return 0;
-			RFIFOSKIP(fd,19);
-			break;
-
-		case 0x65:	// 接続要求
-			if (RFIFOREST(fd) < 17)
-				return 0;
-		  {
-			int GM_value;
-			if ((GM_value = isGM(RFIFOL(fd,2))))
-				printf("Account Logged On; Account ID: %d (GM level %d).\n", RFIFOL(fd,2), GM_value);
-			else
-				printf("Account Logged On; Account ID: %d.\n", RFIFOL(fd,2));
-			if (sd == NULL) {
-				sd = (struct char_session_data*)aCalloc(sizeof(struct char_session_data), 1);
-				session[fd]->session_data = sd;
-
-				memset(sd, 0, sizeof(struct char_session_data));
-				memcpy(sd->email, "no mail", 40); // put here a mail without '@' to refuse deletion if we don't receive the e-mail
-				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);
-			// send back account_id
-			WFIFOL(fd,0) = RFIFOL(fd,2);
-			WFIFOSET(fd,4);
-			// search authentification
-			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);
-					}
-					break;
-				}
-			}
-			// authentification not found
-			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; // relate to the versions higher than 18
-					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:	// キャラ選択
-			if (RFIFOREST(fd) < 3)
-				return 0;
-
-			// if we activated email creation and email is default email
-			if (email_creation != 0 && strcmp(sd->email, "a@a.com") == 0 && login_fd > 0) { // to modify an e-mail, login-server must be online
-				WFIFOW(fd, 0) = 0x70;
-				WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address
-				WFIFOSET(fd, 3);
-
-			// otherwise, load the character
-			} else {
-				for (ch = 0; ch < 9; ch++)
-					if (sd->found_char[ch] >= 0 && char_dat[sd->found_char[ch]].char_num == RFIFOB(fd,2))
-						break;
-				if (ch != 9) {
-					char_log("Character Selected, Account ID: %d, Character Slot: %d, Character Name: %s." RETCODE,
-					         sd->account_id, RFIFOB(fd,2), char_dat[sd->found_char[ch]].name);
-					// searching map server
-					i = search_mapserver(char_dat[sd->found_char[ch]].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[sd->found_char[ch]].last_point.map, "prontera.gat", 16);
-							char_dat[sd->found_char[ch]].last_point.x = 273; // savepoint coordonates
-							char_dat[sd->found_char[ch]].last_point.y = 354;
-						} else if ((i = search_mapserver("geffen.gat")) >= 0) { // check is done without 'gat'.
-							memcpy(char_dat[sd->found_char[ch]].last_point.map, "geffen.gat", 16);
-							char_dat[sd->found_char[ch]].last_point.x = 120; // savepoint coordonates
-							char_dat[sd->found_char[ch]].last_point.y = 100;
-						} else if ((i = search_mapserver("morocc.gat")) >= 0) { // check is done without 'gat'.
-							memcpy(char_dat[sd->found_char[ch]].last_point.map, "morocc.gat", 16);
-							char_dat[sd->found_char[ch]].last_point.x = 160; // savepoint coordonates
-							char_dat[sd->found_char[ch]].last_point.y = 94;
-						} else if ((i = search_mapserver("alberta.gat")) >= 0) { // check is done without 'gat'.
-							memcpy(char_dat[sd->found_char[ch]].last_point.map, "alberta.gat", 16);
-							char_dat[sd->found_char[ch]].last_point.x = 116; // savepoint coordonates
-							char_dat[sd->found_char[ch]].last_point.y = 57;
-						} else if ((i = search_mapserver("payon.gat")) >= 0) { // check is done without 'gat'.
-							memcpy(char_dat[sd->found_char[ch]].last_point.map, "payon.gat", 16);
-							char_dat[sd->found_char[ch]].last_point.x = 87; // savepoint coordonates
-							char_dat[sd->found_char[ch]].last_point.y = 117;
-						} else if ((i = search_mapserver("izlude.gat")) >= 0) { // check is done without 'gat'.
-							memcpy(char_dat[sd->found_char[ch]].last_point.map, "izlude.gat", 16);
-							char_dat[sd->found_char[ch]].last_point.x = 94; // savepoint coordonates
-							char_dat[sd->found_char[ch]].last_point.y = 103;
-						} else {
-							int j;
-							// get first online server (with a map)
-							i = 0;
-							for(j = 0; j < MAX_MAP_SERVERS; j++)
-								if (server_fd[j] >= 0 && server[j].map[0][0]) { // change save point to one of map found on the server (the first)
-									i = j;
-									memcpy(char_dat[sd->found_char[ch]].last_point.map, server[j].map[0], 16);
-									printf("Map-server #%d found with a map: '%s'.\n", j, server[j].map[0]);
-									// coordonates are unknown
-									break;
-								}
-							// if no map-server is 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[sd->found_char[ch]].char_id;
-					memcpy(WFIFOP(fd,6), char_dat[sd->found_char[ch]].last_point.map, 16);
-					printf("Character selection '%s' (account: %d, slot: %d).\n", char_dat[sd->found_char[ch]].name, sd->account_id, ch);
-					printf("--Send IP of map-server. ");
-					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 #%d - account %d, char: %d, secure: %08x-%08x\n", auth_fifo_pos, sd->account_id, char_dat[sd->found_char[ch]].char_id, sd->login_id1, sd->login_id2);
-					auth_fifo[auth_fifo_pos].account_id = sd->account_id;
-					auth_fifo[auth_fifo_pos].char_id = char_dat[sd->found_char[ch]].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].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++;
-				}
-			}
-			RFIFOSKIP(fd,3);
-			break;
-
-		case 0x67:	// 作成
-			if (RFIFOREST(fd) < 37)
-				return 0;
-			i = make_new_char(fd, RFIFOP(fd,2));
-			if (i < 0) {
-				WFIFOW(fd,0) = 0x6e;
-				WFIFOB(fd,2) = 0x00;
-				WFIFOSET(fd,3);
-				RFIFOSKIP(fd,37);
-				break;
-			}
-
-			WFIFOW(fd,0) = 0x6d;
-			memset(WFIFOP(fd,2), 0, 106);
-
-			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 > 255) ? 255 : char_dat[i].str;
-			WFIFOB(fd,2+99) = (char_dat[i].agi > 255) ? 255 : char_dat[i].agi;
-			WFIFOB(fd,2+100) = (char_dat[i].vit > 255) ? 255 : char_dat[i].vit;
-			WFIFOB(fd,2+101) = (char_dat[i].int_ > 255) ? 255 : char_dat[i].int_;
-			WFIFOB(fd,2+102) = (char_dat[i].dex > 255) ? 255 : char_dat[i].dex;
-			WFIFOB(fd,2+103) = (char_dat[i].luk > 255) ? 255 : char_dat[i].luk;
-			WFIFOB(fd,2+104) = char_dat[i].char_num;
-
-			WFIFOSET(fd,108);
-			RFIFOSKIP(fd,37);
-			for(ch = 0; ch < 9; ch++) {
-				if (sd->found_char[ch] == -1) {
-					sd->found_char[ch] = i;
-					break;
-				}
-			}
-
-		case 0x68:	// delete char //Yor's Fix
-			if (RFIFOREST(fd) < 46)
-				return 0;
-			memcpy(email, RFIFOP(fd,6), 40);
-			if (e_mail_check(email) == 0)
-				strncpy(email, "a@a.com", 40); // default e-mail
-
-			// if we activated email creation and email is default email
-			if (email_creation != 0 && strcmp(sd->email, "a@a.com") == 0 && login_fd > 0) { // to modify an e-mail, login-server must be online
-				// if sended email is incorrect e-mail
-				if (strcmp(email, "a@a.com") == 0) {
-					WFIFOW(fd, 0) = 0x70;
-					WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address
-					WFIFOSET(fd, 3);
-					RFIFOSKIP(fd,46);
-				// we act like we have selected a character
-				} else {
-					// we change the packet to set it like selection.
-					for (i = 0; i < 9; i++)
-						if (char_dat[sd->found_char[i]].char_id == RFIFOL(fd,2)) {
-							// we save new e-mail
-							memcpy(sd->email, email, 40);
-							// we send new e-mail to login-server ('online' login-server is checked before)
-							WFIFOW(login_fd,0) = 0x2715;
-							WFIFOL(login_fd,2) = sd->account_id;
-							memcpy(WFIFOP(login_fd, 6), email, 40);
-							WFIFOSET(login_fd,46);
-							// skip part of the packet! (46, but leave the size of select packet: 3)
-							RFIFOSKIP(fd,43);
-							// change value to put new packet (char selection)
-							RFIFOW(fd, 0) = 0x66;
-							RFIFOB(fd, 2) = char_dat[sd->found_char[i]].char_num;
-							// not send packet, it's modify of actual packet
-							break;
-						}
-					if (i == 9) {
-						WFIFOW(fd, 0) = 0x70;
-						WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address
-						WFIFOSET(fd, 3);
-						RFIFOSKIP(fd,46);
-					}
-				}
-
-			// otherwise, we delete the character
-			} else {
-				if (strcmpi(email, sd->email) != 0) { // if it's an invalid email
-					WFIFOW(fd, 0) = 0x70;
-					WFIFOB(fd, 2) = 0; // 00 = Incorrect Email address
-					WFIFOSET(fd, 3);
-				// if mail is correct
-				} else {
-					for (i = 0; i < 9; i++) {
-						struct mmo_charstatus *cs = NULL;
-						if ((cs = &char_dat[sd->found_char[i]])->char_id == RFIFOL(fd,2)) {
-							char_delete(cs); // deletion process
-
-							if (sd->found_char[i] != char_num - 1) {
-								memcpy(&char_dat[sd->found_char[i]], &char_dat[char_num-1], sizeof(struct mmo_charstatus));
-								// Correct moved character reference in the character's owner
-								{
-									int j, k;
-									struct char_session_data *sd2;
-									for (j = 0; j < fd_max; j++) {
-										if (session[j] && (sd2 = (struct char_session_data*)session[j]->session_data) &&
-											sd2->account_id == char_dat[char_num-1].account_id) {
-											for (k = 0; k < 9; k++) {
-												if (sd2->found_char[k] == char_num-1) {
-													sd2->found_char[k] = sd->found_char[i];
-													break;
-												}
-											}
-											break;
-										}
-									}
-								}
-							}
-
-							char_num--;
-							for(ch = i; ch < 9-1; ch++)
-								sd->found_char[ch] = sd->found_char[ch+1];
-							sd->found_char[8] = -1;
-							WFIFOW(fd,0) = 0x6f;
-							WFIFOSET(fd,2);
-							break;
-						}
-					}
-
-					if (i == 9) {
-						WFIFOW(fd,0) = 0x70;
-						WFIFOB(fd,2) = 0;
-						WFIFOSET(fd,3);
-					}
-				}
-				RFIFOSKIP(fd,46);
-			}
-			break;
-
-		case 0x2af8:	// マップサーバーログイン
-			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((char*)RFIFOP(fd,2), userid) || strcmp((char*)RFIFOP(fd,26), passwd)){
-				WFIFOB(fd,2) = 3;
-				WFIFOSET(fd,3);
-				RFIFOSKIP(fd,60);
-			} else {
-				int len;
-				WFIFOB(fd,2) = 0;
-				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));
-				WFIFOSET(fd,3);
-				RFIFOSKIP(fd,60);
-				realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
-				char_mapif_init(fd);
-				// send gm acccounts level to map-servers
-				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);
-				return 0;
-			}
-			break;
-
-		case 0x187:	// Alive信号？
-			if (RFIFOREST(fd) < 6)
-				return 0;
-			RFIFOSKIP(fd, 6);
-			break;
-
-		case 0x7530:	// Athena情報所得
-			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:	// 接続の切断(defaultと処理は一緒だが明示的にするため)
-			session[fd]->eof = 1;
-			return 0;
-
-		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サーバーにデータ送信（送信したmap鯖の数を返す）
-int mapif_sendall(unsigned char *buf, unsigned int len) {
-	int i, c;
-
-	c = 0;
-	for(i = 0; i < MAX_MAP_SERVERS; i++) {
-		int fd;
-		if ((fd = server_fd[i]) >= 0) {
-			memcpy(WFIFOP(fd,0), buf, len);
-			WFIFOSET(fd,len);
-			c++;
-		}
-	}
-	return c;
-}
-
-// 自分以外の全てのMAPサーバーにデータ送信（送信したmap鯖の数を返す）
-int mapif_sendallwos(int sfd, unsigned char *buf, unsigned int len) {
-	int i, c;
-
-	c = 0;
-	for(i = 0; i < MAX_MAP_SERVERS; i++) {
-		int fd;
-		if ((fd = server_fd[i]) >= 0 && fd != sfd) {
-			memcpy(WFIFOP(fd,0), buf, len);
-			WFIFOSET(fd, len);
-			c++;
-		}
-	}
-	return c;
-}
-// MAPサーバーにデータ送信（map鯖生存確認有り）
-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);
-}
-
-//-------------------------------------------
-// Reading Lan Support configuration by [Yor]
-//-------------------------------------------
-int lan_config_read(const char *lancfgName) {
-	int j;
-	struct hostent * h = NULL;
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
-
-	// set default configuration
-	strncpy(lan_map_ip, "127.0.0.1", sizeof(lan_map_ip));
-	subneti[0] = 127;
-	subneti[1] = 0;
-	subneti[2] = 0;
-	subneti[3] = 1;
-	for(j = 0; j < 4; j++)
-		subnetmaski[j] = 255;
-
-	fp = fopen(lancfgName, "r");
-
-	if (fp == NULL) {
-		printf("LAN support configuration file not found: %s\n", lancfgName);
-		return 1;
-	}
-
-	printf ("---start reading of Lan Support configuration...\n");
-
-	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, "lan_map_ip") == 0) { // Read map-server Lan IP Address
-			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("LAN IP of map-server: %s.\n", lan_map_ip);
-		} else if (strcmpi(w1, "subnet") == 0) { // Read Subnetwork
-			for(j = 0; j < 4; j++)
-				subneti[j] = 0;
-			h = gethostbyname(w2);
-			if (h != NULL) {
-				for(j = 0; j < 4; j++)
-					subneti[j] = (unsigned char)h->h_addr[j];
-			} else {
-				sscanf(w2, "%d.%d.%d.%d", &subneti[0], &subneti[1], &subneti[2], &subneti[3]);
-			}
-			printf("Sub-network of the map-server: %d.%d.%d.%d.\n", subneti[0], subneti[1], subneti[2], subneti[3]);
-		} else if (strcmpi(w1, "subnetmask") == 0){ // Read Subnetwork Mask
-			for(j = 0; j < 4; j++)
-				subnetmaski[j] = 255;
-			h = gethostbyname(w2);
-			if (h != NULL) {
-				for(j = 0; j < 4; j++)
-					subnetmaski[j] = (unsigned char)h->h_addr[j];
-			} else {
-				sscanf(w2, "%d.%d.%d.%d", &subnetmaski[0], &subnetmaski[1], &subnetmaski[2], &subnetmaski[3]);
-			}
-			printf("Sub-network mask of the map-server: %d.%d.%d.%d.\n", subnetmaski[0], subnetmaski[1], subnetmaski[2], subnetmaski[3]);
-		}
-	}
-	fclose(fp);
-
-	// sub-network check of the map-server
-	{
-		unsigned int a0, a1, a2, a3;
-		unsigned char p[4];
-		sscanf(lan_map_ip, "%d.%d.%d.%d", &a0, &a1, &a2, &a3);
-		p[0] = a0; p[1] = a1; p[2] = a2; p[3] = a3;
-		printf("LAN test of LAN IP of the map-server: ");
-		if (lan_ip_check(p) == 0) {
-			printf("\033[1;31m***ERROR: LAN IP of the map-server doesn't belong to the specified Sub-network.\033[0m\n");
-		}
-	}
-
-	printf("---End reading of Lan Support configuration...\n");
-
-	return 0;
-}
-
-int char_config_read(const char *cfgName) {
-	struct hostent *h = NULL;
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp = fopen(cfgName, "r");
-
-	if (fp == 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, sizeof(server_name));
-			server_name[sizeof(server_name) - 1] = '\0';
-			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, "email_creation") == 0) {
-			email_creation = config_switch(w2);
-		} else if (strcmpi(w1, "char_txt") == 0) {
-			strcpy(char_txt, w2);
-		} else if (strcmpi(w1, "backup_txt") == 0) { //By zanetheinsane
-			strcpy(backup_txt, w2);
-		} else if (strcmpi(w1, "friends_txt") == 0) { //By davidsiaw
-			strcpy(friends_txt, w2);
-		} else if (strcmpi(w1, "backup_txt_flag") == 0) { // The backup_txt file was created because char deletion bug existed. Now it's finish and that take a lot of time to create a second file when there are a lot of characters. By [Yor]
-			backup_txt_flag = config_switch(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,"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, "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, "unknown_char_name") == 0) {
-			strcpy(unknown_char_name, w2);
-			unknown_char_name[24] = 0;
-		} else if (strcmpi(w1, "char_log_filename") == 0) {
-			strcpy(char_log_filename, w2);
-		} 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);
-// online files options
-		} else if (strcmpi(w1, "online_txt_filename") == 0) {
-			strcpy(online_txt_filename, w2);
-		} else if (strcmpi(w1, "online_html_filename") == 0) {
-			strcpy(online_html_filename, w2);
-		} else if (strcmpi(w1, "online_sorting_option") == 0) {
-			online_sorting_option = atoi(w2);
-		} else if (strcmpi(w1, "online_display_option") == 0) {
-			online_display_option = atoi(w2);
-		} else if (strcmpi(w1, "online_gm_display_min_level") == 0) { // minimum GM level to display 'GM' when we want to display it
-			online_gm_display_min_level = atoi(w2);
-			if (online_gm_display_min_level < 5) // send online file every 5 seconds to player is enough
-				online_gm_display_min_level = 5;
-		} else if (strcmpi(w1, "online_refresh_html") == 0) {
-			online_refresh_html = atoi(w2);
-			if (online_refresh_html < 1)
-				online_refresh_html = 1;
-		} else if(strcmpi(w1,"db_path")==0) {
-			strcpy(db_path,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;
-}
-
-void do_final(void) {
-	int i;
-	printf("Terminating server.\n");
-	// write online players files with no player
-	for(i = 0; i < online_players_max; i++) {
-		online_chars[i].char_id = -1;
-		online_chars[i].server = -1;
-	}
-
-	create_online_files();
-	if(online_chars) aFree(online_chars);
-
-	mmo_char_sync();
-	inter_save();
-
-	if(gm_account) aFree(gm_account);
-	if(char_dat) aFree(char_dat);
-
-	delete_session(login_fd);
-	delete_session(char_fd);
-
-	inter_final();
-	exit_dbn();
-	timer_final();
-
-	char_log("----End of char-server (normal end with closing of all files)." RETCODE);
-}
-
-int do_init(int argc, char **argv) {
-	int i;
-
-	SERVER_TYPE = SERVER_CHAR;
-	char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
-	lan_config_read((argc > 1) ? argv[1] : LOGIN_LAN_CONF_NAME);
-
-		// a newline in the log...
-		char_log("");
-		// moved behind char_config_read in case we changed the filename [celest]
-		char_log("The char-server starting..." RETCODE);
-
-        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);
-
-	for(i = 0; i < MAX_MAP_SERVERS; i++) {
-		memset(&server[i], 0, sizeof(struct mmo_map_server));
-		server_fd[i] = -1;
-	}
-
-	online_players_max = 256;
-	online_chars = (struct online_chars*)aCalloc(sizeof(struct online_chars) * 256, 1);
-	if (!online_chars) {
-		printf("out of memory: do_init (calloc).\n");
-		exit(1);
-	}
-	for(i = 0; i < online_players_max; i++) {
-		online_chars[i].char_id = -1;
-		online_chars[i].server = -1;
-	}
-
-	mmo_char_init();
-
-	update_online = time(NULL);
-	create_online_files(); // update online players files at start of the server
-
-	inter_init((argc > 2) ? argv[2] : inter_cfgName);	// inter server 初期化
-
-	set_termfunc(do_final);
-	set_defaultparse(parse_char);
-
-        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);
-
-	add_timer_func_list(check_connect_login_server, "check_connect_login_server");
-	add_timer_func_list(send_users_tologin, "send_users_tologin");
-	add_timer_func_list(mmo_char_sync_timer, "mmo_char_sync_timer");
-
-	i = add_timer_interval(gettick() + 1000, check_connect_login_server, 0, 0, 10 * 1000);
-	i = add_timer_interval(gettick() + 1000, send_users_tologin, 0, 0, 5 * 1000);
-	i = add_timer_interval(gettick() + autosave_interval, 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);
-
-	if(console) {
-	    set_defaultconsoleparse(parse_console);
-	   	start_console();
-	}
-
-	char_log("The char-server is ready (Server is listening on the port %d)." RETCODE, char_port);
-
-	printf("The char-server is \033[1;32mready\033[0m (Server is listening on the port %d).\n\n", char_port);
-
-	return 0;
-}
-
-int char_married(int pl1,int pl2) {
-	if (char_dat[pl1].char_id == char_dat[pl2].partner_id && char_dat[pl2].char_id == char_dat[pl1].partner_id)
-		return 1;
-	else 
-		return 0;
-}
-
-int char_child(int parent_id, int child_id) {
-	if (char_dat[parent_id].child == char_dat[child_id].char_id && 
-	((char_dat[parent_id].char_id == char_dat[child_id].father) || 
-	(char_dat[parent_id].char_id == char_dat[child_id].mother)))
-		return 1;
-	else
-		return 0;
-}
diff --git a/src/char/char.h b/src/char/char.h
deleted file mode 100644
index 78f4f0194..000000000
--- a/src/char/char.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id: char.h,v 1.1.1.1 2004/09/10 17:26:50 MagicalTux Exp $
-#ifndef _CHAR_H_
-#define _CHAR_H_
-
-#define MAX_MAP_SERVERS 30
-
-#define CHAR_CONF_NAME	"conf/char_athena.conf"
-
-#define LOGIN_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];
-};
-
-int search_character_index(char* character_name);
-char * search_character_name(int index);
-
-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_married(int pl1,int pl2);
-int char_child(int parent_id, int child_id);
-
-int char_log(char *fmt, ...);
-
-extern int autosave_interval;
-extern char db_path[];
-
-#endif
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
deleted file mode 100644
index 9268d9339..000000000
--- a/src/char/int_guild.c
+++ /dev/null
@@ -1,1473 +0,0 @@
-// $Id: int_guild.c,v 1.2 2004/09/25 19:36:53 Akitasha Exp $
-#include "inter.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "mmo.h"
-#include "char.h"
-#include "socket.h"
-#include "db.h"
-#include "lock.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-char guild_txt[1024] = "save/guild.txt";
-char castle_txt[1024] = "save/castle.txt";
-
-static struct dbt *guild_db;
-static struct dbt *castle_db;
-
-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);
-
-// ギルドデータの文字列への変換
-int inter_guild_tostr(char *str, struct guild *g) {
-	int i, c, len;
-
-	// 基本データ
-	len = sprintf(str, "%d\t%s\t%s\t%d,%d,%d,%d,%d\t%s#\t%s#\t",
-	              g->guild_id, g->name, g->master,
-	              g->guild_lv, g->max_member, g->exp, g->skill_point, g->castle_id,
-	              g->mes1, g->mes2);
-	// メンバー
-	for(i = 0; i < g->max_member; i++) {
-		struct guild_member *m = &g->member[i];
-		len += sprintf(str + len, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\t%s\t",
-		               m->account_id, m->char_id,
-		               m->hair, m->hair_color, m->gender,
-		               m->class_, m->lv, m->exp, m->exp_payper, m->position,
-		               ((m->account_id > 0) ? m->name : "-"));
-	}
-	// 役職
-	for(i = 0; i < MAX_GUILDPOSITION; i++) {
-		struct guild_position *p = &g->position[i];
-		len += sprintf(str + len, "%d,%d\t%s#\t", p->mode, p->exp_mode, p->name);
-	}
-	// エンブレム
-	len += sprintf(str + len, "%d,%d,", g->emblem_len, g->emblem_id);
-	for(i = 0; i < g->emblem_len; i++) {
-		len += sprintf(str + len, "%02x", (unsigned char)(g->emblem_data[i]));
-	}
-	len += sprintf(str + len, "$\t");
-	// 同盟リスト
-	c = 0;
-	for(i = 0; i < MAX_GUILDALLIANCE; i++)
-		if (g->alliance[i].guild_id > 0)
-			c++;
-	len += sprintf(str + len, "%d\t", c);
-	for(i = 0; i < MAX_GUILDALLIANCE; i++) {
-		struct guild_alliance *a = &g->alliance[i];
-		if (a->guild_id > 0)
-			len += sprintf(str + len, "%d,%d\t%s\t", a->guild_id, a->opposition, a->name);
-	}
-	// 追放リスト
-	c = 0;
-	for(i = 0; i < MAX_GUILDEXPLUSION; i++)
-		if (g->explusion[i].account_id > 0)
-			c++;
-	len += sprintf(str + len, "%d\t", c);
-	for(i = 0; i < MAX_GUILDEXPLUSION; i++) {
-		struct guild_explusion *e = &g->explusion[i];
-		if (e->account_id > 0)
-			len += sprintf(str + len, "%d,%d,%d,%d\t%s\t%s\t%s#\t",
-			               e->account_id, e->rsv1, e->rsv2, e->rsv3,
-			               e->name, e->acc, e->mes );
-	}
-	// ギルドスキル
-	for(i = 0; i < MAX_GUILDSKILL; i++) {
-		len += sprintf(str + len, "%d,%d ", g->skill[i].id, g->skill[i].lv);
-	}
-	len += sprintf(str + len, "\t");
-
-	return 0;
-}
-
-// ギルドデータの文字列からの変換
-int inter_guild_fromstr(char *str, struct guild *g) {
-	int i, j, c;
-	int tmp_int[16];
-	char tmp_str[4][256];
-	char tmp_str2[4096];
-	char *pstr;
-
-	// 基本データ
-	memset(g, 0, sizeof(struct guild));
-	if (sscanf(str, "%d\t%[^\t]\t%[^\t]\t%d,%d,%d,%d,%d\t%[^\t]\t%[^\t]\t", &tmp_int[0],
-	           tmp_str[0], tmp_str[1],
-	           &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4], &tmp_int[5],
-	           tmp_str[2], tmp_str[3]) < 8)
-		return 1;
-
-	g->guild_id = tmp_int[0];
-	g->guild_lv = tmp_int[1];
-	g->max_member = tmp_int[2];
-	g->exp = tmp_int[3];
-	g->skill_point = tmp_int[4];
-	g->castle_id = tmp_int[5];
-	memcpy(g->name, tmp_str[0], 24);
-	memcpy(g->master, tmp_str[1], 24);
-	memcpy(g->mes1, tmp_str[2], 60);
-	memcpy(g->mes2, tmp_str[3], 120);
-	g->mes1[strlen(g->mes1)-1] = 0;
-	g->mes2[strlen(g->mes2)-1] = 0;
-
-	for(j = 0; j < 6 && str != NULL; j++)	// 位置スキップ
-		str = strchr(str + 1, '\t');
-//	printf("GuildBaseInfo OK\n");
-
-	// メンバー
-	for(i = 0; i < g->max_member; i++) {
-		struct guild_member *m = &g->member[i];
-		if (sscanf(str + 1, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\t%[^\t]\t",
-		           &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4],
-		           &tmp_int[5], &tmp_int[6], &tmp_int[7], &tmp_int[8], &tmp_int[9],
-		           tmp_str[0]) < 11)
-			return 1;
-		m->account_id = tmp_int[0];
-		m->char_id = tmp_int[1];
-		m->hair = tmp_int[2];
-		m->hair_color = tmp_int[3];
-		m->gender = tmp_int[4];
-		m->class_ = tmp_int[5];
-		m->lv = tmp_int[6];
-		m->exp = tmp_int[7];
-		m->exp_payper = tmp_int[8];
-		m->position = tmp_int[9];
-		memcpy(m->name, tmp_str[0], 24);
-
-		for(j = 0; j < 2 && str != NULL; j++)	// 位置スキップ
-			str = strchr(str + 1, '\t');
-	}
-//	printf("GuildMemberInfo OK\n");
-	// 役職
-	i = 0;
-	while (sscanf(str+1, "%d,%d%n", &tmp_int[0], &tmp_int[1], &j) == 2 && str[1+j] == '\t') {
-		struct guild_position *p = &g->position[i];
-		if (sscanf(str+1, "%d,%d\t%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str[0]) < 3)
-			return 1;
-		p->mode = tmp_int[0];
-		p->exp_mode = tmp_int[1];
-		tmp_str[0][strlen(tmp_str[0])-1] = 0;
-		memcpy(p->name, tmp_str[0], 24);
-
-		for(j = 0; j < 2 && str != NULL; j++)	// 位置スキップ
-			str = strchr(str+1, '\t');
-		i++;
-	}
-//	printf("GuildPositionInfo OK\n");
-	// エンブレム
-	tmp_int[1] = 0;
-	if (sscanf(str + 1, "%d,%d,%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str2)< 3 &&
-		sscanf(str + 1, "%d,%[^\t]\t", &tmp_int[0], tmp_str2) < 2)
-		return 1;
-	g->emblem_len = tmp_int[0];
-	g->emblem_id = tmp_int[1];
-	for(i = 0, pstr = tmp_str2; 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;
-	}
-//	printf("GuildEmblemInfo OK\n");
-	str=strchr(str + 1, '\t');	// 位置スキップ
-
-	// 同盟リスト
-	if (sscanf(str + 1, "%d\t", &c) < 1)
-		return 1;
-	str = strchr(str + 1, '\t');	// 位置スキップ
-	for(i = 0; i < c; i++) {
-		struct guild_alliance *a = &g->alliance[i];
-		if (sscanf(str + 1, "%d,%d\t%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str[0]) < 3)
-			return 1;
-		a->guild_id = tmp_int[0];
-		a->opposition = tmp_int[1];
-		memcpy(a->name, tmp_str[0], 24);
-
-		for(j = 0; j < 2 && str != NULL; j++)	// 位置スキップ
-			str = strchr(str + 1, '\t');
-	}
-//	printf("GuildAllianceInfo OK\n");
-	// 追放リスト
-	if (sscanf(str+1, "%d\t", &c) < 1)
-		return 1;
-	str = strchr(str + 1, '\t');	// 位置スキップ
-	for(i = 0; i < c; i++) {
-		struct guild_explusion *e = &g->explusion[i];
-		if (sscanf(str + 1, "%d,%d,%d,%d\t%[^\t]\t%[^\t]\t%[^\t]\t",
-		           &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		           tmp_str[0], tmp_str[1], tmp_str[2]) < 6)
-			return 1;
-		e->account_id = tmp_int[0];
-		e->rsv1 = tmp_int[1];
-		e->rsv2 = tmp_int[2];
-		e->rsv3 = tmp_int[3];
-		memcpy(e->name, tmp_str[0], 24);
-		memcpy(e->acc, tmp_str[1], 24);
-		tmp_str[2][strlen(tmp_str[2])-1] = 0;
-		memcpy(e->mes, tmp_str[2], 40);
-
-		for(j = 0; j < 4 && str != NULL; j++)	// 位置スキップ
-			str = strchr(str + 1, '\t');
-	}
-//	printf("GuildExplusionInfo OK\n");
-	// ギルドスキル
-	for(i = 0; i < MAX_GUILDSKILL; i++) {
-		if (sscanf(str+1,"%d,%d ", &tmp_int[0], &tmp_int[1]) < 2)
-			break;
-		g->skill[i].id = tmp_int[0];
-		g->skill[i].lv = tmp_int[1];
-		str = strchr(str + 1, ' ');
-	}
-	str = strchr(str + 1, '\t');
-//	printf("GuildSkillInfo OK\n");
-
-	return 0;
-}
-
-// ギルド城データの文字列への変換
-int inter_guildcastle_tostr(char *str, struct guild_castle *gc) {
-	int len;
-
-	len = sprintf(str, "%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",	// added Guardian HP [Valaris]
-	              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);
-
-	return 0;
-}
-
-// ギルド城データの文字列からの変換
-int inter_guildcastle_fromstr(char *str, struct guild_castle *gc) {
-	int tmp_int[26];
-
-	memset(gc, 0, sizeof(struct guild_castle));
-	// new structure of guild castle
-	if (sscanf(str, "%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",
-	           &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4], &tmp_int[5], &tmp_int[6],
-	           &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], &tmp_int[13],
-	           &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17], &tmp_int[18], &tmp_int[19], &tmp_int[20],
-	           &tmp_int[21], &tmp_int[22], &tmp_int[23], &tmp_int[24], &tmp_int[25]) == 26) {
-		gc->castle_id = tmp_int[0];
-		gc->guild_id = tmp_int[1];
-		gc->economy = tmp_int[2];
-		gc->defense = tmp_int[3];
-		gc->triggerE = tmp_int[4];
-		gc->triggerD = tmp_int[5];
-		gc->nextTime = tmp_int[6];
-		gc->payTime = tmp_int[7];
-		gc->createTime = tmp_int[8];
-		gc->visibleC = tmp_int[9];
-		gc->visibleG0 = tmp_int[10];
-		gc->visibleG1 = tmp_int[11];
-		gc->visibleG2 = tmp_int[12];
-		gc->visibleG3 = tmp_int[13];
-		gc->visibleG4 = tmp_int[14];
-		gc->visibleG5 = tmp_int[15];
-		gc->visibleG6 = tmp_int[16];
-		gc->visibleG7 = tmp_int[17];
-		gc->Ghp0 = tmp_int[18];
-		gc->Ghp1 = tmp_int[19];
-		gc->Ghp2 = tmp_int[20];
-		gc->Ghp3 = tmp_int[21];
-		gc->Ghp4 = tmp_int[22];
-		gc->Ghp5 = tmp_int[23];
-		gc->Ghp6 = tmp_int[24];
-		gc->Ghp7 = tmp_int[25];	// end additions [Valaris]
-	// old structure of guild castle
-	} else if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
-	                  &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3], &tmp_int[4], &tmp_int[5], &tmp_int[6],
-	                  &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[11], &tmp_int[12], &tmp_int[13],
-	                  &tmp_int[14], &tmp_int[15], &tmp_int[16], &tmp_int[17]) == 18) {
-		gc->castle_id = tmp_int[0];
-		gc->guild_id = tmp_int[1];
-		gc->economy = tmp_int[2];
-		gc->defense = tmp_int[3];
-		gc->triggerE = tmp_int[4];
-		gc->triggerD = tmp_int[5];
-		gc->nextTime = tmp_int[6];
-		gc->payTime = tmp_int[7];
-		gc->createTime = tmp_int[8];
-		gc->visibleC = tmp_int[9];
-		gc->visibleG0 = tmp_int[10];
-		gc->visibleG1 = tmp_int[11];
-		gc->visibleG2 = tmp_int[12];
-		gc->visibleG3 = tmp_int[13];
-		gc->visibleG4 = tmp_int[14];
-		gc->visibleG5 = tmp_int[15];
-		gc->visibleG6 = tmp_int[16];
-		gc->visibleG7 = tmp_int[17];
-		if (gc->visibleG0 == 1)
-			gc->Ghp0 = 15670 + 2000 * gc->defense;
-		else
-			gc->Ghp0 = 0;
-		if (gc->visibleG1 == 1)
-			gc->Ghp1 = 15670 + 2000 * gc->defense;
-		else
-			gc->Ghp1 = 0;
-		if (gc->visibleG2 == 1)
-			gc->Ghp2 = 15670 + 2000 * gc->defense;
-		else
-			gc->Ghp2 = 0;
-		if (gc->visibleG3 == 1)
-			gc->Ghp3 = 30214 + 2000 * gc->defense;
-		else
-			gc->Ghp3 = 0;
-		if (gc->visibleG4 == 1)
-			gc->Ghp4 = 30214 + 2000 * gc->defense;
-		else
-			gc->Ghp4 = 0;
-		if (gc->visibleG5 == 1)
-			gc->Ghp5 = 28634 + 2000 * gc->defense;
-		else
-			gc->Ghp5 = 0;
-		if (gc->visibleG6 == 1)
-			gc->Ghp6 = 28634 + 2000 * gc->defense;
-		else
-			gc->Ghp6 = 0;
-		if (gc->visibleG7 == 1)
-			gc->Ghp7 = 28634 + 2000 * gc->defense;
-		else
-			gc->Ghp7 = 0;
-	} else {
-		return 1;
-	}
-
-	return 0;
-}
-
-// ギルド関連データベース読み込み
-int inter_guild_readdb() {
-	int i;
-	FILE *fp;
-	char line[1024];
-	char path[1024];
-
-	sprintf(path, "%s%s", db_path, "/exp_guild.txt");
-	fp = fopen(path, "r");
-	if (fp == NULL) {
-		printf("can't read db/exp_guild.txt\n");
-		return 1;
-	}
-	i = 0;
-	while(fgets(line, sizeof(line)-1, fp) && i < 100){
-		if (line[0] == '/' && line[1] == '/')
-			continue;
-		guild_exp[i] = atoi(line);
-		i++;
-	}
-	fclose(fp);
-
-	return 0;
-}
-
-// ギルドデータの読み込み
-int inter_guild_init() {
-	char line[16384];
-	struct guild *g;
-	struct guild_castle *gc;
-	FILE *fp;
-	int i, j, c = 0;
-
-	inter_guild_readdb();
-
-	guild_db = numdb_init();
-	castle_db = numdb_init();
-
-	if ((fp = fopen(guild_txt,"r")) == NULL)
-		return 1;
-	while(fgets(line, sizeof(line)-1, fp)) {
-		j = 0;
-		if (sscanf(line, "%d\t%%newid%%\n%n", &i, &j) == 1 && j > 0 && guild_newid <= i) {
-			guild_newid = i;
-			continue;
-		}
-
-		g = (struct guild *) aCalloc(sizeof(struct guild), 1);
-		if(g == NULL){
-			printf("int_guild: out of memory!\n");
-			exit(0);
-		}
-		memset(g, 0, sizeof(struct guild));
-		if (inter_guild_fromstr(line, g) == 0 && g->guild_id > 0) {
-			if (g->guild_id >= guild_newid)
-				guild_newid = g->guild_id + 1;
-			numdb_insert(guild_db, g->guild_id, g);
-			guild_check_empty(g);
-			guild_calcinfo(g);
-		} else {
-			printf("int_guild: broken data [%s] line %d\n", guild_txt, c);
-			aFree(g);
-		}
-		c++;
-	}
-	fclose(fp);
-//	printf("int_guild: %s read done (%d guilds)\n", guild_txt, c);
-
-	c = 0;//カウンタ初期化
-
-	if ((fp = fopen(castle_txt, "r")) == NULL) {
-		return 1;
-	}
-
-	while(fgets(line, sizeof(line)-1, fp)) {
-		gc = (struct guild_castle *) aCalloc(sizeof(struct guild_castle), 1);
-		if(gc == NULL){
-			printf("int_guild: out of memory!\n");
-			exit(0);
-		}
-		memset(gc, 0, sizeof(struct guild_castle));
-		if (inter_guildcastle_fromstr(line, gc) == 0) {
-			numdb_insert(castle_db, gc->castle_id, gc);
-		} else {
-			printf("int_guild: broken data [%s] line %d\n", castle_txt, c);
-			aFree(gc);
-		}
-		c++;
-	}
-
-	if (!c) {
-		printf(" %s - making Default Data...\n", castle_txt);
-		//デフォルトデータを作成
-		for(i = 0; i < MAX_GUILDCASTLE; i++) {
-			gc = (struct guild_castle *) aCalloc(sizeof(struct guild_castle), 1);
-			if (gc == NULL) {
-				printf("int_guild: out of memory!\n");
-				exit(0);
-			}
-			memset(gc, 0, sizeof(struct guild_castle));
-			gc->castle_id = i;
-			gc->guild_id = 0;
-			gc->economy = 0;
-			gc->defense = 0;
-			gc->triggerE = 0;
-			gc->triggerD = 0;
-			gc->nextTime = 0;
-			gc->payTime = 0;
-			gc->createTime = 0;
-			gc->visibleC = 0;
-			gc->visibleG0 = 0;
-			gc->visibleG1 = 0;
-			gc->visibleG2 = 0;
-			gc->visibleG3 = 0;
-			gc->visibleG4 = 0;
-			gc->visibleG5 = 0;
-			gc->visibleG6 = 0;
-			gc->visibleG7 = 0;
-			gc->Ghp0 = 0;	// guardian HP [Valaris]
-			gc->Ghp1 = 0;
-			gc->Ghp2 = 0;
-			gc->Ghp3 = 0;
-			gc->Ghp4 = 0;
-			gc->Ghp5 = 0;
-			gc->Ghp6 = 0;
-			gc->Ghp7 = 0;	// end additions [Valaris]
-			numdb_insert(castle_db, gc->castle_id, gc);
-		}
-		printf(" %s - making done\n",castle_txt);
-		return 0;
-	}
-
-	fclose(fp);
-
-	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;
-}
-int guild_db_final (void *k, void *data, va_list ap)
-{
-	struct guild *g = (struct guild *) data;
-	if (g) aFree(g);
-	return 0;
-}
-void inter_guild_final() {
-	numdb_final(castle_db, castle_db_final);
-	numdb_final(guild_db, guild_db_final);
-	return;
-}
-
-struct guild *inter_guild_search(int guild_id) {
-	struct guild *g;
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-
-	return g;
-}
-
-// ギルドデータのセーブ用
-int inter_guild_save_sub(void *key,void *data,va_list ap) {
-	char line[16384];
-	FILE *fp;
-
-	inter_guild_tostr(line,(struct guild *)data);
-	fp=va_arg(ap,FILE *);
-	fprintf(fp,"%s" RETCODE,line);
-
-	return 0;
-}
-
-// ギルド城データのセーブ用
-int inter_castle_save_sub(void *key, void *data, va_list ap) {
-	char line[16384];
-	FILE *fp;
-
-	inter_guildcastle_tostr(line, (struct guild_castle *)data);
-	fp = va_arg(ap, FILE *);
-	fprintf(fp, "%s" RETCODE, line);
-
-	return 0;
-}
-
-// ギルドデータのセーブ
-int inter_guild_save() {
-	FILE *fp;
-	int lock;
-
-	if ((fp = lock_fopen(guild_txt, &lock)) == NULL) {
-		printf("int_guild: cant write [%s] !!! data is lost !!!\n", guild_txt);
-		return 1;
-	}
-	numdb_foreach(guild_db, inter_guild_save_sub, fp);
-//	fprintf(fp, "%d\t%%newid%%\n", guild_newid);
-	lock_fclose(fp, guild_txt, &lock);
-//	printf("int_guild: %s saved.\n", guild_txt);
-
-	if ((fp = lock_fopen(castle_txt,&lock)) == NULL) {
-		printf("int_guild: cant write [%s] !!! data is lost !!!\n", castle_txt);
-		return 1;
-	}
-	numdb_foreach(castle_db, inter_castle_save_sub, fp);
-	lock_fclose(fp, castle_txt, &lock);
-
-	return 0;
-}
-
-// ギルド名検索用
-int search_guildname_sub(void *key, void *data, va_list ap) {
-	struct guild *g = (struct guild *)data, **dst;
-	char *str;
-
-	str = va_arg(ap, char *);
-	dst = va_arg(ap, struct guild **);
-	if (strcmpi(g->name, str) == 0)
-		*dst = g;
-	return 0;
-}
-
-// ギルド名検索
-struct guild* search_guildname(char *str) {
-	struct guild *g = NULL;
-	numdb_foreach(guild_db, search_guildname_sub, str, &g);
-	return g;
-}
-
-// ギルドが空かどうかチェック
-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;
-		}
-	}
-		// 誰もいないので解散
-	numdb_foreach(guild_db, guild_break_sub, g->guild_id);
-	numdb_erase(guild_db, g->guild_id);
-	inter_guild_storage_delete(g->guild_id);
-	mapif_guild_broken(g->guild_id, 0);
-	aFree(g);
-
-	return 1;
-}
-
-// キャラの競合がないかチェック用
-int guild_check_conflict_sub(void *key, void *data, va_list ap) {
-	struct guild *g = (struct guild *)data;
-	int guild_id, account_id, char_id, i;
-
-	guild_id = va_arg(ap, int);
-	account_id = va_arg(ap, int);
-	char_id = va_arg(ap, int);
-
-	if (g->guild_id == guild_id)	// 本来の所属なので問題なし
-		return 0;
-
-	for(i = 0; i < MAX_GUILD; i++) {
-		if (g->member[i].account_id == account_id && g->member[i].char_id == char_id) {
-			// 別のギルドに偽の所属データがあるので脱退
-			printf("int_guild: guild conflict! %d,%d %d!=%d\n", account_id, char_id, guild_id, g->guild_id);
-			mapif_parse_GuildLeave(-1, g->guild_id, account_id, char_id, 0, "**データ競合**");
-		}
-	}
-
-	return 0;
-}
-// キャラの競合がないかチェック
-int guild_check_conflict(int guild_id, int account_id, int char_id) {
-	numdb_foreach(guild_db, guild_check_conflict_sub, guild_id, account_id, char_id);
-
-	return 0;
-}
-
-int guild_nextexp(int level) {
-	if (level < 100)
-		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) {	// レベルアップ処理
-			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; //Lupus 2 -> 6
-
-	// 平均レベルとオンライン人数
-	g->average_lv = 0;
-	g->connect_member = 0;
-	c = 0;
-	for(i = 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[79];
-
-	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[19];
-
-	WBUFW(buf, 0) = 0x3835;
-	WBUFL(buf, 2) = g->guild_id;
-	WBUFL(buf, 6) = g->member[idx].account_id;
-	WBUFL(buf,10) = g->member[idx].char_id;
-	WBUFB(buf,14) = (unsigned char)g->member[idx].online;
-	WBUFW(buf,15) = g->member[idx].lv;
-	WBUFW(buf,17) = g->member[idx].class_;
-	mapif_sendall(buf, 19);
-	return 0;
-}
-
-// 解散通知
-int mapif_guild_broken(int guild_id, int flag) {
-	unsigned char buf[7];
-
-	WBUFW(buf,0) = 0x3836;
-	WBUFL(buf,2) = guild_id;
-	WBUFB(buf,6) = flag;
-	mapif_sendall(buf, 7);
-	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[2048];
-
-	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[4096];
-
-	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[14];
-
-	WBUFW(buf, 0) = 0x383c;
-	WBUFL(buf, 2) = guild_id;
-	WBUFL(buf, 6) = skill_num;
-	WBUFL(buf,10) = account_id;
-	mapif_sendall(buf, 14);
-
-	return 0;
-}
-
-// ギルド同盟/敵対通知
-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[67];
-
-	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[2048];
-
-	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[186];
-
-	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) {
-	unsigned char buf[9];
-
-	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) {
-	unsigned char buf[9];
-
-	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_sub(void *key, void *data, va_list ap) {
-	int fd = va_arg(ap, int);
-	int *p = va_arg(ap, int*);
-
-	memcpy(WFIFOP(fd,*p), (struct guild_castle*)data, sizeof(struct guild_castle));
-	(*p) += sizeof(struct guild_castle);
-
-	return 0;
-}
-
-int mapif_guild_castle_alldataload(int fd) {
-	int len = 4;
-
-	WFIFOW(fd,0) = 0x3842;
-	numdb_foreach(castle_db, mapif_guild_castle_alldataload_sub, fd, &len);
-	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;
-
-	for(i = 0; i < 24 && name[i]; i++) {
-		if (!(name[i] & 0xe0) || name[i] == 0x7f) {
-			printf("int_guild: illeagal guild name [%s]\n", name);
-			mapif_guild_created(fd, account_id, NULL);
-			return 0;
-		}
-	}
-
-	if ((g = search_guildname(name)) != NULL) {
-		printf("int_guild: same name guild exists [%s]\n", name);
-		mapif_guild_created(fd, account_id, NULL);
-		return 0;
-	}
-	g = (struct guild *) aCalloc(sizeof(struct guild), 1);
-	if (g == NULL) {
-		printf("int_guild: CreateGuild: out of memory !\n");
-		mapif_guild_created(fd, account_id, NULL);
-		exit(0);
-	}
-	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);
-
-	// ここでギルド情報計算が必要と思われる
-	g->max_member = 16;
-	g->average_lv = master->lv;
-	for(i = 0; i < MAX_GUILDSKILL; i++)
-		g->skill[i].id=i + GD_SKILLBASE;
-
-	numdb_insert(guild_db, g->guild_id, g);
-
-	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;
-}
-
-// ギルド情報要求
-int mapif_parse_GuildInfo(int fd, int guild_id) {
-	struct guild *g;
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-	if (g != NULL){
-		guild_calcinfo(g);
-		mapif_guild_info(fd, g);
-	} else
-		mapif_guild_noinfo(fd, guild_id);
-
-	return 0;
-}
-
-// ギルドメンバ追加要求
-int mapif_parse_GuildAddMember(int fd, int guild_id, struct guild_member *m) {
-	struct guild *g;
-	int i;
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-	if (g == NULL) {
-		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);
-
-			return 0;
-		}
-	}
-	mapif_guild_memberadded(fd, guild_id, m->account_id, m->char_id, 1);
-
-	return 0;
-}
-
-// ギルド脱退/追放要求
-int mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, int flag, const char *mes) {
-	struct guild *g = NULL;
-	int i, j;
-
-	g = (struct guild *)numdb_search(guild_db, guild_id);
-	if (g != NULL) {
-		for(i = 0; i < MAX_GUILD; 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) {	// 追放の場合追放リストに入れる
-					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);// まだ人がいるのでデータ送信
-
-				return 0;
-			}
-		}
-	}
-	return 0;
-}
-
-// オンライン/Lv更新
-int mapif_parse_GuildChangeMemberInfoShort(int fd, int guild_id, int account_id, int char_id, int online, int lv, int class_) {
-	struct guild *g;
-	int i, alv, c;
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-	if (g == NULL)
-		return 0;
-
-	g->connect_member = 0;
-
-	alv = 0;
-	c = 0;
-	for(i = 0; i < MAX_GUILD; 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);
-		}
-		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;
-
-	return 0;
-}
-
-// ギルド解散処理用（同盟/敵対を解除）
-int guild_break_sub(void *key, void *data, va_list ap) {
-	struct guild *g = (struct guild *)data;
-	int guild_id = va_arg(ap, int);
-	int i;
-
-	for(i = 0; i < MAX_GUILDALLIANCE; i++) {
-		if (g->alliance[i].guild_id == guild_id)
-			g->alliance[i].guild_id = 0;
-	}
-	return 0;
-}
-
-// ギルド解散要求
-int mapif_parse_BreakGuild(int fd, int guild_id) {
-	struct guild *g;
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-	if(g == NULL)
-		return 0;
-
-	numdb_foreach(guild_db, guild_break_sub, guild_id);
-	numdb_erase(guild_db, guild_id);
-	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);
-	aFree(g);
-
-	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;
-	short dw = *((short *)data);
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-	if (g == NULL)
-		return 0;
-
-	switch(type) {
-	case GBI_GUILDLV:
-		if (dw > 0 && g->guild_lv + dw <= 50) {
-			g->guild_lv+=dw;
-			g->skill_point+=dw;
-		} else if (dw < 0 && g->guild_lv + dw >= 1)
-			g->guild_lv += dw;
-		mapif_guild_info(-1, g);
-		return 0;
-	default:
-		printf("int_guild: GuildBasicInfoChange: Unknown type %d\n", type);
-		break;
-	}
-	mapif_guild_basicinfochanged(guild_id, type, data, len);
-
-	return 0;
-}
-
-// ギルドメンバデータ変更要求
-int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int char_id, int type, const char *data, int len) {
-	int i;
-	struct guild *g;
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-	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);
-			break;
-		case GMI_EXP:	// EXP
-		  {
-			int exp, oldexp = g->member[i].exp;
-			exp = g->member[i].exp = *((unsigned int *)data);
-			g->exp += (exp - oldexp);
-			guild_calcinfo(g);	// Lvアップ判断
-			mapif_guild_basicinfochanged(guild_id, GBI_EXP, &g->exp, 4);
-		  }
-			break;
-	default:
-		printf("int_guild: GuildMemberInfoChange: Unknown type %d\n", type);
-		break;
-	}
-	mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len);
-
-	return 0;
-}
-
-// ギルド役職名変更要求
-int mapif_parse_GuildPosition(int fd, int guild_id, int idx, struct guild_position *p) {
-	struct guild *g = (struct guild *) numdb_search(guild_db, 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);
-
-	return 0;
-}
-
-// ギルドスキルアップ要求
-int mapif_parse_GuildSkillUp(int fd, int guild_id, int skill_num, int account_id) {
-	struct guild *g = (struct guild *) numdb_search(guild_db, guild_id);
-	int idx = skill_num - GD_SKILLBASE;
-
-	if (g == NULL || idx < 0 || idx >= MAX_GUILDSKILL)
-		return 0;
-
-	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);
-	}
-
-	return 0;
-}
-
-// ギルド同盟要求
-int mapif_parse_GuildAlliance(int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag) {
-	struct guild *g[2];
-	int j, i;
-
-	g[0] = (struct guild *) numdb_search(guild_db, guild_id1);
-	g[1] = (struct guild *) numdb_search(guild_db, guild_id2);
-	if (g[0] == NULL || g[1] == NULL)
-		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);
-
-	return 0;
-}
-
-// ギルド告知変更要求
-int mapif_parse_GuildNotice(int fd, int guild_id, const char *mes1, const char *mes2) {
-	struct guild *g;
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-	if (g == NULL)
-		return 0;
-	memcpy(g->mes1, mes1, 60);
-	memcpy(g->mes2, mes2, 120);
-
-	return mapif_guild_notice(g);
-}
-
-// ギルドエンブレム変更要求
-int mapif_parse_GuildEmblem(int fd, int len, int guild_id, int dummy, const char *data) {
-	struct guild *g;
-
-	g = (struct guild *) numdb_search(guild_db, guild_id);
-	if (g == NULL)
-		return 0;
-	memcpy(g->emblem_data, data, len);
-	g->emblem_len = len;
-	g->emblem_id++;
-
-	return mapif_guild_emblem(g);
-}
-
-int mapif_parse_GuildCastleDataLoad(int fd, int castle_id, int index) {
-	struct guild_castle *gc = (struct guild_castle *) numdb_search(castle_db, castle_id);
-
-	if (gc == NULL) {
-		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);
-	case 2: return mapif_guild_castle_dataload(gc->castle_id, index, gc->economy);
-	case 3: return mapif_guild_castle_dataload(gc->castle_id, index, gc->defense);
-	case 4: return mapif_guild_castle_dataload(gc->castle_id, index, gc->triggerE);
-	case 5: return mapif_guild_castle_dataload(gc->castle_id, index, gc->triggerD);
-	case 6: return mapif_guild_castle_dataload(gc->castle_id, index, gc->nextTime);
-	case 7: return mapif_guild_castle_dataload(gc->castle_id, index, gc->payTime);
-	case 8: return mapif_guild_castle_dataload(gc->castle_id, index, gc->createTime);
-	case 9: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleC);
-	case 10: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG0);
-	case 11: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG1);
-	case 12: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG2);
-	case 13: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG3);
-	case 14: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG4);
-	case 15: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG5);
-	case 16: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG6);
-	case 17: return mapif_guild_castle_dataload(gc->castle_id, index, gc->visibleG7);
-	case 18: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp0);	// guardian HP [Valaris]
-	case 19: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp1);
-	case 20: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp2);
-	case 21: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp3);
-	case 22: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp4);
-	case 23: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp5);
-	case 24: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp6);
-	case 25: return mapif_guild_castle_dataload(gc->castle_id, index, gc->Ghp7);	// end additions [Valaris]
-
-	default:
-		printf("mapif_parse_GuildCastleDataLoad ERROR!! (Not found index=%d)\n", index);
-		return 0;
-	}
-
-	return 0;
-}
-
-int mapif_parse_GuildCastleDataSave(int fd, int castle_id, int index, int value) {
-	struct guild_castle *gc= (struct guild_castle *) numdb_search(castle_db, castle_id);
-
-	if (gc == NULL) {
-		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 = (struct guild *) numdb_search(guild_db, 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;
-	}
-
-	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) {
-	return guild_check_conflict(guild_id, account_id, char_id);
-}
-
-// 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/int_guild.h b/src/char/int_guild.h
deleted file mode 100644
index 3eeb1b3db..000000000
--- a/src/char/int_guild.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id: int_guild.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_GUILD_H_
-#define _INT_GUILD_H_
-
-int inter_guild_init();
-void inter_guild_final();
-int inter_guild_save();
-int inter_guild_parse_frommap(int fd);
-struct guild *inter_guild_search(int guild_id);
-int inter_guild_mapif_init(int fd);
-
-int inter_guild_leave(int guild_id,int account_id,int char_id);
-
-extern char guild_txt[1024];
-extern char castle_txt[1024];
-
-#endif
diff --git a/src/char/int_party.c b/src/char/int_party.c
deleted file mode 100644
index 299a75135..000000000
--- a/src/char/int_party.c
+++ /dev/null
@@ -1,625 +0,0 @@
-// $Id: int_party.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "inter.h"
-#include "int_party.h"
-#include "mmo.h"
-#include "char.h"
-#include "socket.h"
-#include "db.h"
-#include "lock.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-char party_txt[1024] = "save/party.txt";
-
-static struct dbt *party_db;
-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);
-
-// パ?ティデ?タの文字列への?換
-int inter_party_tostr(char *str, struct party *p) {
-	int i, len;
-
-	len = sprintf(str, "%d\t%s\t%d,%d\t", p->party_id, p->name, p->exp, p->item);
-	for(i = 0; i < MAX_PARTY; i++) {
-		struct party_member *m = &p->member[i];
-		len += sprintf(str + len, "%d,%d\t%s\t", m->account_id, m->leader, ((m->account_id > 0) ? m->name : "NoMember"));
-	}
-
-	return 0;
-}
-
-// パ?ティデ?タの文字列からの?換
-int inter_party_fromstr(char *str, struct party *p) {
-	int i, j;
-	int tmp_int[16];
-	char tmp_str[256];
-
-	memset(p, 0, sizeof(struct party));
-
-//	printf("sscanf party main info\n");
-	if (sscanf(str, "%d\t%[^\t]\t%d,%d\t", &tmp_int[0], tmp_str, &tmp_int[1], &tmp_int[2]) != 4)
-		return 1;
-
-	p->party_id = tmp_int[0];
-	strcpy(p->name, tmp_str);
-	p->exp = tmp_int[1];
-	p->item = tmp_int[2];
-//	printf("%d [%s] %d %d\n", tmp_int[0], tmp_str[0], tmp_int[1], tmp_int[2]);
-
-	for(j = 0; j < 3 && str != NULL; j++)
-		str = strchr(str + 1, '\t');
-
-	for(i = 0; i < MAX_PARTY; i++) {
-		struct party_member *m = &p->member[i];
-		if (str == NULL)
-			return 1;
-//		printf("sscanf party member info %d\n", i);
-
-		if (sscanf(str + 1, "%d,%d\t%[^\t]\t", &tmp_int[0], &tmp_int[1], tmp_str) != 3)
-			return 1;
-
-		m->account_id = tmp_int[0];
-		m->leader = tmp_int[1];
-		strncpy(m->name, tmp_str, sizeof(m->name));
-//		printf(" %d %d [%s]\n", tmp_int[0], tmp_int[1], tmp_str);
-
-		for(j = 0; j < 2 && str != NULL; j++)
-			str = strchr(str + 1, '\t');
-	}
-
-	return 0;
-}
-
-// パ?ティデ?タのロ?ド
-int inter_party_init() {
-	char line[8192];
-	struct party *p;
-	FILE *fp;
-	int c = 0;
-	int i, j;
-
-	party_db = numdb_init();
-
-	if ((fp = fopen(party_txt, "r")) == NULL)
-		return 1;
-
-	while(fgets(line, sizeof(line) - 1, fp)) {
-		j = 0;
-		if (sscanf(line, "%d\t%%newid%%\n%n", &i, &j) == 1 && j > 0 && party_newid <= i) {
-			party_newid = i;
-			continue;
-		}
-
-		p = (struct party*)aCalloc(sizeof(struct party), 1);
-		if (p == NULL){
-			printf("int_party: out of memory!\n");
-			exit(0);
-		}
-		memset(p, 0, sizeof(struct party));
-		if (inter_party_fromstr(line, p) == 0 && p->party_id > 0) {
-			if (p->party_id >= party_newid)
-				party_newid = p->party_id + 1;
-			numdb_insert(party_db, p->party_id, p);
-			party_check_empty(p);
-		} else {
-			printf("int_party: broken data [%s] line %d\n", party_txt, c + 1);
-			aFree(p);
-		}
-		c++;
-	}
-	fclose(fp);
-//	printf("int_party: %s read done (%d parties)\n", party_txt, c);
-
-	return 0;
-}
-
-int party_db_final (void *k, void *data, va_list ap) {
-	struct party *p = (struct party *) data;
-	if (p) aFree(p);
-	return 0;
-}
-void inter_party_final()
-{
-	numdb_final(party_db, party_db_final);
-	return;
-}
-
-// パ?ティ?デ?タのセ?ブ用
-int inter_party_save_sub(void *key, void *data, va_list ap) {
-	char line[8192];
-	FILE *fp;
-
-	inter_party_tostr(line, (struct party *)data);
-	fp = va_arg(ap, FILE *);
-	fprintf(fp, "%s" RETCODE, line);
-
-	return 0;
-}
-
-// パ?ティ?デ?タのセ?ブ
-int inter_party_save() {
-	FILE *fp;
-	int lock;
-
-	if ((fp = lock_fopen(party_txt, &lock)) == NULL) {
-		printf("int_party: cant write [%s] !!! data is lost !!!\n", party_txt);
-		return 1;
-	}
-	numdb_foreach(party_db, inter_party_save_sub, fp);
-//	fprintf(fp, "%d\t%%newid%%\n", party_newid);
-	lock_fclose(fp,party_txt, &lock);
-//	printf("int_party: %s saved.\n", party_txt);
-
-	return 0;
-}
-
-// パ?ティ名?索用
-int search_partyname_sub(void *key,void *data,va_list ap) {
-	struct party *p = (struct party *)data,**dst;
-	char *str;
-
-	str = va_arg(ap, char *);
-	dst = va_arg(ap, struct party **);
-	if (strcmpi(p->name, str) == 0)
-		*dst = p;
-
-	return 0;
-}
-
-// パ?ティ名?索
-struct party* search_partyname(char *str) {
-	struct party *p = NULL;
-	numdb_foreach(party_db, search_partyname_sub, str, &p);
-
-	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 (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=search_character_index(p->member[0].name);
-                pl2=search_character_index(p->member[1].name);
-                pl3=search_character_index(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);
-}
-
-// パ?ティが空かどうかチェック
-int party_check_empty(struct party *p) {
-	int i;
-
-//	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;
-		}
-	}
-		// 誰もいないので解散
-	mapif_party_broken(p->party_id, 0);
-	numdb_erase(party_db, p->party_id);
-	aFree(p);
-
-	return 1;
-}
-
-// キャラの競合がないかチェック用
-int party_check_conflict_sub(void *key, void *data, va_list ap) {
-	struct party *p = (struct party *)data;
-	int party_id, account_id, i;
-	char *nick;
-
-	party_id=va_arg(ap, int);
-	account_id=va_arg(ap, int);
-	nick=va_arg(ap, char *);
-
-	if (p->party_id == party_id)	// 本?の所?なので問題なし
-		return 0;
-
-	for(i = 0; i < MAX_PARTY; i++) {
-		if (p->member[i].account_id == account_id && strcmp(p->member[i].name, nick) == 0) {
-			// 別のパ?ティに?の所?デ?タがあるので?退
-			printf("int_party: party conflict! %d %d %d\n", account_id, party_id, p->party_id);
-			mapif_parse_PartyLeave(-1, p->party_id, account_id);
-		}
-	}
-
-	return 0;
-}
-
-// キャラの競合がないかチェック
-int party_check_conflict(int party_id, int account_id, char *nick) {
-	numdb_foreach(party_db, party_check_conflict_sub, party_id, account_id, 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[2048];
-
-	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[15];
-
-	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[34];
-
-	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[29];
-
-	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[7];
-	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[2048];
-
-	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からの通信
-
-
-// パ?ティ
-int mapif_parse_CreateParty(int fd, int account_id, char *name, char *nick, char *map, int lv, int item, int item2) {
-	struct party *p;
-	int i;
-
-	for(i = 0; i < 24 && name[i]; i++) {
-		if (!(name[i] & 0xe0) || name[i] == 0x7f) {
-			printf("int_party: illegal party name [%s]\n", name);
-			mapif_party_created(fd, account_id, NULL);
-			return 0;
-		}
-	}
-
-	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 = (struct party *) aCalloc(sizeof(struct party), 1);
-	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;
-
-	numdb_insert(party_db, 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;
-
-	p = (struct party *) numdb_search(party_db, party_id);
-	if (p != NULL)
-		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 = (struct party *) numdb_search(party_db, party_id);
-	if (p == NULL) {
-		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);
-			return 0;
-		}
-	}
-	mapif_party_memberadded(fd, party_id, account_id, 1);
-
-	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 = (struct party *) numdb_search(party_db, party_id);
-	if (p == NULL)
-		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);
-	return 0;
-}
-
-// パ?ティ?退要求
-int mapif_parse_PartyLeave(int fd, int party_id, int account_id) {
-	struct party *p;
-	int i;
-
-	p = (struct party *) numdb_search(party_db, party_id);
-	if (p != NULL) {
-		for(i = 0; i < MAX_PARTY; i++) {
-			if (p->member[i].account_id == account_id) {
-				mapif_party_leaved(party_id, account_id, p->member[i].name);
-
-				memset(&p->member[i], 0, sizeof(struct party_member));
-				if (party_check_empty(p) == 0)
-					mapif_party_info(-1, p);// まだ人がいるのでデ?タ送信
-				return 0;
-			}
-		}
-	}
-
-	return 0;
-}
-
-// パ?ティマップ更新要求
-int mapif_parse_PartyChangeMap(int fd, int party_id, int account_id, char *map, int online, int lv) {
-	struct party *p;
-	int i;
-
-	p = (struct party *) numdb_search(party_db, party_id);
-	if (p == NULL)
-		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;
-		}
-	}
-
-	return 0;
-}
-
-// パ?ティ解散要求
-int mapif_parse_BreakParty(int fd, int party_id) {
-	struct party *p;
-
-	p = (struct party *) numdb_search(party_db, party_id);
-	if (p == NULL)
-		return 0;
-
-	numdb_erase(party_db, party_id);
-	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/int_party.h b/src/char/int_party.h
deleted file mode 100644
index e3180f3b7..000000000
--- a/src/char/int_party.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Id: int_party.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_PARTY_H_
-#define _INT_PARTY_H_
-
-int inter_party_init();
-void inter_party_final();
-int inter_party_save();
-
-int inter_party_parse_frommap(int fd);
-
-int inter_party_leave(int party_id,int account_id);
-
-extern char party_txt[1024];
-
-#endif
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
deleted file mode 100644
index ab53d0533..000000000
--- a/src/char/int_pet.c
+++ /dev/null
@@ -1,375 +0,0 @@
-// $Id: int_pet.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "inter.h"
-#include "int_pet.h"
-#include "mmo.h"
-#include "char.h"
-#include "socket.h"
-#include "db.h"
-#include "lock.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-char pet_txt[1024]="save/pet.txt";
-
-static struct dbt *pet_db;
-static int pet_newid = 100;
-
-int inter_pet_tostr(char *str,struct s_pet *p)
-{
-	int len;
-
-	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;
-
-	len=sprintf(str,"%d,%d,%s\t%d,%d,%d,%d,%d,%d,%d,%d,%d",
-		p->pet_id,p->class_,p->name,p->account_id,p->char_id,p->level,p->egg_id,
-		p->equip,p->intimate,p->hungry,p->rename_flag,p->incuvate);
-
-	return 0;
-}
-
-int inter_pet_fromstr(char *str,struct s_pet *p)
-{
-	int s;
-	int tmp_int[16];
-	char tmp_str[256];
-
-	memset(p,0,sizeof(struct s_pet));
-
-//	printf("sscanf pet main info\n");
-	s=sscanf(str,"%d,%d,%[^\t]\t%d,%d,%d,%d,%d,%d,%d,%d,%d",&tmp_int[0],&tmp_int[1],tmp_str,&tmp_int[2],
-		&tmp_int[3],&tmp_int[4],&tmp_int[5],&tmp_int[6],&tmp_int[7],&tmp_int[8],&tmp_int[9],&tmp_int[10]);
-
-	if(s!=12)
-		return 1;
-
-	p->pet_id = tmp_int[0];
-	p->class_ = tmp_int[1];
-	memcpy(p->name,tmp_str,24);
-	p->account_id = tmp_int[2];
-	p->char_id = tmp_int[3];
-	p->level = tmp_int[4];
-	p->egg_id = tmp_int[5];
-	p->equip = tmp_int[6];
-	p->intimate = tmp_int[7];
-	p->hungry = tmp_int[8];
-	p->rename_flag = tmp_int[9];
-	p->incuvate = tmp_int[10];
-
-	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;
-
-	return 0;
-}
-
-int inter_pet_init()
-{
-	char line[8192];
-	struct s_pet *p;
-	FILE *fp;
-	int c=0;
-
-	pet_db=numdb_init();
-
-	if( (fp=fopen(pet_txt,"r"))==NULL )
-		return 1;
-	while(fgets(line,sizeof(line),fp)){
-		p = (struct s_pet*)aCalloc(sizeof(struct s_pet), 1);
-		if(p==NULL){
-			printf("int_pet: out of memory!\n");
-			exit(0);
-		}
-		memset(p,0,sizeof(struct s_pet));
-		if(inter_pet_fromstr(line,p)==0 && p->pet_id>0){
-			if( p->pet_id >= pet_newid)
-				pet_newid=p->pet_id+1;
-			numdb_insert(pet_db,p->pet_id,p);
-		}else{
-			printf("int_pet: broken data [%s] line %d\n",pet_txt,c);
-			aFree(p);
-		}
-		c++;
-	}
-	fclose(fp);
-//	printf("int_pet: %s read done (%d pets)\n",pet_txt,c);
-	return 0;
-}
-
-int pet_db_final (void *k, void *data, va_list ap) {
-	struct s_pet *p = (struct s_pet *) data;
-	if (p) aFree(p);
-	return 0;
-}
-void inter_pet_final()
-{
-	numdb_final(pet_db, pet_db_final);
-	return;
-}
-
-int inter_pet_save_sub(void *key,void *data,va_list ap)
-{
-	char line[8192];
-	FILE *fp;
-	inter_pet_tostr(line,(struct s_pet *)data);
-	fp=va_arg(ap,FILE *);
-	fprintf(fp,"%s" RETCODE,line);
-	return 0;
-}
-
-int inter_pet_save()
-{
-	FILE *fp;
-	int lock;
-	if( (fp=lock_fopen(pet_txt,&lock))==NULL ){
-		printf("int_pet: cant write [%s] !!! data is lost !!!\n",pet_txt);
-		return 1;
-	}
-	numdb_foreach(pet_db,inter_pet_save_sub,fp);
-	lock_fclose(fp,pet_txt,&lock);
-//	printf("int_pet: %s saved.\n",pet_txt);
-	return 0;
-}
-
-int inter_pet_delete(int pet_id)
-{
-	struct s_pet *p;
-	p = (struct s_pet *) numdb_search(pet_db,pet_id);
-	if( p == NULL)
-		return 1;
-	else {
-		numdb_erase(pet_db,pet_id);
-		printf("pet_id: %d deleted\n",pet_id);
-	}
-	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)
-{
-	struct s_pet *p;
-	p= (struct s_pet *) aMalloc(sizeof(struct s_pet));
-	if(p==NULL){
-		printf("int_pet: out of memory !\n");
-		mapif_pet_created(fd,account_id,NULL);
-		return 0;
-	}
-	memset(p,0,sizeof(struct s_pet));
-	p->pet_id = pet_newid++;
-	memcpy(p->name,pet_name,24);
-	if(incuvate == 1)
-		p->account_id = p->char_id = 0;
-	else {
-		p->account_id = account_id;
-		p->char_id = char_id;
-	}
-	p->class_ = pet_class;
-	p->level = pet_lv;
-	p->egg_id = pet_egg_id;
-	p->equip = pet_equip;
-	p->intimate = intimate;
-	p->hungry = hungry;
-	p->rename_flag = rename_flag;
-	p->incuvate = incuvate;
-
-	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;
-
-	numdb_insert(pet_db,p->pet_id,p);
-
-	mapif_pet_created(fd,account_id,p);
-
-	return 0;
-}
-
-int mapif_load_pet(int fd,int account_id,int char_id,int pet_id)
-{
-	struct s_pet *p;
-	p=(struct s_pet *)numdb_search(pet_db,pet_id);
-	if(p!=NULL) {
-		if(p->incuvate == 1) {
-			p->account_id = p->char_id = 0;
-			mapif_pet_info(fd,account_id,p);
-		}
-		else if(account_id == p->account_id && char_id == p->char_id)
-			mapif_pet_info(fd,account_id,p);
-		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)
-{
-	struct s_pet *p;
-	int pet_id;
-	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{
-		pet_id = data->pet_id;
-		p=(struct s_pet *)numdb_search(pet_db,pet_id);
-		if(p == NULL) {
-			p=(struct s_pet *)aMalloc(sizeof(struct s_pet));
-			if(p==NULL){
-				printf("int_pet: out of memory !\n");
-				mapif_save_pet_ack(fd,account_id,1);
-				return 0;
-			}
-			memset(p,0,sizeof(struct s_pet));
-			p->pet_id = data->pet_id;
-			if(p->pet_id == 0)
-				data->pet_id = p->pet_id = pet_newid++;
-			numdb_insert(pet_db,p->pet_id,p);
-		}
-		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;
-		memcpy(p,data,sizeof(struct s_pet));
-		if(p->incuvate == 1)
-			p->account_id = p->char_id = 0;
-
-		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;
-}
-
-// map server からの通信
-// ・１パケットのみ解析すること
-// ・パケット長データはinter.cにセットしておくこと
-// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない
-// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない
-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/int_pet.h b/src/char/int_pet.h
deleted file mode 100644
index 3a48ada3b..000000000
--- a/src/char/int_pet.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id: int_pet.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_PET_H_
-#define _INT_PET_H_
-
-int inter_pet_init();
-void inter_pet_final();
-int inter_pet_save();
-int inter_pet_delete(int pet_id);
-
-int inter_pet_parse_frommap(int fd);
-
-extern char pet_txt[1024];
-
-#endif
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
deleted file mode 100644
index eaf9e001a..000000000
--- a/src/char/int_storage.c
+++ /dev/null
@@ -1,516 +0,0 @@
-// $Id: int_storage.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "inter.h"
-#include "int_storage.h"
-#include "int_pet.h"
-#include "int_guild.h"
-#include "mmo.h"
-#include "char.h"
-#include "socket.h"
-#include "db.h"
-#include "lock.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-// ファイル名のデフォルト
-// inter_config_read()で再設定される
-char storage_txt[1024]="save/storage.txt";
-char guild_storage_txt[1024]="save/g_storage.txt";
-
-static struct dbt *storage_db;
-static struct dbt *guild_storage_db;
-
-// 倉庫データを文字列に変換
-int storage_tostr(char *str,struct storage *p)
-{
-	int i,f=0;
-	char *str_p = str;
-	str_p += sprintf(str_p,"%d,%d\t",p->account_id,p->storage_amount);
-
-	for(i=0;i<MAX_STORAGE;i++)
-		if( (p->storage_[i].nameid) && (p->storage_[i].amount) ){
-			str_p += sprintf(str_p,"%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ",
-				p->storage_[i].id,p->storage_[i].nameid,p->storage_[i].amount,p->storage_[i].equip,
-				p->storage_[i].identify,p->storage_[i].refine,p->storage_[i].attribute,
-				p->storage_[i].card[0],p->storage_[i].card[1],p->storage_[i].card[2],p->storage_[i].card[3]);
-			f++;
-		}
-
-	*(str_p++)='\t';
-
-	*str_p='\0';
-	if(!f)
-		str[0]=0;
-	return 0;
-}
-
-// 文字列を倉庫データに変換
-int storage_fromstr(char *str,struct storage *p)
-{
-	int tmp_int[256];
-	int set,next,len,i;
-
-	set=sscanf(str,"%d,%d%n",&tmp_int[0],&tmp_int[1],&next);
-	p->storage_amount=tmp_int[1];
-
-	if(set!=2)
-		return 1;
-	if(str[next]=='\n' || str[next]=='\r')
-		return 0;
-	next++;
-	for(i=0;str[next] && str[next]!='\t';i++){
-		if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-		      &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		      &tmp_int[4], &tmp_int[5], &tmp_int[6],
-		      &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[10], &len) == 12) {
-			p->storage_[i].id = tmp_int[0];
-			p->storage_[i].nameid = tmp_int[1];
-			p->storage_[i].amount = tmp_int[2];
-			p->storage_[i].equip = tmp_int[3];
-			p->storage_[i].identify = tmp_int[4];
-			p->storage_[i].refine = tmp_int[5];
-			p->storage_[i].attribute = tmp_int[6];
-			p->storage_[i].card[0] = tmp_int[7];
-			p->storage_[i].card[1] = tmp_int[8];
-			p->storage_[i].card[2] = tmp_int[9];
-			p->storage_[i].card[3] = tmp_int[10];
-			next += len;
-			if (str[next] == ' ')
-				next++;
-		}
-
-		else if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-		      &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		      &tmp_int[4], &tmp_int[5], &tmp_int[6],
-		      &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) {
-			p->storage_[i].id = tmp_int[0];
-			p->storage_[i].nameid = tmp_int[1];
-			p->storage_[i].amount = tmp_int[2];
-			p->storage_[i].equip = tmp_int[3];
-			p->storage_[i].identify = tmp_int[4];
-			p->storage_[i].refine = tmp_int[5];
-			p->storage_[i].attribute = tmp_int[6];
-			p->storage_[i].card[0] = tmp_int[7];
-			p->storage_[i].card[1] = tmp_int[8];
-			p->storage_[i].card[2] = tmp_int[9];
-			p->storage_[i].card[3] = tmp_int[10];
-			next += len;
-			if (str[next] == ' ')
-				next++;
-		}
-
-		else return 1;
-	}
-	return 0;
-}
-
-int guild_storage_tostr(char *str,struct guild_storage *p)
-{
-	int i,f=0;
-	char *str_p = str;
-	str_p+=sprintf(str,"%d,%d\t",p->guild_id,p->storage_amount);
-
-	for(i=0;i<MAX_GUILD_STORAGE;i++)
-		if( (p->storage_[i].nameid) && (p->storage_[i].amount) ){
-			str_p += sprintf(str_p,"%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ",
-				p->storage_[i].id,p->storage_[i].nameid,p->storage_[i].amount,p->storage_[i].equip,
-				p->storage_[i].identify,p->storage_[i].refine,p->storage_[i].attribute,
-				p->storage_[i].card[0],p->storage_[i].card[1],p->storage_[i].card[2],p->storage_[i].card[3]);
-			f++;
-		}
-
-	*(str_p++)='\t';
-
-	*str_p='\0';
-	if(!f)
-		str[0]=0;
-	return 0;
-}
-
-int guild_storage_fromstr(char *str,struct guild_storage *p)
-{
-	int tmp_int[256];
-	int set,next,len,i;
-
-	set=sscanf(str,"%d,%d%n",&tmp_int[0],&tmp_int[1],&next);
-	p->storage_amount=tmp_int[1];
-
-	if(set!=2)
-		return 1;
-	if(str[next]=='\n' || str[next]=='\r')
-		return 0;
-	next++;
-	for(i=0;str[next] && str[next]!='\t';i++){
-	if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-		      &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		      &tmp_int[4], &tmp_int[5], &tmp_int[6],
-		      &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &tmp_int[10], &len) == 12) {
-			p->storage_[i].id = tmp_int[0];
-			p->storage_[i].nameid = tmp_int[1];
-			p->storage_[i].amount = tmp_int[2];
-			p->storage_[i].equip = tmp_int[3];
-			p->storage_[i].identify = tmp_int[4];
-			p->storage_[i].refine = tmp_int[5];
-			p->storage_[i].attribute = tmp_int[6];
-			p->storage_[i].card[0] = tmp_int[7];
-			p->storage_[i].card[1] = tmp_int[8];
-			p->storage_[i].card[2] = tmp_int[9];
-			p->storage_[i].card[3] = tmp_int[10];
-			next += len;
-			if (str[next] == ' ')
-				next++;
-		}
-
-		else if(sscanf(str + next, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d%n",
-		      &tmp_int[0], &tmp_int[1], &tmp_int[2], &tmp_int[3],
-		      &tmp_int[4], &tmp_int[5], &tmp_int[6],
-		      &tmp_int[7], &tmp_int[8], &tmp_int[9], &tmp_int[10], &len) == 11) {
-			p->storage_[i].id = tmp_int[0];
-			p->storage_[i].nameid = tmp_int[1];
-			p->storage_[i].amount = tmp_int[2];
-			p->storage_[i].equip = tmp_int[3];
-			p->storage_[i].identify = tmp_int[4];
-			p->storage_[i].refine = tmp_int[5];
-			p->storage_[i].attribute = tmp_int[6];
-			p->storage_[i].card[0] = tmp_int[7];
-			p->storage_[i].card[1] = tmp_int[8];
-			p->storage_[i].card[2] = tmp_int[9];
-			p->storage_[i].card[3] = tmp_int[10];
-			next += len;
-			if (str[next] == ' ')
-				next++;
-		}
-
-		else return 1;
-	}
-	return 0;
-}
-
-// アカウントから倉庫データインデックスを得る（新規倉庫追加可能）
-struct storage *account2storage(int account_id)
-{
-	struct storage *s;
-	s= (struct storage *) numdb_search(storage_db,account_id);
-	if(s == NULL) {
-		s = (struct storage *) aCalloc(sizeof(struct storage), 1);
-		if(s==NULL){
-			printf("int_storage: out of memory!\n");
-			exit(0);
-		}
-		memset(s,0,sizeof(struct storage));
-		s->account_id=account_id;
-		numdb_insert(storage_db,s->account_id,s);
-	}
-	return s;
-}
-
-struct guild_storage *guild2storage(int guild_id)
-{
-	struct guild_storage *gs = NULL;
-	if(inter_guild_search(guild_id) != NULL) {
-		gs= (struct guild_storage *) numdb_search(guild_storage_db,guild_id);
-		if(gs == NULL) {
-			gs = (struct guild_storage *) aCalloc(sizeof(struct guild_storage), 1);
-			if(gs==NULL){
-				printf("int_storage: out of memory!\n");
-				exit(0);
-			}
-			memset(gs,0,sizeof(struct guild_storage));
-			gs->guild_id=guild_id;
-			numdb_insert(guild_storage_db,gs->guild_id,gs);
-		}
-	}
-	return gs;
-}
-
-//---------------------------------------------------------
-// 倉庫データを読み込む
-int inter_storage_init()
-{
-	char line[65536];
-	int c=0,tmp_int;
-	struct storage *s;
-	struct guild_storage *gs;
-	FILE *fp;
-
-	storage_db = numdb_init();
-
-	fp=fopen(storage_txt,"r");
-	if(fp==NULL){
-		printf("cant't read : %s\n",storage_txt);
-		return 1;
-	}
-	while(fgets(line,65535,fp)){
-		sscanf(line,"%d",&tmp_int);
-		s = (struct storage*)aCalloc(sizeof(struct storage), 1);
-		if(s==NULL){
-			printf("int_storage: out of memory!\n");
-			exit(0);
-		}
-		memset(s,0,sizeof(struct storage));
-		s->account_id=tmp_int;
-		if(s->account_id > 0 && storage_fromstr(line,s) == 0) {
-			numdb_insert(storage_db,s->account_id,s);
-		}
-		else{
-			printf("int_storage: broken data [%s] line %d\n",storage_txt,c);
-			aFree(s);
-		}
-		c++;
-	}
-	fclose(fp);
-
-	c = 0;
-	guild_storage_db = numdb_init();
-
-	fp=fopen(guild_storage_txt,"r");
-	if(fp==NULL){
-		printf("cant't read : %s\n",guild_storage_txt);
-		return 1;
-	}
-	while(fgets(line,65535,fp)){
-		sscanf(line,"%d",&tmp_int);
-		gs = (struct guild_storage*)aCalloc(sizeof(struct guild_storage), 1);
-		if(gs==NULL){
-			printf("int_storage: out of memory!\n");
-			exit(0);
-		}
-		memset(gs,0,sizeof(struct guild_storage));
-		gs->guild_id=tmp_int;
-		if(gs->guild_id > 0 && guild_storage_fromstr(line,gs) == 0) {
-			numdb_insert(guild_storage_db,gs->guild_id,gs);
-		}
-		else{
-			printf("int_storage: broken data [%s] line %d\n",guild_storage_txt,c);
-			aFree(gs);
-		}
-		c++;
-	}
-	fclose(fp);
-
-	return 0;
-}
-
-int storage_db_final (void *k, void *data, va_list ap) {
-	struct storage *p = (struct storage *) data;
-	if (p) aFree(p);
-	return 0;
-}
-int guild_storage_db_final (void *k, void *data, va_list ap) {
-	struct guild_storage *p = (struct guild_storage *) data;
-	if (p) aFree(p);
-	return 0;
-}
-void inter_storage_final() {
-	numdb_final(storage_db, storage_db_final);
-	numdb_final(guild_storage_db, guild_storage_db_final);
-	return;
-}
-
-int inter_storage_save_sub(void *key,void *data,va_list ap)
-{
-	char line[65536];
-	FILE *fp;
-	storage_tostr(line,(struct storage *)data);
-	fp=va_arg(ap,FILE *);
-	if(*line)
-		fprintf(fp,"%s" RETCODE,line);
-	return 0;
-}
-//---------------------------------------------------------
-// 倉庫データを書き込む
-int inter_storage_save()
-{
-	FILE *fp;
-	int lock;
-	if( (fp=lock_fopen(storage_txt,&lock))==NULL ){
-		printf("int_storage: cant write [%s] !!! data is lost !!!\n",storage_txt);
-		return 1;
-	}
-	numdb_foreach(storage_db,inter_storage_save_sub,fp);
-	lock_fclose(fp,storage_txt,&lock);
-//	printf("int_storage: %s saved.\n",storage_txt);
-	return 0;
-}
-
-int inter_guild_storage_save_sub(void *key,void *data,va_list ap)
-{
-	char line[65536];
-	FILE *fp;
-	if(inter_guild_search(((struct guild_storage *)data)->guild_id) != NULL) {
-		guild_storage_tostr(line,(struct guild_storage *)data);
-		fp=va_arg(ap,FILE *);
-		if(*line)
-			fprintf(fp,"%s" RETCODE,line);
-	}
-	return 0;
-}
-//---------------------------------------------------------
-// 倉庫データを書き込む
-int inter_guild_storage_save()
-{
-	FILE *fp;
-	int  lock;
-	if( (fp=lock_fopen(guild_storage_txt,&lock))==NULL ){
-		printf("int_storage: cant write [%s] !!! data is lost !!!\n",guild_storage_txt);
-		return 1;
-	}
-	numdb_foreach(guild_storage_db,inter_guild_storage_save_sub,fp);
-	lock_fclose(fp,guild_storage_txt,&lock);
-//	printf("int_storage: %s saved.\n",guild_storage_txt);
-	return 0;
-}
-
-// 倉庫データ削除
-int inter_storage_delete(int account_id)
-{
-	struct storage *s = (struct storage *) numdb_search(storage_db,account_id);
-	if(s) {
-		int i;
-		for(i=0;i<s->storage_amount;i++){
-			if(s->storage_[i].card[0] == (short)0xff00)
-				inter_pet_delete(*((long *)(&s->storage_[i].card[2])));
-		}
-		numdb_erase(storage_db,account_id);
-		aFree(s);
-	}
-	return 0;
-}
-
-// ギルド倉庫データ削除
-int inter_guild_storage_delete(int guild_id)
-{
-	struct guild_storage *gs = (struct guild_storage *) numdb_search(guild_storage_db,guild_id);
-	if(gs) {
-		int i;
-		for(i=0;i<gs->storage_amount;i++){
-			if(gs->storage_[i].card[0] == (short)0xff00)
-				inter_pet_delete(*((long *)(&gs->storage_[i].card[2])));
-		}
-		numdb_erase(guild_storage_db,guild_id);
-		aFree(gs);
-	}
-	return 0;
-}
-
-//---------------------------------------------------------
-// map serverへの通信
-
-// 倉庫データの送信
-int mapif_load_storage(int fd,int account_id)
-{
-	struct storage *s=account2storage(account_id);
-	WFIFOW(fd,0)=0x3810;
-	WFIFOW(fd,2)=sizeof(struct storage)+8;
-	WFIFOL(fd,4)=account_id;
-	memcpy(WFIFOP(fd,8),s,sizeof(struct storage));
-	WFIFOSET(fd,WFIFOW(fd,2));
-	return 0;
-}
-// 倉庫データ保存完了送信
-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)
-{
-	struct guild_storage *gs=guild2storage(guild_id);
-	WFIFOW(fd,0)=0x3818;
-	if(gs) {
-		WFIFOW(fd,2)=sizeof(struct guild_storage)+12;
-		WFIFOL(fd,4)=account_id;
-		WFIFOL(fd,8)=guild_id;
-		memcpy(WFIFOP(fd,12),gs,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;
-}
-
-//---------------------------------------------------------
-// map serverからの通信
-
-// 倉庫データ要求受信
-int mapif_parse_LoadStorage(int fd)
-{
-	mapif_load_storage(fd,RFIFOL(fd,2));
-	return 0;
-}
-// 倉庫データ受信＆保存
-int mapif_parse_SaveStorage(int fd)
-{
-	struct storage *s;
-	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 {
-		s=account2storage(account_id);
-		memcpy(s,RFIFOP(fd,8),sizeof(struct storage));
-		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)
-{
-	struct guild_storage *gs;
-	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 {
-		gs=guild2storage(guild_id);
-		if(gs) {
-			memcpy(gs,RFIFOP(fd,12),sizeof(struct guild_storage));
-			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;
-}
-
-// map server からの通信
-// ・１パケットのみ解析すること
-// ・パケット長データはinter.cにセットしておくこと
-// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない
-// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない
-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/int_storage.h b/src/char/int_storage.h
deleted file mode 100644
index f228be53d..000000000
--- a/src/char/int_storage.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id: int_storage.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_STORAGE_H_
-#define _INT_STORAGE_H_
-
-int inter_storage_init();
-void inter_storage_final();
-int inter_storage_save();
-int inter_guild_storage_save();
-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[1024];
-extern char guild_storage_txt[1024];
-
-#endif
diff --git a/src/char/inter.c b/src/char/inter.c
deleted file mode 100644
index 0dca38559..000000000
--- a/src/char/inter.c
+++ /dev/null
@@ -1,586 +0,0 @@
-// $Id: inter.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "mmo.h"
-#include "char.h"
-#include "socket.h"
-#include "timer.h"
-#include "db.h"
-#include <string.h>
-#include <stdlib.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)	// Existence time of Wisp/page data (60 seconds)
-                             	// that is the waiting time of answers of all map-servers
-#define WISDELLIST_MAX 256   	// Number of elements of Wisp/page data deletion list
-
-char inter_log_filename[1024] = "log/inter.log";
-
-char accreg_txt[1024] = "save/accreg.txt";
-static struct dbt *accreg_db = NULL;
-
-struct accreg {
-	int account_id, reg_num;
-	struct global_reg reg[ACCOUNT_REG_NUM];
-};
-
-int party_share_level = 10;
-
-
-// 送信パケット長リスト
-int inter_send_packet_length[] = {
-	-1,-1,27,-1, -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,
-};
-// 受信パケット長リスト
-int inter_recv_packet_length[] = {
-	-1,-1, 7,-1, -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[1024];
-};
-static struct dbt * wis_db = NULL;
-static int wis_dellist[WISDELLIST_MAX], wis_delnum;
-
-
-//--------------------------------------------------------
-
-// アカウント変数を文字列へ変換
-int inter_accreg_tostr(char *str, struct accreg *reg) {
-	int j;
-	char *p = str;
-
-	p += sprintf(p, "%d\t", reg->account_id);
-	for(j = 0; j < reg->reg_num; j++) {
-		p += sprintf(p,"%s,%d ", reg->reg[j].str, reg->reg[j].value);
-	}
-
-	return 0;
-}
-
-// アカウント変数を文字列から変換
-int inter_accreg_fromstr(const char *str, struct accreg *reg) {
-	int j, v, n;
-	char buf[128];
-	const char *p = str;
-
-	if (sscanf(p, "%d\t%n", &reg->account_id, &n ) != 1 || reg->account_id <= 0)
-		return 1;
-
-	for(j = 0, p += n; j < ACCOUNT_REG_NUM; j++, p += n) {
-		if (sscanf(p, "%[^,],%d %n", buf, &v, &n) != 2)
-			break;
-		memcpy(reg->reg[j].str, buf, 32);
-		reg->reg[j].value = v;
-	}
-	reg->reg_num = j;
-
-	return 0;
-}
-
-// アカウント変数の読み込み
-int inter_accreg_init() {
-	char line[8192];
-	FILE *fp;
-	int c = 0;
-	struct accreg *reg;
-
-	accreg_db = numdb_init();
-
-	if( (fp = fopen(accreg_txt, "r")) == NULL)
-		return 1;
-	while(fgets(line, sizeof(line)-1, fp)){
-		line[sizeof(line)-1] = '\0';
-
-		reg = (struct accreg*)aCalloc(sizeof(struct accreg), 1);
-		if (reg == NULL) {
-			printf("inter: accreg: out of memory!\n");
-			exit(0);
-		}
-		if (inter_accreg_fromstr(line, reg) == 0 && reg->account_id > 0) {
-			numdb_insert(accreg_db, reg->account_id, reg);
-		} else {
-			printf("inter: accreg: broken data [%s] line %d\n", accreg_txt, c);
-			aFree(reg);
-		}
-		c++;
-	}
-	fclose(fp);
-//	printf("inter: %s read done (%d)\n", accreg_txt, c);
-
-	return 0;
-}
-
-// アカウント変数のセーブ用
-int inter_accreg_save_sub(void *key, void *data, va_list ap) {
-	char line[8192];
-	FILE *fp;
-	struct accreg *reg = (struct accreg *)data;
-
-	if (reg->reg_num > 0) {
-		inter_accreg_tostr(line,reg);
-		fp = va_arg(ap, FILE *);
-		fprintf(fp, "%s" RETCODE, line);
-	}
-
-	return 0;
-}
-
-// アカウント変数のセーブ
-int inter_accreg_save() {
-	FILE *fp;
-	int lock;
-
-	if ((fp = lock_fopen(accreg_txt,&lock)) == NULL) {
-		printf("int_accreg: cant write [%s] !!! data is lost !!!\n", accreg_txt);
-		return 1;
-	}
-	numdb_foreach(accreg_db, inter_accreg_save_sub,fp);
-	lock_fclose(fp, accreg_txt, &lock);
-//	printf("inter: %s saved.\n", accreg_txt);
-
-	return 0;
-}
-
-//--------------------------------------------------------
-
-/*==========================================
- * 設定ファイルを読み込む
- *------------------------------------------
- */
-int inter_config_read(const char *cfgName) {
-	char line[1024], w1[1024], w2[1024];
-	FILE *fp;
-
-	fp = fopen(cfgName, "r");
-	if (fp == NULL) {
-		printf("file not found: %s\n", cfgName);
-		return 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;
-
-		if (strcmpi(w1, "storage_txt") == 0) {
-			strncpy(storage_txt, w2, sizeof(storage_txt));
-		} else if (strcmpi(w1, "party_txt") == 0) {
-			strncpy(party_txt, w2, sizeof(party_txt));
-		} else if (strcmpi(w1, "guild_txt") == 0) {
-			strncpy(guild_txt, w2, sizeof(guild_txt));
-		} else if (strcmpi(w1, "pet_txt") == 0) {
-			strncpy(pet_txt, w2, sizeof(pet_txt));
-		} else if (strcmpi(w1, "castle_txt") == 0) {
-			strncpy(castle_txt, w2, sizeof(castle_txt));
-		} else if (strcmpi(w1, "accreg_txt") == 0) {
-			strncpy(accreg_txt, w2, sizeof(accreg_txt));
-		} else if (strcmpi(w1, "guild_storage_txt") == 0) {
-			strncpy(guild_storage_txt, w2, sizeof(guild_storage_txt));
-		} 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, "inter_log_filename") == 0) {
-			strncpy(inter_log_filename, w2, sizeof(inter_log_filename));
-		} else if (strcmpi(w1, "import") == 0) {
-			inter_config_read(w2);
-		} else if(strcmpi(w1,"log_inter")==0) {
-			log_inter = atoi(w2);
-		}
-	}
-	fclose(fp);
-
-	return 0;
-}
-
-// ログ書き出し
-int inter_log(char *fmt,...) {
-	FILE *logfp;
-	va_list ap;
-
-	va_start(ap,fmt);
-	logfp = fopen(inter_log_filename, "a");
-	if (logfp) {
-		vfprintf(logfp, fmt, ap);
-		fclose(logfp);
-	}
-	va_end(ap);
-
-	return 0;
-}
-
-// セーブ
-int inter_save() {
-	inter_party_save();
-	inter_guild_save();
-	inter_storage_save();
-	inter_guild_storage_save();
-	inter_pet_save();
-	inter_accreg_save();
-
-	return 0;
-}
-
-// 初期化
-int inter_init(const char *file) {
-	inter_config_read(file);
-
-	wis_db = numdb_init();
-
-	inter_party_init();
-	inter_guild_init();
-	inter_storage_init();
-	inter_pet_init();
-	inter_accreg_init();
-
-	return 0;
-}
-
-// finalize
-int accreg_db_final (void *k, void *data, va_list ap) {	
-	struct accreg *p = (struct accreg *) data;
-	if (p) aFree(p);
-	return 0;
-}
-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(accreg_db, accreg_db_final);
-	numdb_final(wis_db, wis_db_final);
-
-	inter_party_final();
-	inter_guild_final();
-	inter_storage_final();
-	inter_pet_final();
-
-	return;
-}
-
-// マップサーバー接続
-int inter_mapif_init(int fd) {
-	inter_guild_mapif_init(fd);
-
-	return 0;
-}
-
-//--------------------------------------------------------
-// sended packets to map-server
-
-// GMメッセージ送信
-int mapif_GMmessage(unsigned char *mes, int len, int sfd) {
-	unsigned char buf[2048];
-
-	WBUFW(buf,0) = 0x3800;
-	WBUFW(buf,2) = len;
-	memcpy(WBUFP(buf,4), mes, len - 4);
-	mapif_sendallwos(sfd, buf, len);
-//	printf("inter server: GM:%d %s\n", len, mes);
-
-	return 0;
-}
-
-// Wisp/page transmission to all map-server
-int mapif_wis_message(struct WisData *wd) {
-	unsigned char buf[2048];
-
-	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;
-}
-
-// Wisp/page transmission result to map-server
-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; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
-	mapif_send(wd->fd, buf, 27);
-//	printf("inter server wis_end: flag: %d\n", flag);
-
-	return 0;
-}
-
-// アカウント変数送信
-int mapif_account_reg(int fd, unsigned char *src) {
-	unsigned char buf[2048];
-
-	memcpy(WBUFP(buf,0),src,WBUFW(src,2));
-	WBUFW(buf, 0) = 0x3804;
-	mapif_sendallwos(fd, buf, WBUFW(buf,2));
-
-	return 0;
-}
-
-// アカウント変数要求返信
-int mapif_account_reg_reply(int fd,int account_id) {
-	struct accreg *reg = (struct accreg*)numdb_search(accreg_db,account_id);
-
-	WFIFOW(fd,0) = 0x3804;
-	WFIFOL(fd,4) = account_id;
-	if (reg == NULL) {
-		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;
-}
-
-//--------------------------------------------------------
-
-// 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;
-}
-
-//--------------------------------------------------------
-// received packets from map-server
-
-// GMメッセージ送信
-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;
-	int index;
-
-	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;
-	}
-
-	// search if character exists before to ask all map-servers
-	if ((index = search_character_index((char*)RFIFOP(fd,28))) == -1) {
-		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), search_character_name(index), 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 {
-
-			wd = (struct WisData *)aCalloc(sizeof(struct WisData), 1);
-			if (wd == NULL){
-				printf("inter: WisRequest: out of memory !\n");
-				return 0;
-			}
-
-			// 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);
-		}
-	}
-
-	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;
-}
-
-// Received wisp message from map-server for ALL gm (just copy the message and resends it to ALL map-servers)
-int mapif_parse_WisToGM(int fd) {
-	unsigned char buf[2048]; // 0x3003/0x3803 <packet_len>.w <wispname>.24B <min_gm_level>.w <message>.?B
-
-	memcpy(WBUFP(buf,0), RFIFOP(fd,0), RFIFOW(fd,2));
-	WBUFW(buf, 0) = 0x3803;
-	mapif_sendall(buf, RFIFOW(fd,2));
-
-	return 0;
-}
-
-// アカウント変数保存要求
-int mapif_parse_AccReg(int fd) {
-	int j, p;
-	struct accreg *reg = (struct accreg*)numdb_search(accreg_db, RFIFOL(fd,4));
-
-	if (reg == NULL) {
-		if ((reg = (struct accreg*)aCalloc(sizeof(struct accreg), 1)) == NULL) {
-			printf("inter: accreg: out of memory !\n");
-			exit(0);
-		}
-		reg->account_id = RFIFOL(fd,4);
-		numdb_insert(accreg_db, RFIFOL(fd,4), reg);
-	}
-
-	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;
-
-	mapif_account_reg(fd, RFIFOP(fd,0));	// 他のMAPサーバーに送信
-
-	return 0;
-}
-
-// アカウント変数送信要求
-int mapif_parse_AccRegRequest(int fd) {
-//	printf("mapif: accreg request\n");
-	return mapif_account_reg_reply(fd, RFIFOL(fd,2));
-}
-
-//--------------------------------------------------------
-
-// map server からの通信（１パケットのみ解析すること）
-// エラーなら0(false)、処理できたなら1、
-// パケット長が足りなければ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 0x3003: mapif_parse_WisToGM(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のパケット長確認
-// 必要パケット長があればパケット長、まだ足りなければ0
-int inter_check_length(int fd, int length) {
-	if (length == -1) {	// 可変パケット長
-		if (RFIFOREST(fd) < 4)	// パケット長が未着
-			return 0;
-		length = RFIFOW(fd,2);
-	}
-
-	if (RFIFOREST(fd) < length)	// パケットが未着
-		return 0;
-
-	return length;
-}
-
diff --git a/src/char/inter.h b/src/char/inter.h
deleted file mode 100644
index 636ce31d8..000000000
--- a/src/char/inter.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id: inter.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INTER_H_
-#define _INTER_H_
-
-int inter_init(const char *file);
-void inter_final();
-int inter_save();
-int inter_parse_frommap(int fd);
-int inter_mapif_init(int fd);
-
-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];
-extern int log_inter;
-
-#endif