Added mercenary interface

12 files changed, 3034 insertions, 2977 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 018098928..d8ca2389f 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3598,8 +3598,8 @@ ACMD(reloadmobdb) {
 	mob_reload();
 	read_petdb();
 	homun->reload();
-	read_mercenarydb();
-	read_mercenary_skilldb();
+	mercenary->read_mercenarydb();
+	mercenary->read_skilldb();
 	elemental->reload_elementaldb();
 	clif->message(fd, msg_txt(98)); // Monster database has been reloaded.
 	
@@ -3615,7 +3615,7 @@ ACMD(reloadskilldb)
 	skill->reload();
 	homun->reload_skill();
 	elemental->reload_skilldb();
-	read_mercenary_skilldb();
+	mercenary->read_skilldb();
 	clif->message(fd, msg_txt(99)); // Skill database has been reloaded.
 	
 	return true;
diff --git a/src/map/chrif.c b/src/map/chrif.c
index d1ee8b5b1..d44ccf721 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -312,8 +312,8 @@ int chrif_save(struct map_session_data *sd, int flag) {
 		intif->save_petdata(sd->status.account_id,&sd->pd->pet);
 	if( sd->hd && homun_alive(sd->hd) )
 		homun->save(sd->hd);
-	if( sd->md && mercenary_get_lifetime(sd->md) > 0 )
-		mercenary_save(sd->md);
+	if( sd->md && mercenary->get_lifetime(sd->md) > 0 )
+		mercenary->save(sd->md);
 	if( sd->ed && elemental->get_lifetime(sd->ed) > 0 )
 		elemental->save(sd->ed);	
 	if( sd->save_quest )
diff --git a/src/map/clif.c b/src/map/clif.c
index f5ce8ede3..446adda28 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7197,7 +7197,7 @@ void clif_devotion(struct block_list *src, struct map_session_data *tsd)
 		if( md && md->master && md->devotion_flag )
 			WBUFL(buf,6) = md->master->bl.id;
 
-		WBUFW(buf,26) = skill->get_range2(src, ML_DEVOTION, mercenary_checkskill(md, ML_DEVOTION));
+		WBUFW(buf,26) = skill->get_range2(src, ML_DEVOTION, mercenary->checkskill(md, ML_DEVOTION));
 	}
 	else
 	{
@@ -11289,7 +11289,7 @@ void clif_parse_UseSkillToId_mercenary(struct mercenary_data *md, struct map_ses
 	} else if( DIFF_TICK(tick, md->ud.canact_tick) < 0 )
 		return;
 
-	lv = mercenary_checkskill(md, skill_id);
+	lv = mercenary->checkskill(md, skill_id);
 	if( skill_lv > lv )
 		skill_lv = lv;
 	if( skill_lv )
@@ -11312,7 +11312,7 @@ void clif_parse_UseSkillToPos_mercenary(struct mercenary_data *md, struct map_se
 
 	if( md->sc.data[SC_BASILICA] )
 		return;
-	lv = mercenary_checkskill(md, skill_id);
+	lv = mercenary->checkskill(md, skill_id);
 	if( skill_lv > lv )
 		skill_lv = lv;
 	if( skill_lv )
@@ -15677,7 +15677,7 @@ void clif_mercenary_updatestatus(struct map_session_data *sd, int type)
 			WFIFOL(fd,4) = md->mercenary.kill_count;
 			break;
 		case SP_MERCFAITH:
-			WFIFOL(fd,4) = mercenary_get_faith(md);
+			WFIFOL(fd,4) = mercenary->get_faith(md);
 			break;
 	}
 	WFIFOSET(fd,packet_len(0x2a2));
@@ -15721,9 +15721,9 @@ void clif_mercenary_info(struct map_session_data *sd)
 	WFIFOL(fd,52) = status->max_hp;
 	WFIFOL(fd,56) = status->sp;
 	WFIFOL(fd,60) = status->max_sp;
-	WFIFOL(fd,64) = (int)time(NULL) + (mercenary_get_lifetime(md) / 1000);
-	WFIFOW(fd,68) = mercenary_get_faith(md);
-	WFIFOL(fd,70) = mercenary_get_calls(md);
+	WFIFOL(fd,64) = (int)time(NULL) + (mercenary->get_lifetime(md) / 1000);
+	WFIFOW(fd,68) = mercenary->get_faith(md);
+	WFIFOL(fd,70) = mercenary->get_calls(md);
 	WFIFOL(fd,74) = md->mercenary.kill_count;
 	WFIFOW(fd,78) = md->battle_status.rhw.range;
 	WFIFOSET(fd,packet_len(0x29b));
@@ -15773,7 +15773,7 @@ void clif_parse_mercenary_action(int fd, struct map_session_data* sd)
 	if( sd->md == NULL )
 		return;
 
-	if( option == 2 ) merc_delete(sd->md, 2);
+	if( option == 2 ) mercenary->merc_delete(sd->md, 2);
 }
 
 
diff --git a/src/map/intif.c b/src/map/intif.c
index 813c1cf7c..4d75dcbb7 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1,2351 +1,2352 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL

-// For more information, see LICENCE in the main folder

-

-#include "../common/showmsg.h"

-#include "../common/socket.h"

-#include "../common/timer.h"

-#include "../common/nullpo.h"

-#include "../common/malloc.h"

-#include "../common/strlib.h"

-#include "map.h"

-#include "battle.h"

-#include "chrif.h"

-#include "clif.h"

-#include "pc.h"

-#include "intif.h"

-#include "log.h"

-#include "storage.h"

-#include "party.h"

-#include "guild.h"

-#include "pet.h"

-#include "atcommand.h"

-#include "mercenary.h"

-#include "homunculus.h"

-#include "elemental.h"

-#include "mail.h"

-#include "quest.h"

-

-#include <sys/types.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <signal.h>

-#include <fcntl.h>

-#include <string.h>

-

-

-static const int packet_len_table[]={

-	-1,-1,27,-1, -1, 0,37,-1,  0, 0, 0, 0,  0, 0,  0, 0, //0x3800-0x380f

-	 0, 0, 0, 0,  0, 0, 0, 0, -1,11, 0, 0,  0, 0,  0, 0, //0x3810

-	39,-1,15,15, 14,19, 7,-1,  0, 0, 0, 0,  0, 0,  0, 0, //0x3820

-	10,-1,15, 0, 79,19, 7,-1,  0,-1,-1,-1, 14,67,186,-1, //0x3830

-	-1, 0, 0,14,  0, 0, 0, 0, -1,74,-1,11, 11,-1,  0, 0, //0x3840

-	-1,-1, 7, 7,  7,11, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3850  Auctions [Zephyrus]

-	-1, 7, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3860  Quests [Kevin] [Inkfish]

-	-1, 3, 3, 0,  0, 0, 0, 0,  0, 0, 0, 0, -1, 3,  3, 0, //0x3870  Mercenaries [Zephyrus] / Elemental [pakpil]

-	11,-1, 7, 3,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3880

-	-1,-1, 7, 3,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3890  Homunculus [albator]

-};

-

-extern int char_fd; // inter server Fd used for char_fd

-#define inter_fd char_fd	// alias

-

-//-----------------------------------------------------------------

-// Send to inter server

-

-int CheckForCharServer(void)

-{

-	return ((char_fd <= 0) || session[char_fd] == NULL || session[char_fd]->wdata == NULL);

-}

-

-// pet

-int intif_create_pet(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)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, 24 + NAME_LENGTH);

-	WFIFOW(inter_fd,0) = 0x3080;

-	WFIFOL(inter_fd,2) = account_id;

-	WFIFOL(inter_fd,6) = char_id;

-	WFIFOW(inter_fd,10) = pet_class;

-	WFIFOW(inter_fd,12) = pet_lv;

-	WFIFOW(inter_fd,14) = pet_egg_id;

-	WFIFOW(inter_fd,16) = pet_equip;

-	WFIFOW(inter_fd,18) = intimate;

-	WFIFOW(inter_fd,20) = hungry;

-	WFIFOB(inter_fd,22) = rename_flag;

-	WFIFOB(inter_fd,23) = incuvate;

-	memcpy(WFIFOP(inter_fd,24),pet_name,NAME_LENGTH);

-	WFIFOSET(inter_fd,24+NAME_LENGTH);

-

-	return 0;

-}

-

-int intif_request_petdata(int account_id,int char_id,int pet_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, 14);

-	WFIFOW(inter_fd,0) = 0x3081;

-	WFIFOL(inter_fd,2) = account_id;

-	WFIFOL(inter_fd,6) = char_id;

-	WFIFOL(inter_fd,10) = pet_id;

-	WFIFOSET(inter_fd,14);

-

-	return 0;

-}

-

-int intif_save_petdata(int account_id,struct s_pet *p)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, sizeof(struct s_pet) + 8);

-	WFIFOW(inter_fd,0) = 0x3082;

-	WFIFOW(inter_fd,2) = sizeof(struct s_pet) + 8;

-	WFIFOL(inter_fd,4) = account_id;

-	memcpy(WFIFOP(inter_fd,8),p,sizeof(struct s_pet));

-	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));

-

-	return 0;

-}

-

-int intif_delete_petdata(int pet_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,6);

-	WFIFOW(inter_fd,0) = 0x3083;

-	WFIFOL(inter_fd,2) = pet_id;

-	WFIFOSET(inter_fd,6);

-

-	return 1;

-}

-

-int intif_rename(struct map_session_data *sd, int type, char *name)

-{

-	if (intif->CheckForCharServer())

-		return 1;

-

-	WFIFOHEAD(inter_fd,NAME_LENGTH+12);

-	WFIFOW(inter_fd,0) = 0x3006;

-	WFIFOL(inter_fd,2) = sd->status.account_id;

-	WFIFOL(inter_fd,6) = sd->status.char_id;

-	WFIFOB(inter_fd,10) = type;  //Type: 0 - PC, 1 - PET, 2 - HOM

-	memcpy(WFIFOP(inter_fd,11),name, NAME_LENGTH);

-	WFIFOSET(inter_fd,NAME_LENGTH+12);

-	return 0;

-}

-

-// GM Send a message

-int intif_broadcast(const char* mes, int len, int type)

-{

-	int lp = type ? 4 : 0;

-

-	// Send to the local players

-	clif->broadcast(NULL, mes, len, type, ALL_CLIENT);

-

-	if (intif->CheckForCharServer())

-		return 0;

-

-	if (chrif->other_mapserver_count < 1)

-		return 0; //No need to send.

-

-	WFIFOHEAD(inter_fd, 16 + lp + len);

-	WFIFOW(inter_fd,0)  = 0x3000;

-	WFIFOW(inter_fd,2)  = 16 + lp + len;

-	WFIFOL(inter_fd,4)  = 0xFF000000; // 0xFF000000 color signals standard broadcast

-	WFIFOW(inter_fd,8)  = 0; // fontType not used with standard broadcast

-	WFIFOW(inter_fd,10) = 0; // fontSize not used with standard broadcast

-	WFIFOW(inter_fd,12) = 0; // fontAlign not used with standard broadcast

-	WFIFOW(inter_fd,14) = 0; // fontY not used with standard broadcast

-	if (type == 0x10) // bc_blue

-		WFIFOL(inter_fd,16) = 0x65756c62; //If there's "blue" at the beginning of the message, game client will display it in blue instead of yellow.

-	else if (type == 0x20) // bc_woe

-		WFIFOL(inter_fd,16) = 0x73737373; //If there's "ssss", game client will recognize message as 'WoE broadcast'.

-	memcpy(WFIFOP(inter_fd,16 + lp), mes, len);

-	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));

-	return 0;

-}

-

-int intif_broadcast2(const char* mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY)

-{

-	// Send to the local players

-	clif->broadcast2(NULL, mes, len, fontColor, fontType, fontSize, fontAlign, fontY, ALL_CLIENT);

-

-	if (intif->CheckForCharServer())

-		return 0;

-

-	if (chrif->other_mapserver_count < 1)

-		return 0; //No need to send.

-

-	WFIFOHEAD(inter_fd, 16 + len);

-	WFIFOW(inter_fd,0)  = 0x3000;

-	WFIFOW(inter_fd,2)  = 16 + len;

-	WFIFOL(inter_fd,4)  = fontColor;

-	WFIFOW(inter_fd,8)  = fontType;

-	WFIFOW(inter_fd,10) = fontSize;

-	WFIFOW(inter_fd,12) = fontAlign;

-	WFIFOW(inter_fd,14) = fontY;

-	memcpy(WFIFOP(inter_fd,16), mes, len);

-	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));

-	return 0;

-}

-

-/// send a message using the main chat system

-/// <sd>         the source of message

-/// <message>    the message that was sent

-int intif_main_message(struct map_session_data* sd, const char* message)

-{

-	char output[256];

-

-	nullpo_ret(sd);

-

-	// format the message for main broadcasting

-	snprintf( output, sizeof(output), msg_txt(386), sd->status.name, message );

-

-	// send the message using the inter-server broadcast service

-	intif_broadcast2( output, strlen(output) + 1, 0xFE000000, 0, 0, 0, 0 );

-

-	// log the chat message

-	logs->chat( LOG_CHAT_MAINCHAT, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message );

-

-	return 0;

-}

-

-// The transmission of Wisp/Page to inter-server (player not found on this server)

-int intif_wis_message(struct map_session_data *sd, char *nick, char *mes, int mes_len)

-{

-	nullpo_ret(sd);

-	if (intif->CheckForCharServer())

-		return 0;

-

-	if (chrif->other_mapserver_count < 1)

-	{	//Character not found.

-		clif->wis_end(sd->fd, 1);

-		return 0;

-	}

-

-	WFIFOHEAD(inter_fd,mes_len + 52);

-	WFIFOW(inter_fd,0) = 0x3001;

-	WFIFOW(inter_fd,2) = mes_len + 52;

-	memcpy(WFIFOP(inter_fd,4), sd->status.name, NAME_LENGTH);

-	memcpy(WFIFOP(inter_fd,4+NAME_LENGTH), nick, NAME_LENGTH);

-	memcpy(WFIFOP(inter_fd,4+2*NAME_LENGTH), mes, mes_len);

-	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));

-

-	if (battle_config.etc_log)

-		ShowInfo("intif_wis_message from %s to %s (message: '%s')\n", sd->status.name, nick, mes);

-

-	return 0;

-}

-

-// The reply of Wisp/page

-int intif_wis_replay(int id, int flag)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,7);

-	WFIFOW(inter_fd,0) = 0x3002;

-	WFIFOL(inter_fd,2) = id;

-	WFIFOB(inter_fd,6) = flag; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target

-	WFIFOSET(inter_fd,7);

-

-	if (battle_config.etc_log)

-		ShowInfo("intif_wis_replay: id: %d, flag:%d\n", id, flag);

-

-	return 0;

-}

-

-// The transmission of GM only Wisp/Page from server to inter-server

-int intif_wis_message_to_gm(char *wisp_name, int permission, char *mes)

-{

-	int mes_len;

-	if (intif->CheckForCharServer())

-		return 0;

-	mes_len = strlen(mes) + 1; // + null

-	WFIFOHEAD(inter_fd, mes_len + 32);

-	WFIFOW(inter_fd,0) = 0x3003;

-	WFIFOW(inter_fd,2) = mes_len + 32;

-	memcpy(WFIFOP(inter_fd,4), wisp_name, NAME_LENGTH);

-	WFIFOL(inter_fd,4+NAME_LENGTH) = permission;

-	memcpy(WFIFOP(inter_fd,8+NAME_LENGTH), mes, mes_len);

-	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));

-

-	if (battle_config.etc_log)

-		ShowNotice("intif_wis_message_to_gm: from: '%s', required permission: %d, message: '%s'.\n", wisp_name, permission, mes);

-

-	return 0;

-}

-

-int intif_regtostr(char* str, struct global_reg *reg, int qty)

-{

-	int len =0, i;

-

-	for (i = 0; i < qty; i++) {

-		len+= sprintf(str+len, "%s", reg[i].str)+1; //We add 1 to consider the '\0' in place.

-		len+= sprintf(str+len, "%s", reg[i].value)+1;

-	}

-	return len;

-}

-

-//Request for saving registry values.

-int intif_saveregistry(struct map_session_data *sd, int type)

-{

-	struct global_reg *reg;

-	int count;

-	int i, p;

-

-	if (intif->CheckForCharServer())

-		return -1;

-

-	switch (type) {

-	case 3: //Character reg

-		reg = sd->save_reg.global;

-		count = sd->save_reg.global_num;

-		sd->state.reg_dirty &= ~0x4;

-	break;

-	case 2: //Account reg

-		reg = sd->save_reg.account;

-		count = sd->save_reg.account_num;

-		sd->state.reg_dirty &= ~0x2;

-	break;

-	case 1: //Account2 reg

-		reg = sd->save_reg.account2;

-		count = sd->save_reg.account2_num;

-		sd->state.reg_dirty &= ~0x1;

-	break;

-	default: //Broken code?

-		ShowError("intif_saveregistry: Invalid type %d\n", type);

-		return -1;

-	}

-	WFIFOHEAD(inter_fd, 288 * MAX_REG_NUM+13);

-	WFIFOW(inter_fd,0)=0x3004;

-	WFIFOL(inter_fd,4)=sd->status.account_id;

-	WFIFOL(inter_fd,8)=sd->status.char_id;

-	WFIFOB(inter_fd,12)=type;

-	for( p = 13, i = 0; i < count; i++ ) {

-		if (reg[i].str[0] != '\0' && reg[i].value[0] != '\0') {

-			p+= sprintf((char*)WFIFOP(inter_fd,p), "%s", reg[i].str)+1; //We add 1 to consider the '\0' in place.

-			p+= sprintf((char*)WFIFOP(inter_fd,p), "%s", reg[i].value)+1;

-		}

-	}

-	WFIFOW(inter_fd,2)=p;

-	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));

-	return 0;

-}

-

-//Request the registries for this player.

-int intif_request_registry(struct map_session_data *sd, int flag)

-{

-	nullpo_ret(sd);

-

-	sd->save_reg.account2_num = -1;

-	sd->save_reg.account_num = -1;

-	sd->save_reg.global_num = -1;

-

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,6);

-	WFIFOW(inter_fd,0) = 0x3005;

-	WFIFOL(inter_fd,2) = sd->status.account_id;

-	WFIFOL(inter_fd,6) = sd->status.char_id;

-	WFIFOB(inter_fd,10) = (flag&1?1:0); //Request Acc Reg 2

-	WFIFOB(inter_fd,11) = (flag&2?1:0); //Request Acc Reg

-	WFIFOB(inter_fd,12) = (flag&4?1:0); //Request Char Reg

-	WFIFOSET(inter_fd,13);

-

-	return 0;

-}

-

-int intif_request_guild_storage(int account_id,int guild_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x3018;

-	WFIFOL(inter_fd,2) = account_id;

-	WFIFOL(inter_fd,6) = guild_id;

-	WFIFOSET(inter_fd,10);

-	return 0;

-}

-int intif_send_guild_storage(int account_id,struct guild_storage *gstor)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,sizeof(struct guild_storage)+12);

-	WFIFOW(inter_fd,0) = 0x3019;

-	WFIFOW(inter_fd,2) = (unsigned short)sizeof(struct guild_storage)+12;

-	WFIFOL(inter_fd,4) = account_id;

-	WFIFOL(inter_fd,8) = gstor->guild_id;

-	memcpy( WFIFOP(inter_fd,12),gstor, sizeof(struct guild_storage) );

-	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));

-	return 0;

-}

-

-// Party creation request

-int intif_create_party(struct party_member *member,char *name,int item,int item2)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	nullpo_ret(member);

-

-	WFIFOHEAD(inter_fd,64);

-	WFIFOW(inter_fd,0) = 0x3020;

-	WFIFOW(inter_fd,2) = 30+sizeof(struct party_member);

-	memcpy(WFIFOP(inter_fd,4),name, NAME_LENGTH);

-	WFIFOB(inter_fd,28)= item;

-	WFIFOB(inter_fd,29)= item2;

-	memcpy(WFIFOP(inter_fd,30), member, sizeof(struct party_member));

-	WFIFOSET(inter_fd,WFIFOW(inter_fd, 2));

-	return 0;

-}

-

-// Party information request

-int intif_request_partyinfo(int party_id, int char_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x3021;

-	WFIFOL(inter_fd,2) = party_id;

-	WFIFOL(inter_fd,6) = char_id;

-	WFIFOSET(inter_fd,10);

-	return 0;

-}

-

-// Request to add a member to party

-int intif_party_addmember(int party_id,struct party_member *member)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,42);

-	WFIFOW(inter_fd,0)=0x3022;

-	WFIFOW(inter_fd,2)=8+sizeof(struct party_member);

-	WFIFOL(inter_fd,4)=party_id;

-	memcpy(WFIFOP(inter_fd,8),member,sizeof(struct party_member));

-	WFIFOSET(inter_fd,WFIFOW(inter_fd, 2));

-	return 1;

-}

-

-// Request to change party configuration (exp,item share)

-int intif_party_changeoption(int party_id,int account_id,int exp,int item)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,14);

-	WFIFOW(inter_fd,0)=0x3023;

-	WFIFOL(inter_fd,2)=party_id;

-	WFIFOL(inter_fd,6)=account_id;

-	WFIFOW(inter_fd,10)=exp;

-	WFIFOW(inter_fd,12)=item;

-	WFIFOSET(inter_fd,14);

-	return 0;

-}

-

-// Request to leave party

-int intif_party_leave(int party_id,int account_id, int char_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,14);

-	WFIFOW(inter_fd,0)=0x3024;

-	WFIFOL(inter_fd,2)=party_id;

-	WFIFOL(inter_fd,6)=account_id;

-	WFIFOL(inter_fd,10)=char_id;

-	WFIFOSET(inter_fd,14);

-	return 0;

-}

-

-// Request keeping party for new map ??

-int intif_party_changemap(struct map_session_data *sd,int online)

-{

-	int16 m, mapindex;

-

-	if (intif->CheckForCharServer())

-		return 0;

-	if(!sd)

-		return 0;

-

-	if( (m=iMap->mapindex2mapid(sd->mapindex)) >= 0 && map[m].instance_id >= 0 )

-		mapindex = map[map[m].instance_src_map].index;

-	else

-		mapindex = sd->mapindex;

-

-	WFIFOHEAD(inter_fd,19);

-	WFIFOW(inter_fd,0)=0x3025;

-	WFIFOL(inter_fd,2)=sd->status.party_id;

-	WFIFOL(inter_fd,6)=sd->status.account_id;

-	WFIFOL(inter_fd,10)=sd->status.char_id;

-	WFIFOW(inter_fd,14)=mapindex;

-	WFIFOB(inter_fd,16)=online;

-	WFIFOW(inter_fd,17)=sd->status.base_level;

-	WFIFOSET(inter_fd,19);

-	return 1;

-}

-

-// Request breaking party

-int intif_break_party(int party_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,6);

-	WFIFOW(inter_fd,0)=0x3026;

-	WFIFOL(inter_fd,2)=party_id;

-	WFIFOSET(inter_fd,6);

-	return 0;

-}

-

-// Sending party chat

-int intif_party_message(int party_id,int account_id,const char *mes,int len)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	if (chrif->other_mapserver_count < 1)

-		return 0; //No need to send.

-

-	WFIFOHEAD(inter_fd,len + 12);

-	WFIFOW(inter_fd,0)=0x3027;

-	WFIFOW(inter_fd,2)=len+12;

-	WFIFOL(inter_fd,4)=party_id;

-	WFIFOL(inter_fd,8)=account_id;

-	memcpy(WFIFOP(inter_fd,12),mes,len);

-	WFIFOSET(inter_fd,len+12);

-	return 0;

-}

-

-// Request a new leader for party

-int intif_party_leaderchange(int party_id,int account_id,int char_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,14);

-	WFIFOW(inter_fd,0)=0x3029;

-	WFIFOL(inter_fd,2)=party_id;

-	WFIFOL(inter_fd,6)=account_id;

-	WFIFOL(inter_fd,10)=char_id;

-	WFIFOSET(inter_fd,14);

-	return 0;

-}

-

-// Request a Guild creation

-int intif_guild_create(const char *name,const struct guild_member *master)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	nullpo_ret(master);

-

-	WFIFOHEAD(inter_fd,sizeof(struct guild_member)+(8+NAME_LENGTH));

-	WFIFOW(inter_fd,0)=0x3030;

-	WFIFOW(inter_fd,2)=sizeof(struct guild_member)+(8+NAME_LENGTH);

-	WFIFOL(inter_fd,4)=master->account_id;

-	memcpy(WFIFOP(inter_fd,8),name,NAME_LENGTH);

-	memcpy(WFIFOP(inter_fd,8+NAME_LENGTH),master,sizeof(struct guild_member));

-	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));

-	return 0;

-}

-

-// Request Guild information

-int intif_guild_request_info(int guild_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,6);

-	WFIFOW(inter_fd,0) = 0x3031;

-	WFIFOL(inter_fd,2) = guild_id;

-	WFIFOSET(inter_fd,6);

-	return 0;

-}

-

-// Request to add member to the guild

-int intif_guild_addmember(int guild_id,struct guild_member *m)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,sizeof(struct guild_member)+8);

-	WFIFOW(inter_fd,0) = 0x3032;

-	WFIFOW(inter_fd,2) = sizeof(struct guild_member)+8;

-	WFIFOL(inter_fd,4) = guild_id;

-	memcpy(WFIFOP(inter_fd,8),m,sizeof(struct guild_member));

-	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));

-	return 0;

-}

-

-// Request a new leader for guild

-int intif_guild_change_gm(int guild_id, const char* name, int len)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, len + 8);

-	WFIFOW(inter_fd, 0)=0x3033;

-	WFIFOW(inter_fd, 2)=len+8;

-	WFIFOL(inter_fd, 4)=guild_id;

-	memcpy(WFIFOP(inter_fd,8),name,len);

-	WFIFOSET(inter_fd,len+8);

-	return 0;

-}

-

-// Request to leave guild

-int intif_guild_leave(int guild_id,int account_id,int char_id,int flag,const char *mes)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, 55);

-	WFIFOW(inter_fd, 0) = 0x3034;

-	WFIFOL(inter_fd, 2) = guild_id;

-	WFIFOL(inter_fd, 6) = account_id;

-	WFIFOL(inter_fd,10) = char_id;

-	WFIFOB(inter_fd,14) = flag;

-	safestrncpy((char*)WFIFOP(inter_fd,15),mes,40);

-	WFIFOSET(inter_fd,55);

-	return 0;

-}

-

-//Update request / Lv online status of the guild members

-int intif_guild_memberinfoshort(int guild_id,int account_id,int char_id,int online,int lv,int class_)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, 19);

-	WFIFOW(inter_fd, 0) = 0x3035;

-	WFIFOL(inter_fd, 2) = guild_id;

-	WFIFOL(inter_fd, 6) = account_id;

-	WFIFOL(inter_fd,10) = char_id;

-	WFIFOB(inter_fd,14) = online;

-	WFIFOW(inter_fd,15) = lv;

-	WFIFOW(inter_fd,17) = class_;

-	WFIFOSET(inter_fd,19);

-	return 0;

-}

-

-//Guild disbanded notification

-int intif_guild_break(int guild_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, 6);

-	WFIFOW(inter_fd, 0) = 0x3036;

-	WFIFOL(inter_fd, 2) = guild_id;

-	WFIFOSET(inter_fd,6);

-	return 0;

-}

-

-// Send a guild message

-int intif_guild_message(int guild_id,int account_id,const char *mes,int len)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	if (chrif->other_mapserver_count < 1)

-		return 0; //No need to send.

-

-	WFIFOHEAD(inter_fd, len + 12);

-	WFIFOW(inter_fd,0)=0x3037;

-	WFIFOW(inter_fd,2)=len+12;

-	WFIFOL(inter_fd,4)=guild_id;

-	WFIFOL(inter_fd,8)=account_id;

-	memcpy(WFIFOP(inter_fd,12),mes,len);

-	WFIFOSET(inter_fd,len+12);

-

-	return 0;

-}

-

-// Request a change of Guild basic information

-int intif_guild_change_basicinfo(int guild_id,int type,const void *data,int len)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, len + 10);

-	WFIFOW(inter_fd,0)=0x3039;

-	WFIFOW(inter_fd,2)=len+10;

-	WFIFOL(inter_fd,4)=guild_id;

-	WFIFOW(inter_fd,8)=type;

-	memcpy(WFIFOP(inter_fd,10),data,len);

-	WFIFOSET(inter_fd,len+10);

-	return 0;

-}

-

-// Request a change of Guild member information

-int intif_guild_change_memberinfo(int guild_id,int account_id,int char_id,

-	int type,const void *data,int len)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, len + 18);

-	WFIFOW(inter_fd, 0)=0x303a;

-	WFIFOW(inter_fd, 2)=len+18;

-	WFIFOL(inter_fd, 4)=guild_id;

-	WFIFOL(inter_fd, 8)=account_id;

-	WFIFOL(inter_fd,12)=char_id;

-	WFIFOW(inter_fd,16)=type;

-	memcpy(WFIFOP(inter_fd,18),data,len);

-	WFIFOSET(inter_fd,len+18);

-	return 0;

-}

-

-// Request a change of Guild title

-int intif_guild_position(int guild_id,int idx,struct guild_position *p)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, sizeof(struct guild_position)+12);

-	WFIFOW(inter_fd,0)=0x303b;

-	WFIFOW(inter_fd,2)=sizeof(struct guild_position)+12;

-	WFIFOL(inter_fd,4)=guild_id;

-	WFIFOL(inter_fd,8)=idx;

-	memcpy(WFIFOP(inter_fd,12),p,sizeof(struct guild_position));

-	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));

-	return 0;

-}

-

-// Request an update of Guildskill skill_id

-int intif_guild_skillup(int guild_id, uint16 skill_id, int account_id, int max)

-{

-	if( intif->CheckForCharServer() )

-		return 0;

-	WFIFOHEAD(inter_fd, 18);

-	WFIFOW(inter_fd, 0)  = 0x303c;

-	WFIFOL(inter_fd, 2)  = guild_id;

-	WFIFOL(inter_fd, 6)  = skill_id;

-	WFIFOL(inter_fd, 10) = account_id;

-	WFIFOL(inter_fd, 14) = max;

-	WFIFOSET(inter_fd, 18);

-	return 0;

-}

-

-// Request a new guild relationship

-int intif_guild_alliance(int guild_id1,int guild_id2,int account_id1,int account_id2,int flag)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,19);

-	WFIFOW(inter_fd, 0)=0x303d;

-	WFIFOL(inter_fd, 2)=guild_id1;

-	WFIFOL(inter_fd, 6)=guild_id2;

-	WFIFOL(inter_fd,10)=account_id1;

-	WFIFOL(inter_fd,14)=account_id2;

-	WFIFOB(inter_fd,18)=flag;

-	WFIFOSET(inter_fd,19);

-	return 0;

-}

-

-// Request to change guild notice

-int intif_guild_notice(int guild_id,const char *mes1,const char *mes2)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,186);

-	WFIFOW(inter_fd,0)=0x303e;

-	WFIFOL(inter_fd,2)=guild_id;

-	memcpy(WFIFOP(inter_fd,6),mes1,MAX_GUILDMES1);

-	memcpy(WFIFOP(inter_fd,66),mes2,MAX_GUILDMES2);

-	WFIFOSET(inter_fd,186);

-	return 0;

-}

-

-// Request to change guild emblem

-int intif_guild_emblem(int guild_id,int len,const char *data)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	if(guild_id<=0 || len<0 || len>2000)

-		return 0;

-	WFIFOHEAD(inter_fd,len + 12);

-	WFIFOW(inter_fd,0)=0x303f;

-	WFIFOW(inter_fd,2)=len+12;

-	WFIFOL(inter_fd,4)=guild_id;

-	WFIFOL(inter_fd,8)=0;

-	memcpy(WFIFOP(inter_fd,12),data,len);

-	WFIFOSET(inter_fd,len+12);

-	return 0;

-}

-

-/**

- * Requests guild castles data from char-server.

- * @param num Number of castles, size of castle_ids array.

- * @param castle_ids Pointer to array of castle IDs.

- */

-int intif_guild_castle_dataload(int num, int *castle_ids)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, 4 + num * sizeof(int));

-	WFIFOW(inter_fd, 0) = 0x3040;

-	WFIFOW(inter_fd, 2) = 4 + num * sizeof(int);

-	memcpy(WFIFOP(inter_fd, 4), castle_ids, num * sizeof(int));

-	WFIFOSET(inter_fd, WFIFOW(inter_fd, 2));

-	return 1;

-}

-

-

-// Request change castle guild owner and save data

-int intif_guild_castle_datasave(int castle_id,int index, int value)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd,9);

-	WFIFOW(inter_fd,0)=0x3041;

-	WFIFOW(inter_fd,2)=castle_id;

-	WFIFOB(inter_fd,4)=index;

-	WFIFOL(inter_fd,5)=value;

-	WFIFOSET(inter_fd,9);

-	return 1;

-}

-

-//-----------------------------------------------------------------

-// Homunculus Packets send to Inter server [albator]

-//-----------------------------------------------------------------

-

-int intif_homunculus_create(int account_id, struct s_homunculus *sh)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, sizeof(struct s_homunculus)+8);

-	WFIFOW(inter_fd,0) = 0x3090;

-	WFIFOW(inter_fd,2) = sizeof(struct s_homunculus)+8;

-	WFIFOL(inter_fd,4) = account_id;

-	memcpy(WFIFOP(inter_fd,8),sh,sizeof(struct s_homunculus));

-	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));

-	return 0;

-}

-

-bool intif_homunculus_requestload(int account_id, int homun_id) {

-	if (intif->CheckForCharServer())

-		return false;

-	WFIFOHEAD(inter_fd, 10);

-	WFIFOW(inter_fd,0) = 0x3091;

-	WFIFOL(inter_fd,2) = account_id;

-	WFIFOL(inter_fd,6) = homun_id;

-	WFIFOSET(inter_fd, 10);

-	return true;

-}

-

-int intif_homunculus_requestsave(int account_id, struct s_homunculus* sh)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, sizeof(struct s_homunculus)+8);

-	WFIFOW(inter_fd,0) = 0x3092;

-	WFIFOW(inter_fd,2) = sizeof(struct s_homunculus)+8;

-	WFIFOL(inter_fd,4) = account_id;

-	memcpy(WFIFOP(inter_fd,8),sh,sizeof(struct s_homunculus));

-	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));

-	return 0;

-

-}

-

-int intif_homunculus_requestdelete(int homun_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-	WFIFOHEAD(inter_fd, 6);

-	WFIFOW(inter_fd, 0) = 0x3093;

-	WFIFOL(inter_fd,2) = homun_id;

-	WFIFOSET(inter_fd,6);

-	return 0;

-

-}

-

-

-//-----------------------------------------------------------------

-// Packets receive from inter server

-

-// Wisp/Page reception // rewritten by [Yor]

-int intif_parse_WisMessage(int fd)

-{

-	struct map_session_data* sd;

-	char *wisp_source;

-	char name[NAME_LENGTH];

-	int id, i;

-

-	id=RFIFOL(fd,4);

-

-	safestrncpy(name, (char*)RFIFOP(fd,32), NAME_LENGTH);

-	sd = iMap->nick2sd(name);

-	if(sd == NULL || strcmp(sd->status.name, name) != 0)

-	{	//Not found

-		intif_wis_replay(id,1);

-		return 0;

-	}

-	if(sd->state.ignoreAll) {

-		intif_wis_replay(id, 2);

-		return 0;

-	}

-	wisp_source = (char *) RFIFOP(fd,8); // speed up [Yor]

-	for(i=0; i < MAX_IGNORE_LIST &&

-		sd->ignore[i].name[0] != '\0' &&

-		strcmp(sd->ignore[i].name, wisp_source) != 0

-		; i++);

-

-	if (i < MAX_IGNORE_LIST && sd->ignore[i].name[0] != '\0')

-	{	//Ignored

-		intif_wis_replay(id, 2);

-		return 0;

-	}

-	//Success to send whisper.

-	clif->wis_message(sd->fd, wisp_source, (char*)RFIFOP(fd,56),RFIFOW(fd,2)-56);

-	intif_wis_replay(id,0);   // succes

-	return 0;

-}

-

-// Wisp/page transmission result reception

-int intif_parse_WisEnd(int fd)

-{

-	struct map_session_data* sd;

-

-	if (battle_config.etc_log)

-		ShowInfo("intif_parse_wisend: player: %s, flag: %d\n", RFIFOP(fd,2), RFIFOB(fd,26)); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target

-	sd = (struct map_session_data *)iMap->nick2sd((char *) RFIFOP(fd,2));

-	if (sd != NULL)

-		clif->wis_end(sd->fd, RFIFOB(fd,26));

-

-	return 0;

-}

-

-static int mapif_parse_WisToGM_sub(struct map_session_data* sd,va_list va)

-{

-	int permission = va_arg(va, int);

-	char *wisp_name;

-	char *message;

-	int len;

-

-	if (!pc_has_permission(sd, permission))

-		return 0;

-	wisp_name = va_arg(va, char*);

-	message = va_arg(va, char*);

-	len = va_arg(va, int);

-	clif->wis_message(sd->fd, wisp_name, message, len);

-	return 1;

-}

-

-// Received wisp message from map-server via char-server for ALL gm

-// 0x3003/0x3803 <packet_len>.w <wispname>.24B <permission>.l <message>.?B

-int mapif_parse_WisToGM(int fd)

-{

-	int permission, mes_len;

-	char Wisp_name[NAME_LENGTH];

-	char mbuf[255];

-	char *message;

-

-	mes_len =  RFIFOW(fd,2) - 32;

-	message = (char *) (mes_len >= 255 ? (char *) aMalloc(mes_len) : mbuf);

-

-	permission = RFIFOL(fd,28);

-	safestrncpy(Wisp_name, (char*)RFIFOP(fd,4), NAME_LENGTH);

-	safestrncpy(message, (char*)RFIFOP(fd,32), mes_len);

-	// information is sent to all online GM

-	iMap->map_foreachpc(mapif_parse_WisToGM_sub, permission, Wisp_name, message, mes_len);

-

-	if (message != mbuf)

-		aFree(message);

-	return 0;

-}

-

-// Request player registre

-int intif_parse_Registers(int fd)

-{

-	int j,p,len,max, flag;

-	struct map_session_data *sd;

-	struct global_reg *reg;

-	int *qty;

-	int account_id = RFIFOL(fd,4), char_id = RFIFOL(fd,8);

-	struct auth_node *node = chrif->auth_check(account_id, char_id, ST_LOGIN);

-	if (node)

-		sd = node->sd;

-	else { //Normally registries should arrive for in log-in chars.

-		sd = iMap->id2sd(account_id);

-		if (sd && RFIFOB(fd,12) == 3 && sd->status.char_id != char_id)

-			sd = NULL; //Character registry from another character.

-	}

-	if (!sd) return 1;

-

-	flag = (sd->save_reg.global_num == -1 || sd->save_reg.account_num == -1 || sd->save_reg.account2_num == -1);

-

-	switch (RFIFOB(fd,12)) {

-		case 3: //Character Registry

-			reg = sd->save_reg.global;

-			qty = &sd->save_reg.global_num;

-			max = GLOBAL_REG_NUM;

-		break;

-		case 2: //Account Registry

-			reg = sd->save_reg.account;

-			qty = &sd->save_reg.account_num;

-			max = ACCOUNT_REG_NUM;

-		break;

-		case 1: //Account2 Registry

-			reg = sd->save_reg.account2;

-			qty = &sd->save_reg.account2_num;

-			max = ACCOUNT_REG2_NUM;

-		break;

-		default:

-			ShowError("intif_parse_Registers: Unrecognized type %d\n",RFIFOB(fd,12));

-			return 0;

-	}

-	for(j=0,p=13;j<max && p<RFIFOW(fd,2);j++){

-		sscanf((char*)RFIFOP(fd,p), "%31c%n", reg[j].str,&len);

-		reg[j].str[len]='\0';

-		p += len+1; //+1 to skip the '\0' between strings.

-		sscanf((char*)RFIFOP(fd,p), "%255c%n", reg[j].value,&len);

-		reg[j].value[len]='\0';

-		p += len+1;

-	}

-	*qty = j;

-

-	if (flag && sd->save_reg.global_num > -1 && sd->save_reg.account_num > -1 && sd->save_reg.account2_num > -1)

-		pc->reg_received(sd); //Received all registry values, execute init scripts and what-not. [Skotlex]

-	return 1;

-}

-

-int intif_parse_LoadGuildStorage(int fd)

-{

-	struct guild_storage *gstor;

-	struct map_session_data *sd;

-	int guild_id;

-

-	guild_id = RFIFOL(fd,8);

-	if(guild_id <= 0)

-		return 1;

-	sd=iMap->id2sd( RFIFOL(fd,4) );

-	if(sd==NULL){

-		ShowError("intif_parse_LoadGuildStorage: user not found %d\n",RFIFOL(fd,4));

-		return 1;

-	}

-	gstor=gstorage->id2storage(guild_id);

-	if(!gstor) {

-		ShowWarning("intif_parse_LoadGuildStorage: error guild_id %d not exist\n",guild_id);

-		return 1;

-	}

-	if (gstor->storage_status == 1) { // Already open.. lets ignore this update

-		ShowWarning("intif_parse_LoadGuildStorage: storage received for a client already open (User %d:%d)\n", sd->status.account_id, sd->status.char_id);

-		return 1;

-	}

-	if (gstor->dirty) { // Already have storage, and it has been modified and not saved yet! Exploit! [Skotlex]

-		ShowWarning("intif_parse_LoadGuildStorage: received storage for an already modified non-saved storage! (User %d:%d)\n", sd->status.account_id, sd->status.char_id);

-		return 1;

-	}

-	if( RFIFOW(fd,2)-12 != sizeof(struct guild_storage) ){

-		ShowError("intif_parse_LoadGuildStorage: data size error %d %d\n",RFIFOW(fd,2)-12 , sizeof(struct guild_storage));

-		gstor->storage_status = 0;

-		return 1;

-	}

-

-	memcpy(gstor,RFIFOP(fd,12),sizeof(struct guild_storage));

-	gstorage->open(sd);

-	return 0;

-}

-

-// ACK guild_storage saved

-int intif_parse_SaveGuildStorage(int fd)

-{

-	gstorage->saved(/*RFIFOL(fd,2), */RFIFOL(fd,6));

-	return 0;

-}

-

-// ACK party creation

-int intif_parse_PartyCreated(int fd)

-{

-	if(battle_config.etc_log)

-		ShowInfo("intif: party created by account %d\n\n", RFIFOL(fd,2));

-	party->created(RFIFOL(fd,2), RFIFOL(fd,6),RFIFOB(fd,10),RFIFOL(fd,11), (char *)RFIFOP(fd,15));

-	return 0;

-}

-

-// Receive party info

-int intif_parse_PartyInfo(int fd)

-{

-	if( RFIFOW(fd,2) == 12 ){

-		ShowWarning("intif: party noinfo (char_id=%d party_id=%d)\n", RFIFOL(fd,4), RFIFOL(fd,8));

-		party->recv_noinfo(RFIFOL(fd,8), RFIFOL(fd,4));

-		return 0;

-	}

-

-	if( RFIFOW(fd,2) != 8+sizeof(struct party) )

-		ShowError("intif: party info : data size error (char_id=%d party_id=%d packet_len=%d expected_len=%d)\n", RFIFOL(fd,4), RFIFOL(fd,8), RFIFOW(fd,2), 8+sizeof(struct party));

-	party->recv_info((struct party *)RFIFOP(fd,8), RFIFOL(fd,4));

-	return 0;

-}

-

-// ACK adding party member

-int intif_parse_PartyMemberAdded(int fd)

-{

-	if(battle_config.etc_log)

-		ShowInfo("intif: party member added Party (%d), Account(%d), Char(%d)\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));

-	party->member_added(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10), RFIFOB(fd, 14));

-	return 0;

-}

-

-// ACK changing party option

-int intif_parse_PartyOptionChanged(int fd)

-{

-	party->optionchanged(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOW(fd,10),RFIFOW(fd,12),RFIFOB(fd,14));

-	return 0;

-}

-

-// ACK member leaving party

-int intif_parse_PartyMemberWithdraw(int fd)

-{

-	if(battle_config.etc_log)

-		ShowInfo("intif: party member withdraw: Party(%d), Account(%d), Char(%d)\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));

-	party->member_withdraw(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));

-	return 0;

-}

-

-// ACK party break

-int intif_parse_PartyBroken(int fd)

-{

-	party->broken(RFIFOL(fd,2));

-	return 0;

-}

-

-// ACK party on new map

-int intif_parse_PartyMove(int fd)

-{

-	party->recv_movemap(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOW(fd,14),RFIFOB(fd,16),RFIFOW(fd,17));

-	return 0;

-}

-

-// ACK party messages

-int intif_parse_PartyMessage(int fd)

-{

-	party->recv_message(RFIFOL(fd,4),RFIFOL(fd,8),(char *) RFIFOP(fd,12),RFIFOW(fd,2)-12);

-	return 0;

-}

-

-// ACK guild creation

-int intif_parse_GuildCreated(int fd)

-{

-	guild->created(RFIFOL(fd,2),RFIFOL(fd,6));

-	return 0;

-}

-

-// ACK guild infos

-int intif_parse_GuildInfo(int fd)

-{

-	if(RFIFOW(fd,2) == 8) {

-		ShowWarning("intif: guild noinfo %d\n",RFIFOL(fd,4));

-		guild->recv_noinfo(RFIFOL(fd,4));

-		return 0;

-	}

-	if( RFIFOW(fd,2)!=sizeof(struct guild)+4 )

-		ShowError("intif: guild info : data size error Gid: %d recv size: %d Expected size: %d\n",RFIFOL(fd,4),RFIFOW(fd,2),sizeof(struct guild)+4);

-	guild->recv_info((struct guild *)RFIFOP(fd,4));

-	return 0;

-}

-

-// ACK adding guild member

-int intif_parse_GuildMemberAdded(int fd)

-{

-	if(battle_config.etc_log)

-		ShowInfo("intif: guild member added %d %d %d %d\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14));

-	guild->member_added(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14));

-	return 0;

-}

-

-// ACK member leaving guild

-int intif_parse_GuildMemberWithdraw(int fd)

-{

-	guild->member_withdraw(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),(char *)RFIFOP(fd,55),(char *)RFIFOP(fd,15));

-	return 0;

-}

-

-// ACK guild member basic info

-int intif_parse_GuildMemberInfoShort(int fd)

-{

-	guild->recv_memberinfoshort(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOW(fd,17));

-	return 0;

-}

-

-// ACK guild break

-int intif_parse_GuildBroken(int fd)

-{

-	guild->broken(RFIFOL(fd,2),RFIFOB(fd,6));

-	return 0;

-}

-

-// basic guild info change notice

-// 0x3839 <packet len>.w <guild id>.l <type>.w <data>.?b

-int intif_parse_GuildBasicInfoChanged(int fd)

-{

-	//int len = RFIFOW(fd,2) - 10;

-	int guild_id = RFIFOL(fd,4);

-	int type = RFIFOW(fd,8);

-	//void* data = RFIFOP(fd,10);

-

-	struct guild* g = guild->search(guild_id);

-	if( g == NULL )

-		return 0;

-

-	switch(type) {

-	case GBI_EXP:        g->exp = RFIFOQ(fd,10); break;

-	case GBI_GUILDLV:    g->guild_lv = RFIFOW(fd,10); break;

-	case GBI_SKILLPOINT: g->skill_point = RFIFOL(fd,10); break;

-	}

-

-	return 0;

-}

-

-// guild member info change notice

-// 0x383a <packet len>.w <guild id>.l <account id>.l <char id>.l <type>.w <data>.?b

-int intif_parse_GuildMemberInfoChanged(int fd)

-{

-	//int len = RFIFOW(fd,2) - 18;

-	int guild_id = RFIFOL(fd,4);

-	int account_id = RFIFOL(fd,8);

-	int char_id = RFIFOL(fd,12);

-	int type = RFIFOW(fd,16);

-	//void* data = RFIFOP(fd,18);

-

-	struct guild* g;

-	int idx;

-

-	g = guild->search(guild_id);

-	if( g == NULL )

-		return 0;

-

-	idx = guild->getindex(g,account_id,char_id);

-	if( idx == -1 )

-		return 0;

-

-	switch( type ) {

-	case GMI_POSITION:   g->member[idx].position   = RFIFOW(fd,18); guild->memberposition_changed(g,idx,RFIFOW(fd,18)); break;

-	case GMI_EXP:        g->member[idx].exp        = RFIFOQ(fd,18); break;

-	case GMI_HAIR:       g->member[idx].hair       = RFIFOW(fd,18); break;

-	case GMI_HAIR_COLOR: g->member[idx].hair_color = RFIFOW(fd,18); break;

-	case GMI_GENDER:     g->member[idx].gender     = RFIFOW(fd,18); break;

-	case GMI_CLASS:      g->member[idx].class_     = RFIFOW(fd,18); break;

-	case GMI_LEVEL:      g->member[idx].lv         = RFIFOW(fd,18); break;

-	}

-	return 0;

-}

-

-// ACK change of guild title

-int intif_parse_GuildPosition(int fd)

-{

-	if( RFIFOW(fd,2)!=sizeof(struct guild_position)+12 )

-		ShowError("intif: guild info : data size error\n %d %d %d",RFIFOL(fd,4),RFIFOW(fd,2),sizeof(struct guild_position)+12);

-	guild->position_changed(RFIFOL(fd,4),RFIFOL(fd,8),(struct guild_position *)RFIFOP(fd,12));

-	return 0;

-}

-

-// ACK change of guild skill update

-int intif_parse_GuildSkillUp(int fd)

-{

-	guild->skillupack(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));

-	return 0;

-}

-

-// ACK change of guild relationship

-int intif_parse_GuildAlliance(int fd)

-{

-	guild->allianceack(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOL(fd,14),RFIFOB(fd,18),(char *) RFIFOP(fd,19),(char *) RFIFOP(fd,43));

-	return 0;

-}

-

-// ACK change of guild notice

-int intif_parse_GuildNotice(int fd)

-{

-	guild->notice_changed(RFIFOL(fd,2),(char *) RFIFOP(fd,6),(char *) RFIFOP(fd,66));

-	return 0;

-}

-

-// ACK change of guild emblem

-int intif_parse_GuildEmblem(int fd)

-{

-	guild->emblem_changed(RFIFOW(fd,2)-12,RFIFOL(fd,4),RFIFOL(fd,8), (char *)RFIFOP(fd,12));

-	return 0;

-}

-

-// ACK guild message

-int intif_parse_GuildMessage(int fd)

-{

-	guild->recv_message(RFIFOL(fd,4),RFIFOL(fd,8),(char *) RFIFOP(fd,12),RFIFOW(fd,2)-12);

-	return 0;

-}

-

-// Reply guild castle data request

-int intif_parse_GuildCastleDataLoad(int fd)

-{

-	return guild->castledataloadack(RFIFOW(fd,2), (struct guild_castle *)RFIFOP(fd,4));

-}

-

-// ACK change of guildmaster

-int intif_parse_GuildMasterChanged(int fd)

-{

-	return guild->gm_changed(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));

-}

-

-// Request pet creation

-int intif_parse_CreatePet(int fd)

-{

-	pet_get_egg(RFIFOL(fd,2),RFIFOL(fd,7),RFIFOB(fd,6));

-	return 0;

-}

-

-// ACK pet data

-int intif_parse_RecvPetData(int fd)

-{

-	struct s_pet p;

-	int len;

-	len=RFIFOW(fd,2);

-	if(sizeof(struct s_pet)!=len-9) {

-		if(battle_config.etc_log)

-			ShowError("intif: pet data: data size error %d %d\n",sizeof(struct s_pet),len-9);

-	}

-	else{

-		memcpy(&p,RFIFOP(fd,9),sizeof(struct s_pet));

-		pet_recv_petdata(RFIFOL(fd,4),&p,RFIFOB(fd,8));

-	}

-

-	return 0;

-}

-

-// ACK pet save data

-int intif_parse_SavePetOk(int fd)

-{

-	if(RFIFOB(fd,6) == 1)

-		ShowError("pet data save failure\n");

-

-	return 0;

-}

-

-// ACK deleting pet

-int intif_parse_DeletePetOk(int fd)

-{

-	if(RFIFOB(fd,2) == 1)

-		ShowError("pet data delete failure\n");

-

-	return 0;

-}

-

-// ACK changing name resquest, players,pets,hommon

-int intif_parse_ChangeNameOk(int fd)

-{

-	struct map_session_data *sd = NULL;

-	if((sd=iMap->id2sd(RFIFOL(fd,2)))==NULL ||

-		sd->status.char_id != RFIFOL(fd,6))

-		return 0;

-

-	switch (RFIFOB(fd,10)) {

-	case 0: //Players [NOT SUPPORTED YET]

-		break;

-	case 1: //Pets

-		pet_change_name_ack(sd, (char*)RFIFOP(fd,12), RFIFOB(fd,11));

-		break;

-	case 2: //Hom

-		homun->change_name_ack(sd, (char*)RFIFOP(fd,12), RFIFOB(fd,11));

-		break;

-	}

-	return 0;

-}

-

-//----------------------------------------------------------------

-// Homunculus recv packets [albator]

-

-int intif_parse_CreateHomunculus(int fd)

-{

-	int len;

-	len=RFIFOW(fd,2)-9;

-	if(sizeof(struct s_homunculus)!=len) {

-		if(battle_config.etc_log)

-			ShowError("intif: create homun data: data size error %d != %d\n",sizeof(struct s_homunculus),len);

-		return 0;

-	}

-	homun->recv_data(RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,9), RFIFOB(fd,8)) ;

-	return 0;

-}

-

-int intif_parse_RecvHomunculusData(int fd)

-{

-	int len;

-

-	len=RFIFOW(fd,2)-9;

-

-	if(sizeof(struct s_homunculus)!=len) {

-		if(battle_config.etc_log)

-			ShowError("intif: homun data: data size error %d %d\n",sizeof(struct s_homunculus),len);

-		return 0;

-	}

-	homun->recv_data(RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,9), RFIFOB(fd,8));

-	return 0;

-}

-

-int intif_parse_SaveHomunculusOk(int fd)

-{

-	if(RFIFOB(fd,6) != 1)

-		ShowError("homunculus data save failure for account %d\n", RFIFOL(fd,2));

-

-	return 0;

-}

-

-int intif_parse_DeleteHomunculusOk(int fd)

-{

-	if(RFIFOB(fd,2) != 1)

-		ShowError("Homunculus data delete failure\n");

-

-	return 0;

-}

-

-/**************************************

-

-QUESTLOG SYSTEM FUNCTIONS

-

-***************************************/

-

-int intif_request_questlog(TBL_PC *sd)

-{

-	WFIFOHEAD(inter_fd,6);

-	WFIFOW(inter_fd,0) = 0x3060;

-	WFIFOL(inter_fd,2) = sd->status.char_id;

-	WFIFOSET(inter_fd,6);

-	return 0;

-}

-

-int intif_parse_questlog(int fd)

-{

-	int char_id = RFIFOL(fd, 4);

-	int i;

-	TBL_PC * sd = iMap->charid2sd(char_id);

-

-	//User not online anymore

-	if(!sd)

-		return -1;

-

-	sd->avail_quests = sd->num_quests = (RFIFOW(fd, 2)-8)/sizeof(struct quest);

-

-	memset(&sd->quest_log, 0, sizeof(sd->quest_log));

-

-	for( i = 0; i < sd->num_quests; i++ )

-	{

-		memcpy(&sd->quest_log[i], RFIFOP(fd, i*sizeof(struct quest)+8), sizeof(struct quest));

-

-		sd->quest_index[i] = quest_search_db(sd->quest_log[i].quest_id);

-

-		if( sd->quest_index[i] < 0 )

-		{

-			ShowError("intif_parse_questlog: quest %d not found in DB.\n",sd->quest_log[i].quest_id);

-			sd->avail_quests--;

-			sd->num_quests--;

-			i--;

-			continue;

-		}

-

-		if( sd->quest_log[i].state == Q_COMPLETE )

-			sd->avail_quests--;

-	}

-

-	quest_pc_login(sd);

-

-	return 0;

-}

-

-int intif_parse_questsave(int fd)

-{

-	int cid = RFIFOL(fd, 2);

-	TBL_PC *sd = iMap->id2sd(cid);

-

-	if( !RFIFOB(fd, 6) )

-		ShowError("intif_parse_questsave: Failed to save quest(s) for character %d!\n", cid);

-	else if( sd )

-		sd->save_quest = false;

-

-	return 0;

-}

-

-int intif_quest_save(TBL_PC *sd)

-{

-	int len;

-

-	if(intif->CheckForCharServer())

-		return 0;

-

-	len = sizeof(struct quest)*sd->num_quests + 8;

-

-	WFIFOHEAD(inter_fd, len);

-	WFIFOW(inter_fd,0) = 0x3061;

-	WFIFOW(inter_fd,2) = len;

-	WFIFOL(inter_fd,4) = sd->status.char_id;

-	if( sd->num_quests )

-		memcpy(WFIFOP(inter_fd,8), &sd->quest_log, sizeof(struct quest)*sd->num_quests);

-	WFIFOSET(inter_fd,  len);

-

-	return 0;

-}

-

-/*==========================================

- * MAIL SYSTEM

- * By Zephyrus

- *==========================================*/

-

-/*------------------------------------------

- * Inbox Request

- * flag: 0 Update Inbox | 1 OpenMail

- *------------------------------------------*/

-int intif_Mail_requestinbox(int char_id, unsigned char flag)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,7);

-	WFIFOW(inter_fd,0) = 0x3048;

-	WFIFOL(inter_fd,2) = char_id;

-	WFIFOB(inter_fd,6) = flag;

-	WFIFOSET(inter_fd,7);

-

-	return 0;

-}

-

-int intif_parse_Mail_inboxreceived(int fd)

-{

-	struct map_session_data *sd;

-	unsigned char flag = RFIFOB(fd,8);

-

-	sd = iMap->charid2sd(RFIFOL(fd,4));

-

-	if (sd == NULL)

-	{

-		ShowError("intif_parse_Mail_inboxreceived: char not found %d\n",RFIFOL(fd,4));

-		return 1;

-	}

-

-	if (RFIFOW(fd,2) - 9 != sizeof(struct mail_data))

-	{

-		ShowError("intif_parse_Mail_inboxreceived: data size error %d %d\n", RFIFOW(fd,2) - 9, sizeof(struct mail_data));

-		return 1;

-	}

-

-	//FIXME: this operation is not safe [ultramage]

-	memcpy(&sd->mail.inbox, RFIFOP(fd,9), sizeof(struct mail_data));

-	sd->mail.changed = false; // cache is now in sync

-

-	if (flag)

-		clif->mail_refreshinbox(sd);

-	else if( battle_config.mail_show_status && ( battle_config.mail_show_status == 1 || sd->mail.inbox.unread ) )

-	{

-		char output[128];

-		sprintf(output, msg_txt(510), sd->mail.inbox.unchecked, sd->mail.inbox.unread + sd->mail.inbox.unchecked);

-		clif->disp_onlyself(sd, output, strlen(output));

-	}

-	return 0;

-}

-/*------------------------------------------

- * Mail Read

- *------------------------------------------*/

-int intif_Mail_read(int mail_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,6);

-	WFIFOW(inter_fd,0) = 0x3049;

-	WFIFOL(inter_fd,2) = mail_id;

-	WFIFOSET(inter_fd,6);

-

-	return 0;

-}

-/*------------------------------------------

- * Get Attachment

- *------------------------------------------*/

-int intif_Mail_getattach(int char_id, int mail_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x304a;

-	WFIFOL(inter_fd,2) = char_id;

-	WFIFOL(inter_fd,6) = mail_id;

-	WFIFOSET(inter_fd, 10);

-

-	return 0;

-}

-

-int intif_parse_Mail_getattach(int fd)

-{

-	struct map_session_data *sd;

-	struct item item;

-	int zeny = RFIFOL(fd,8);

-

-	sd = iMap->charid2sd( RFIFOL(fd,4) );

-

-	if (sd == NULL)

-	{

-		ShowError("intif_parse_Mail_getattach: char not found %d\n",RFIFOL(fd,4));

-		return 1;

-	}

-

-	if (RFIFOW(fd,2) - 12 != sizeof(struct item))

-	{

-		ShowError("intif_parse_Mail_getattach: data size error %d %d\n", RFIFOW(fd,2) - 16, sizeof(struct item));

-		return 1;

-	}

-

-	memcpy(&item, RFIFOP(fd,12), sizeof(struct item));

-

-	mail->getattachment(sd, zeny, &item);

-	return 0;

-}

-/*------------------------------------------

- * Delete Message

- *------------------------------------------*/

-int intif_Mail_delete(int char_id, int mail_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x304b;

-	WFIFOL(inter_fd,2) = char_id;

-	WFIFOL(inter_fd,6) = mail_id;

-	WFIFOSET(inter_fd,10);

-

-	return 0;

-}

-

-int intif_parse_Mail_delete(int fd)

-{

-	int char_id = RFIFOL(fd,2);

-	int mail_id = RFIFOL(fd,6);

-	bool failed = RFIFOB(fd,10);

-

-	struct map_session_data *sd = iMap->charid2sd(char_id);

-	if (sd == NULL)

-	{

-		ShowError("intif_parse_Mail_delete: char not found %d\n", char_id);

-		return 1;

-	}

-

-	if (!failed)

-	{

-		int i;

-		ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);

-		if( i < MAIL_MAX_INBOX )

-		{

-			memset(&sd->mail.inbox.msg[i], 0, sizeof(struct mail_message));

-			sd->mail.inbox.amount--;

-		}

-

-		if( sd->mail.inbox.full )

-			intif_Mail_requestinbox(sd->status.char_id, 1); // Free space is available for new mails

-	}

-

-	clif->mail_delete(sd->fd, mail_id, failed);

-	return 0;

-}

-/*------------------------------------------

- * Return Message

- *------------------------------------------*/

-int intif_Mail_return(int char_id, int mail_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x304c;

-	WFIFOL(inter_fd,2) = char_id;

-	WFIFOL(inter_fd,6) = mail_id;

-	WFIFOSET(inter_fd,10);

-

-	return 0;

-}

-

-int intif_parse_Mail_return(int fd)

-{

-	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));

-	int mail_id = RFIFOL(fd,6);

-	short fail = RFIFOB(fd,10);

-

-	if( sd == NULL )

-	{

-		ShowError("intif_parse_Mail_return: char not found %d\n",RFIFOL(fd,2));

-		return 1;

-	}

-

-	if( !fail )

-	{

-		int i;

-		ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);

-		if( i < MAIL_MAX_INBOX )

-		{

-			memset(&sd->mail.inbox.msg[i], 0, sizeof(struct mail_message));

-			sd->mail.inbox.amount--;

-		}

-

-		if( sd->mail.inbox.full )

-			intif_Mail_requestinbox(sd->status.char_id, 1); // Free space is available for new mails

-	}

-

-	clif->mail_return(sd->fd, mail_id, fail);

-	return 0;

-}

-/*------------------------------------------

- * Send Mail

- *------------------------------------------*/

-int intif_Mail_send(int account_id, struct mail_message *msg)

-{

-	int len = sizeof(struct mail_message) + 8;

-

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,len);

-	WFIFOW(inter_fd,0) = 0x304d;

-	WFIFOW(inter_fd,2) = len;

-	WFIFOL(inter_fd,4) = account_id;

-	memcpy(WFIFOP(inter_fd,8), msg, sizeof(struct mail_message));

-	WFIFOSET(inter_fd,len);

-

-	return 1;

-}

-

-static void intif_parse_Mail_send(int fd)

-{

-	struct mail_message msg;

-	struct map_session_data *sd;

-	bool fail;

-

-	if( RFIFOW(fd,2) - 4 != sizeof(struct mail_message) )

-	{

-		ShowError("intif_parse_Mail_send: data size error %d %d\n", RFIFOW(fd,2) - 4, sizeof(struct mail_message));

-		return;

-	}

-

-	memcpy(&msg, RFIFOP(fd,4), sizeof(struct mail_message));

-	fail = (msg.id == 0);

-

-	// notify sender

-	sd = iMap->charid2sd(msg.send_id);

-	if( sd != NULL )

-	{

-		if( fail )

-			mail->deliveryfail(sd, &msg);

-		else

-		{

-			clif->mail_send(sd->fd, false);

-			if( iMap->save_settings&16 )

-				chrif->save(sd, 0);

-		}

-	}

-}

-

-static void intif_parse_Mail_new(int fd)

-{

-	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));

-	int mail_id = RFIFOL(fd,6);

-	const char* sender_name = (char*)RFIFOP(fd,10);

-	const char* title = (char*)RFIFOP(fd,34);

-

-	if( sd == NULL )

-		return;

-

-	sd->mail.changed = true;

-	clif->mail_new(sd->fd, mail_id, sender_name, title);

-}

-

-/*==========================================

- * AUCTION SYSTEM

- * By Zephyrus

- *==========================================*/

-int intif_Auction_requestlist(int char_id, short type, int price, const char* searchtext, short page)

-{

-	int len = NAME_LENGTH + 16;

-

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,len);

-	WFIFOW(inter_fd,0) = 0x3050;

-	WFIFOW(inter_fd,2) = len;

-	WFIFOL(inter_fd,4) = char_id;

-	WFIFOW(inter_fd,8) = type;

-	WFIFOL(inter_fd,10) = price;

-	WFIFOW(inter_fd,14) = page;

-	memcpy(WFIFOP(inter_fd,16), searchtext, NAME_LENGTH);

-	WFIFOSET(inter_fd,len);

-

-	return 0;

-}

-

-static void intif_parse_Auction_results(int fd)

-{

-	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,4));

-	short count = RFIFOW(fd,8);

-	short pages = RFIFOW(fd,10);

-	uint8* data = RFIFOP(fd,12);

-

-	if( sd == NULL )

-		return;

-

-	clif->auction_results(sd, count, pages, data);

-}

-

-int intif_Auction_register(struct auction_data *auction)

-{

-	int len = sizeof(struct auction_data) + 4;

-

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,len);

-	WFIFOW(inter_fd,0) = 0x3051;

-	WFIFOW(inter_fd,2) = len;

-	memcpy(WFIFOP(inter_fd,4), auction, sizeof(struct auction_data));

-	WFIFOSET(inter_fd,len);

-

-	return 1;

-}

-

-static void intif_parse_Auction_register(int fd)

-{

-	struct map_session_data *sd;

-	struct auction_data auction;

-

-	if( RFIFOW(fd,2) - 4 != sizeof(struct auction_data) )

-	{

-		ShowError("intif_parse_Auction_register: data size error %d %d\n", RFIFOW(fd,2) - 4, sizeof(struct auction_data));

-		return;

-	}

-

-	memcpy(&auction, RFIFOP(fd,4), sizeof(struct auction_data));

-	if( (sd = iMap->charid2sd(auction.seller_id)) == NULL )

-		return;

-

-	if( auction.auction_id > 0 )

-	{

-		clif->auction_message(sd->fd, 1); // Confirmation Packet ??

-		if( iMap->save_settings&32 )

-			chrif->save(sd,0);

-	}

-	else

-	{

-		int zeny = auction.hours*battle_config.auction_feeperhour;

-

-		clif->auction_message(sd->fd, 4);

-		pc->additem(sd, &auction.item, auction.item.amount, LOG_TYPE_AUCTION);

-

-		pc->getzeny(sd, zeny, LOG_TYPE_AUCTION, NULL);

-	}

-}

-

-int intif_Auction_cancel(int char_id, unsigned int auction_id)

-{

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x3052;

-	WFIFOL(inter_fd,2) = char_id;

-	WFIFOL(inter_fd,6) = auction_id;

-	WFIFOSET(inter_fd,10);

-

-	return 0;

-}

-

-static void intif_parse_Auction_cancel(int fd)

-{

-	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));

-	int result = RFIFOB(fd,6);

-

-	if( sd == NULL )

-		return;

-

-	switch( result )

-	{

-	case 0: clif->auction_message(sd->fd, 2); break;

-	case 1: clif->auction_close(sd->fd, 2); break;

-	case 2: clif->auction_close(sd->fd, 1); break;

-	case 3: clif->auction_message(sd->fd, 3); break;

-	}

-}

-

-int intif_Auction_close(int char_id, unsigned int auction_id)

-{

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x3053;

-	WFIFOL(inter_fd,2) = char_id;

-	WFIFOL(inter_fd,6) = auction_id;

-	WFIFOSET(inter_fd,10);

-

-	return 0;

-}

-

-static void intif_parse_Auction_close(int fd)

-{

-	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));

-	unsigned char result = RFIFOB(fd,6);

-

-	if( sd == NULL )

-		return;

-

-	clif->auction_close(sd->fd, result);

-	if( result == 0 )

-	{

-		// FIXME: Leeching off a parse function

-		clif->pAuction_cancelreg(fd, sd);

-		intif_Auction_requestlist(sd->status.char_id, 6, 0, "", 1);

-	}

-}

-

-int intif_Auction_bid(int char_id, const char* name, unsigned int auction_id, int bid)

-{

-	int len = 16 + NAME_LENGTH;

-

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,len);

-	WFIFOW(inter_fd,0) = 0x3055;

-	WFIFOW(inter_fd,2) = len;

-	WFIFOL(inter_fd,4) = char_id;

-	WFIFOL(inter_fd,8) = auction_id;

-	WFIFOL(inter_fd,12) = bid;

-	memcpy(WFIFOP(inter_fd,16), name, NAME_LENGTH);

-	WFIFOSET(inter_fd,len);

-

-	return 0;

-}

-

-static void intif_parse_Auction_bid(int fd)

-{

-	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));

-	int bid = RFIFOL(fd,6);

-	unsigned char result = RFIFOB(fd,10);

-

-	if( sd == NULL )

-		return;

-

-	clif->auction_message(sd->fd, result);

-	if( bid > 0 ) {

-		pc->getzeny(sd, bid, LOG_TYPE_AUCTION,NULL);

-	}

-	if( result == 1 ) { // To update the list, display your buy list

-		clif->pAuction_cancelreg(fd, sd);

-		intif_Auction_requestlist(sd->status.char_id, 7, 0, "", 1);

-	}

-}

-

-// Used to send 'You have won the auction' and 'You failed to won the auction' messages

-static void intif_parse_Auction_message(int fd)

-{

-	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));

-	unsigned char result = RFIFOB(fd,6);

-

-	if( sd == NULL )

-		return;

-

-	clif->auction_message(sd->fd, result);

-}

-

-/*==========================================

- * Mercenary's System

- *------------------------------------------*/

-int intif_mercenary_create(struct s_mercenary *merc)

-{

-	int size = sizeof(struct s_mercenary) + 4;

-

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,size);

-	WFIFOW(inter_fd,0) = 0x3070;

-	WFIFOW(inter_fd,2) = size;

-	memcpy(WFIFOP(inter_fd,4), merc, sizeof(struct s_mercenary));

-	WFIFOSET(inter_fd,size);

-	return 0;

-}

-

-int intif_parse_mercenary_received(int fd)

-{

-	int len = RFIFOW(fd,2) - 5;

-	if( sizeof(struct s_mercenary) != len )

-	{

-		if( battle_config.etc_log )

-			ShowError("intif: create mercenary data size error %d != %d\n", sizeof(struct s_mercenary), len);

-		return 0;

-	}

-

-	merc_data_received((struct s_mercenary*)RFIFOP(fd,5), RFIFOB(fd,4));

-	return 0;

-}

-

-int intif_mercenary_request(int merc_id, int char_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x3071;

-	WFIFOL(inter_fd,2) = merc_id;

-	WFIFOL(inter_fd,6) = char_id;

-	WFIFOSET(inter_fd,10);

-	return 0;

-}

-

-int intif_mercenary_delete(int merc_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,6);

-	WFIFOW(inter_fd,0) = 0x3072;

-	WFIFOL(inter_fd,2) = merc_id;

-	WFIFOSET(inter_fd,6);

-	return 0;

-}

-

-int intif_parse_mercenary_deleted(int fd)

-{

-	if( RFIFOB(fd,2) != 1 )

-		ShowError("Mercenary data delete failure\n");

-

-	return 0;

-}

-

-int intif_mercenary_save(struct s_mercenary *merc)

-{

-	int size = sizeof(struct s_mercenary) + 4;

-

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,size);

-	WFIFOW(inter_fd,0) = 0x3073;

-	WFIFOW(inter_fd,2) = size;

-	memcpy(WFIFOP(inter_fd,4), merc, sizeof(struct s_mercenary));

-	WFIFOSET(inter_fd,size);

-	return 0;

-}

-

-int intif_parse_mercenary_saved(int fd)

-{

-	if( RFIFOB(fd,2) != 1 )

-		ShowError("Mercenary data save failure\n");

-

-	return 0;

-}

-

-/*==========================================

- * Elemental's System

- *------------------------------------------*/

-int intif_elemental_create(struct s_elemental *ele)

-{

-	int size = sizeof(struct s_elemental) + 4;

-

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,size);

-	WFIFOW(inter_fd,0) = 0x307c;

-	WFIFOW(inter_fd,2) = size;

-	memcpy(WFIFOP(inter_fd,4), ele, sizeof(struct s_elemental));

-	WFIFOSET(inter_fd,size);

-	return 0;

-}

-

-int intif_parse_elemental_received(int fd)

-{

-	int len = RFIFOW(fd,2) - 5;

-	if( sizeof(struct s_elemental) != len )

-	{

-		if( battle_config.etc_log )

-			ShowError("intif: create elemental data size error %d != %d\n", sizeof(struct s_elemental), len);

-		return 0;

-	}

-

-	elemental->data_received((struct s_elemental*)RFIFOP(fd,5), RFIFOB(fd,4));

-	return 0;

-}

-

-int intif_elemental_request(int ele_id, int char_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,10);

-	WFIFOW(inter_fd,0) = 0x307d;

-	WFIFOL(inter_fd,2) = ele_id;

-	WFIFOL(inter_fd,6) = char_id;

-	WFIFOSET(inter_fd,10);

-	return 0;

-}

-

-int intif_elemental_delete(int ele_id)

-{

-	if (intif->CheckForCharServer())

-		return 0;

-

-	WFIFOHEAD(inter_fd,6);

-	WFIFOW(inter_fd,0) = 0x307e;

-	WFIFOL(inter_fd,2) = ele_id;

-	WFIFOSET(inter_fd,6);

-	return 0;

-}

-

-int intif_parse_elemental_deleted(int fd)

-{

-	if( RFIFOB(fd,2) != 1 )

-		ShowError("Elemental data delete failure\n");

-

-	return 0;

-}

-

-int intif_elemental_save(struct s_elemental *ele)

-{

-	int size = sizeof(struct s_elemental) + 4;

-

-	if( intif->CheckForCharServer() )

-		return 0;

-

-	WFIFOHEAD(inter_fd,size);

-	WFIFOW(inter_fd,0) = 0x307f;

-	WFIFOW(inter_fd,2) = size;

-	memcpy(WFIFOP(inter_fd,4), ele, sizeof(struct s_elemental));

-	WFIFOSET(inter_fd,size);

-	return 0;

-}

-

-int intif_parse_elemental_saved(int fd)

-{

-	if( RFIFOB(fd,2) != 1 )

-		ShowError("Elemental data save failure\n");

-

-	return 0;

-}

-

-void intif_request_accinfo( int u_fd, int aid, int group_lv, char* query ) {

-

-

-	WFIFOHEAD(inter_fd,2 + 4 + 4 + 4 + NAME_LENGTH);

-

-	WFIFOW(inter_fd,0) = 0x3007;

-	WFIFOL(inter_fd,2) = u_fd;

-	WFIFOL(inter_fd,6) = aid;

-	WFIFOL(inter_fd,10) = group_lv;

-    safestrncpy((char *)WFIFOP(inter_fd,14), query, NAME_LENGTH);

-

-	WFIFOSET(inter_fd,2 + 4 + 4 + 4 + NAME_LENGTH);

-

-	return;

-}

-

-void intif_parse_MessageToFD(int fd) {

-	int u_fd = RFIFOL(fd,4);

-

-	if( session[u_fd] && session[u_fd]->session_data ) {

-		int aid = RFIFOL(fd,8);

-		struct map_session_data * sd = session[u_fd]->session_data;

-		/* matching e.g. previous fd owner didn't dc during request or is still the same */

-		if( sd->bl.id == aid ) {

-			char msg[512];

-			safestrncpy(msg, (char*)RFIFOP(fd,12), RFIFOW(fd,2) - 12);

-			clif->message(u_fd,msg);

-		}

-

-	}

-

-	return;

-}

-

-//-----------------------------------------------------------------

-// Communication from the inter server

-// Return a 0 (false) if there were any errors.

-// 1, 2 if there are not enough to return the length of the packet if the packet processing

-int intif_parse(int fd)

-{

-	int packet_len, cmd;

-	cmd = RFIFOW(fd,0);

-    // Verify ID of the packet

-	if(cmd<0x3800 || cmd>=0x3800+(sizeof(packet_len_table)/sizeof(packet_len_table[0])) ||

-	   packet_len_table[cmd-0x3800]==0){

-	   	return 0;

-	}

-    // Check the length of the packet

-	packet_len = packet_len_table[cmd-0x3800];

-	if(packet_len==-1){

-		if(RFIFOREST(fd)<4)

-			return 2;

-		packet_len = RFIFOW(fd,2);

-	}

-	if((int)RFIFOREST(fd)<packet_len){

-		return 2;

-	}

-    // Processing branch

-	switch(cmd){

-	case 0x3800:

-		if (RFIFOL(fd,4) == 0xFF000000) //Normal announce.

-			clif->broadcast(NULL, (char *) RFIFOP(fd,16), packet_len-16, 0, ALL_CLIENT);

-		else //Color announce.

-			clif->broadcast2(NULL, (char *) RFIFOP(fd,16), packet_len-16, RFIFOL(fd,4), RFIFOW(fd,8), RFIFOW(fd,10), RFIFOW(fd,12), RFIFOW(fd,14), ALL_CLIENT);

-		break;

-	case 0x3801:	intif_parse_WisMessage(fd); break;

-	case 0x3802:	intif_parse_WisEnd(fd); break;

-	case 0x3803:	mapif_parse_WisToGM(fd); break;

-	case 0x3804:	intif_parse_Registers(fd); break;

-	case 0x3806:	intif_parse_ChangeNameOk(fd); break;

-	case 0x3807:	intif_parse_MessageToFD(fd); break;

-	case 0x3818:	intif_parse_LoadGuildStorage(fd); break;

-	case 0x3819:	intif_parse_SaveGuildStorage(fd); break;

-	case 0x3820:	intif_parse_PartyCreated(fd); break;

-	case 0x3821:	intif_parse_PartyInfo(fd); break;

-	case 0x3822:	intif_parse_PartyMemberAdded(fd); break;

-	case 0x3823:	intif_parse_PartyOptionChanged(fd); break;

-	case 0x3824:	intif_parse_PartyMemberWithdraw(fd); break;

-	case 0x3825:	intif_parse_PartyMove(fd); break;

-	case 0x3826:	intif_parse_PartyBroken(fd); break;

-	case 0x3827:	intif_parse_PartyMessage(fd); break;

-	case 0x3830:	intif_parse_GuildCreated(fd); break;

-	case 0x3831:	intif_parse_GuildInfo(fd); break;

-	case 0x3832:	intif_parse_GuildMemberAdded(fd); break;

-	case 0x3834:	intif_parse_GuildMemberWithdraw(fd); break;

-	case 0x3835:	intif_parse_GuildMemberInfoShort(fd); break;

-	case 0x3836:	intif_parse_GuildBroken(fd); break;

-	case 0x3837:	intif_parse_GuildMessage(fd); break;

-	case 0x3839:	intif_parse_GuildBasicInfoChanged(fd); break;

-	case 0x383a:	intif_parse_GuildMemberInfoChanged(fd); break;

-	case 0x383b:	intif_parse_GuildPosition(fd); break;

-	case 0x383c:	intif_parse_GuildSkillUp(fd); break;

-	case 0x383d:	intif_parse_GuildAlliance(fd); break;

-	case 0x383e:	intif_parse_GuildNotice(fd); break;

-	case 0x383f:	intif_parse_GuildEmblem(fd); break;

-	case 0x3840:	intif_parse_GuildCastleDataLoad(fd); break;

-	case 0x3843:	intif_parse_GuildMasterChanged(fd); break;

-

-	//Quest system

-	case 0x3860:	intif_parse_questlog(fd); break;

-	case 0x3861:	intif_parse_questsave(fd); break;

-

-// Mail System

-	case 0x3848:	intif_parse_Mail_inboxreceived(fd); break;

-	case 0x3849:	intif_parse_Mail_new(fd); break;

-	case 0x384a:	intif_parse_Mail_getattach(fd); break;

-	case 0x384b:	intif_parse_Mail_delete(fd); break;

-	case 0x384c:	intif_parse_Mail_return(fd); break;

-	case 0x384d:	intif_parse_Mail_send(fd); break;

-// Auction System

-	case 0x3850:	intif_parse_Auction_results(fd); break;

-	case 0x3851:	intif_parse_Auction_register(fd); break;

-	case 0x3852:	intif_parse_Auction_cancel(fd); break;

-	case 0x3853:	intif_parse_Auction_close(fd); break;

-	case 0x3854:	intif_parse_Auction_message(fd); break;

-	case 0x3855:	intif_parse_Auction_bid(fd); break;

-

-// Mercenary System

-	case 0x3870:	intif_parse_mercenary_received(fd); break;

-	case 0x3871:	intif_parse_mercenary_deleted(fd); break;

-	case 0x3872:	intif_parse_mercenary_saved(fd); break;

-// Elemental System

-	case 0x387c:	intif_parse_elemental_received(fd); break;

-	case 0x387d:	intif_parse_elemental_deleted(fd); break;

-	case 0x387e:	intif_parse_elemental_saved(fd); break;

-

-	case 0x3880:	intif_parse_CreatePet(fd); break;

-	case 0x3881:	intif_parse_RecvPetData(fd); break;

-	case 0x3882:	intif_parse_SavePetOk(fd); break;

-	case 0x3883:	intif_parse_DeletePetOk(fd); break;

-	case 0x3890:	intif_parse_CreateHomunculus(fd); break;

-	case 0x3891:	intif_parse_RecvHomunculusData(fd); break;

-	case 0x3892:	intif_parse_SaveHomunculusOk(fd); break;

-	case 0x3893:	intif_parse_DeleteHomunculusOk(fd); break;

-	default:

-		ShowError("intif_parse : unknown packet %d %x\n",fd,RFIFOW(fd,0));

-		return 0;

-	}

-    // Skip packet

-	RFIFOSKIP(fd,packet_len);

-	return 1;

-}

-

-/*=====================================

-* Default Functions : intif.h 

-* Generated by HerculesInterfaceMaker

-* created by Susu

-*-------------------------------------*/

-void intif_defaults(void) {

-	intif = &intif_s;

-
	/* funcs */

-	

-	intif->parse = intif_parse;

-	

-	intif->broadcast = intif_broadcast;

-	intif->broadcast2 = intif_broadcast2;

-	intif->main_message = intif_main_message;

-	

-	intif->wis_message = intif_wis_message;

-	intif->wis_message_to_gm = intif_wis_message_to_gm;

-	

-	intif->saveregistry = intif_saveregistry;

-	intif->request_registry = intif_request_registry;

-	

-	intif->request_guild_storage = intif_request_guild_storage;

-	intif->send_guild_storage = intif_send_guild_storage;

-	

-	intif->create_party = intif_create_party;

-	intif->request_partyinfo = intif_request_partyinfo;

-	

-	intif->party_addmember = intif_party_addmember;

-	intif->party_changeoption = intif_party_changeoption;

-	intif->party_leave = intif_party_leave;

-	intif->party_changemap = intif_party_changemap;

-	intif->break_party = intif_break_party;

-	intif->party_message = intif_party_message;

-	intif->party_leaderchange = intif_party_leaderchange;

-	

-	intif->guild_create = intif_guild_create;

-	intif->guild_request_info = intif_guild_request_info;

-	intif->guild_addmember = intif_guild_addmember;

-	intif->guild_leave = intif_guild_leave;

-	intif->guild_memberinfoshort = intif_guild_memberinfoshort;

-	intif->guild_break = intif_guild_break;

-	intif->guild_message = intif_guild_message;

-	intif->guild_change_gm = intif_guild_change_gm;

-	intif->guild_change_basicinfo = intif_guild_change_basicinfo;

-	intif->guild_change_memberinfo = intif_guild_change_memberinfo;

-	intif->guild_position = intif_guild_position;

-	intif->guild_skillup = intif_guild_skillup;

-	intif->guild_alliance = intif_guild_alliance;

-	intif->guild_notice = intif_guild_notice;

-	intif->guild_emblem = intif_guild_emblem;

-	intif->guild_castle_dataload = intif_guild_castle_dataload;

-	intif->guild_castle_datasave = intif_guild_castle_datasave;

-	intif->request_petdata = intif_request_petdata;

-	intif->save_petdata = intif_save_petdata;

-	intif->delete_petdata = intif_delete_petdata;

-	intif->rename = intif_rename;

-	intif->homunculus_create = intif_homunculus_create;

-	intif->homunculus_requestload = intif_homunculus_requestload;

-	intif->homunculus_requestsave = intif_homunculus_requestsave;

-	intif->homunculus_requestdelete = intif_homunculus_requestdelete;

-	/******QUEST SYTEM*******/

-	intif->request_questlog = intif_request_questlog;

-	intif->quest_save = intif_quest_save;

-	// MERCENARY SYSTEM

-	intif->mercenary_create = intif_mercenary_create;

-	intif->mercenary_request = intif_mercenary_request;

-	intif->mercenary_delete = intif_mercenary_delete;

-	intif->mercenary_save = intif_mercenary_save;

-	// MAIL SYSTEM

-	intif->Mail_requestinbox = intif_Mail_requestinbox;

-	intif->Mail_read = intif_Mail_read;

-	intif->Mail_getattach = intif_Mail_getattach;

-	intif->Mail_delete = intif_Mail_delete;

-	intif->Mail_return = intif_Mail_return;

-	intif->Mail_send = intif_Mail_send;

-	// AUCTION SYSTEM

-	intif->Auction_requestlist = intif_Auction_requestlist;

-	intif->Auction_register = intif_Auction_register;

-	intif->Auction_cancel = intif_Auction_cancel;

-	intif->Auction_close = intif_Auction_close;

-	intif->Auction_bid = intif_Auction_bid;

-	// ELEMENTAL SYSTEM

-	intif->elemental_create = intif_elemental_create;

-	intif->elemental_request = intif_elemental_request;

-	intif->elemental_delete = intif_elemental_delete;

-	intif->elemental_save = intif_elemental_save;

-	/* @accinfo */

-	intif->request_accinfo = intif_request_accinfo;

-	

-	intif->CheckForCharServer = CheckForCharServer;

-}

+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/malloc.h"
+#include "../common/strlib.h"
+#include "map.h"
+#include "battle.h"
+#include "chrif.h"
+#include "clif.h"
+#include "pc.h"
+#include "intif.h"
+#include "log.h"
+#include "storage.h"
+#include "party.h"
+#include "guild.h"
+#include "pet.h"
+#include "atcommand.h"
+#include "mercenary.h"
+#include "homunculus.h"
+#include "elemental.h"
+#include "mail.h"
+#include "quest.h"
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <string.h>
+
+
+static const int packet_len_table[]={
+	-1,-1,27,-1, -1, 0,37,-1,  0, 0, 0, 0,  0, 0,  0, 0, //0x3800-0x380f
+	 0, 0, 0, 0,  0, 0, 0, 0, -1,11, 0, 0,  0, 0,  0, 0, //0x3810
+	39,-1,15,15, 14,19, 7,-1,  0, 0, 0, 0,  0, 0,  0, 0, //0x3820
+	10,-1,15, 0, 79,19, 7,-1,  0,-1,-1,-1, 14,67,186,-1, //0x3830
+	-1, 0, 0,14,  0, 0, 0, 0, -1,74,-1,11, 11,-1,  0, 0, //0x3840
+	-1,-1, 7, 7,  7,11, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3850  Auctions [Zephyrus]
+	-1, 7, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3860  Quests [Kevin] [Inkfish]
+	-1, 3, 3, 0,  0, 0, 0, 0,  0, 0, 0, 0, -1, 3,  3, 0, //0x3870  Mercenaries [Zephyrus] / Elemental [pakpil]
+	11,-1, 7, 3,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3880
+	-1,-1, 7, 3,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3890  Homunculus [albator]
+};
+
+extern int char_fd; // inter server Fd used for char_fd
+#define inter_fd char_fd	// alias
+
+//-----------------------------------------------------------------
+// Send to inter server
+
+int CheckForCharServer(void)
+{
+	return ((char_fd <= 0) || session[char_fd] == NULL || session[char_fd]->wdata == NULL);
+}
+
+// pet
+int intif_create_pet(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)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, 24 + NAME_LENGTH);
+	WFIFOW(inter_fd,0) = 0x3080;
+	WFIFOL(inter_fd,2) = account_id;
+	WFIFOL(inter_fd,6) = char_id;
+	WFIFOW(inter_fd,10) = pet_class;
+	WFIFOW(inter_fd,12) = pet_lv;
+	WFIFOW(inter_fd,14) = pet_egg_id;
+	WFIFOW(inter_fd,16) = pet_equip;
+	WFIFOW(inter_fd,18) = intimate;
+	WFIFOW(inter_fd,20) = hungry;
+	WFIFOB(inter_fd,22) = rename_flag;
+	WFIFOB(inter_fd,23) = incuvate;
+	memcpy(WFIFOP(inter_fd,24),pet_name,NAME_LENGTH);
+	WFIFOSET(inter_fd,24+NAME_LENGTH);
+
+	return 0;
+}
+
+int intif_request_petdata(int account_id,int char_id,int pet_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, 14);
+	WFIFOW(inter_fd,0) = 0x3081;
+	WFIFOL(inter_fd,2) = account_id;
+	WFIFOL(inter_fd,6) = char_id;
+	WFIFOL(inter_fd,10) = pet_id;
+	WFIFOSET(inter_fd,14);
+
+	return 0;
+}
+
+int intif_save_petdata(int account_id,struct s_pet *p)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, sizeof(struct s_pet) + 8);
+	WFIFOW(inter_fd,0) = 0x3082;
+	WFIFOW(inter_fd,2) = sizeof(struct s_pet) + 8;
+	WFIFOL(inter_fd,4) = account_id;
+	memcpy(WFIFOP(inter_fd,8),p,sizeof(struct s_pet));
+	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));
+
+	return 0;
+}
+
+int intif_delete_petdata(int pet_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,6);
+	WFIFOW(inter_fd,0) = 0x3083;
+	WFIFOL(inter_fd,2) = pet_id;
+	WFIFOSET(inter_fd,6);
+
+	return 1;
+}
+
+int intif_rename(struct map_session_data *sd, int type, char *name)
+{
+	if (intif->CheckForCharServer())
+		return 1;
+
+	WFIFOHEAD(inter_fd,NAME_LENGTH+12);
+	WFIFOW(inter_fd,0) = 0x3006;
+	WFIFOL(inter_fd,2) = sd->status.account_id;
+	WFIFOL(inter_fd,6) = sd->status.char_id;
+	WFIFOB(inter_fd,10) = type;  //Type: 0 - PC, 1 - PET, 2 - HOM
+	memcpy(WFIFOP(inter_fd,11),name, NAME_LENGTH);
+	WFIFOSET(inter_fd,NAME_LENGTH+12);
+	return 0;
+}
+
+// GM Send a message
+int intif_broadcast(const char* mes, int len, int type)
+{
+	int lp = type ? 4 : 0;
+
+	// Send to the local players
+	clif->broadcast(NULL, mes, len, type, ALL_CLIENT);
+
+	if (intif->CheckForCharServer())
+		return 0;
+
+	if (chrif->other_mapserver_count < 1)
+		return 0; //No need to send.
+
+	WFIFOHEAD(inter_fd, 16 + lp + len);
+	WFIFOW(inter_fd,0)  = 0x3000;
+	WFIFOW(inter_fd,2)  = 16 + lp + len;
+	WFIFOL(inter_fd,4)  = 0xFF000000; // 0xFF000000 color signals standard broadcast
+	WFIFOW(inter_fd,8)  = 0; // fontType not used with standard broadcast
+	WFIFOW(inter_fd,10) = 0; // fontSize not used with standard broadcast
+	WFIFOW(inter_fd,12) = 0; // fontAlign not used with standard broadcast
+	WFIFOW(inter_fd,14) = 0; // fontY not used with standard broadcast
+	if (type == 0x10) // bc_blue
+		WFIFOL(inter_fd,16) = 0x65756c62; //If there's "blue" at the beginning of the message, game client will display it in blue instead of yellow.
+	else if (type == 0x20) // bc_woe
+		WFIFOL(inter_fd,16) = 0x73737373; //If there's "ssss", game client will recognize message as 'WoE broadcast'.
+	memcpy(WFIFOP(inter_fd,16 + lp), mes, len);
+	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
+	return 0;
+}
+
+int intif_broadcast2(const char* mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY)
+{
+	// Send to the local players
+	clif->broadcast2(NULL, mes, len, fontColor, fontType, fontSize, fontAlign, fontY, ALL_CLIENT);
+
+	if (intif->CheckForCharServer())
+		return 0;
+
+	if (chrif->other_mapserver_count < 1)
+		return 0; //No need to send.
+
+	WFIFOHEAD(inter_fd, 16 + len);
+	WFIFOW(inter_fd,0)  = 0x3000;
+	WFIFOW(inter_fd,2)  = 16 + len;
+	WFIFOL(inter_fd,4)  = fontColor;
+	WFIFOW(inter_fd,8)  = fontType;
+	WFIFOW(inter_fd,10) = fontSize;
+	WFIFOW(inter_fd,12) = fontAlign;
+	WFIFOW(inter_fd,14) = fontY;
+	memcpy(WFIFOP(inter_fd,16), mes, len);
+	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
+	return 0;
+}
+
+/// send a message using the main chat system
+/// <sd>         the source of message
+/// <message>    the message that was sent
+int intif_main_message(struct map_session_data* sd, const char* message)
+{
+	char output[256];
+
+	nullpo_ret(sd);
+
+	// format the message for main broadcasting
+	snprintf( output, sizeof(output), msg_txt(386), sd->status.name, message );
+
+	// send the message using the inter-server broadcast service
+	intif_broadcast2( output, strlen(output) + 1, 0xFE000000, 0, 0, 0, 0 );
+
+	// log the chat message
+	logs->chat( LOG_CHAT_MAINCHAT, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, message );
+
+	return 0;
+}
+
+// The transmission of Wisp/Page to inter-server (player not found on this server)
+int intif_wis_message(struct map_session_data *sd, char *nick, char *mes, int mes_len)
+{
+	nullpo_ret(sd);
+	if (intif->CheckForCharServer())
+		return 0;
+
+	if (chrif->other_mapserver_count < 1)
+	{	//Character not found.
+		clif->wis_end(sd->fd, 1);
+		return 0;
+	}
+
+	WFIFOHEAD(inter_fd,mes_len + 52);
+	WFIFOW(inter_fd,0) = 0x3001;
+	WFIFOW(inter_fd,2) = mes_len + 52;
+	memcpy(WFIFOP(inter_fd,4), sd->status.name, NAME_LENGTH);
+	memcpy(WFIFOP(inter_fd,4+NAME_LENGTH), nick, NAME_LENGTH);
+	memcpy(WFIFOP(inter_fd,4+2*NAME_LENGTH), mes, mes_len);
+	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
+
+	if (battle_config.etc_log)
+		ShowInfo("intif_wis_message from %s to %s (message: '%s')\n", sd->status.name, nick, mes);
+
+	return 0;
+}
+
+// The reply of Wisp/page
+int intif_wis_replay(int id, int flag)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,7);
+	WFIFOW(inter_fd,0) = 0x3002;
+	WFIFOL(inter_fd,2) = id;
+	WFIFOB(inter_fd,6) = flag; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+	WFIFOSET(inter_fd,7);
+
+	if (battle_config.etc_log)
+		ShowInfo("intif_wis_replay: id: %d, flag:%d\n", id, flag);
+
+	return 0;
+}
+
+// The transmission of GM only Wisp/Page from server to inter-server
+int intif_wis_message_to_gm(char *wisp_name, int permission, char *mes)
+{
+	int mes_len;
+	if (intif->CheckForCharServer())
+		return 0;
+	mes_len = strlen(mes) + 1; // + null
+	WFIFOHEAD(inter_fd, mes_len + 32);
+	WFIFOW(inter_fd,0) = 0x3003;
+	WFIFOW(inter_fd,2) = mes_len + 32;
+	memcpy(WFIFOP(inter_fd,4), wisp_name, NAME_LENGTH);
+	WFIFOL(inter_fd,4+NAME_LENGTH) = permission;
+	memcpy(WFIFOP(inter_fd,8+NAME_LENGTH), mes, mes_len);
+	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
+
+	if (battle_config.etc_log)
+		ShowNotice("intif_wis_message_to_gm: from: '%s', required permission: %d, message: '%s'.\n", wisp_name, permission, mes);
+
+	return 0;
+}
+
+int intif_regtostr(char* str, struct global_reg *reg, int qty)
+{
+	int len =0, i;
+
+	for (i = 0; i < qty; i++) {
+		len+= sprintf(str+len, "%s", reg[i].str)+1; //We add 1 to consider the '\0' in place.
+		len+= sprintf(str+len, "%s", reg[i].value)+1;
+	}
+	return len;
+}
+
+//Request for saving registry values.
+int intif_saveregistry(struct map_session_data *sd, int type)
+{
+	struct global_reg *reg;
+	int count;
+	int i, p;
+
+	if (intif->CheckForCharServer())
+		return -1;
+
+	switch (type) {
+	case 3: //Character reg
+		reg = sd->save_reg.global;
+		count = sd->save_reg.global_num;
+		sd->state.reg_dirty &= ~0x4;
+	break;
+	case 2: //Account reg
+		reg = sd->save_reg.account;
+		count = sd->save_reg.account_num;
+		sd->state.reg_dirty &= ~0x2;
+	break;
+	case 1: //Account2 reg
+		reg = sd->save_reg.account2;
+		count = sd->save_reg.account2_num;
+		sd->state.reg_dirty &= ~0x1;
+	break;
+	default: //Broken code?
+		ShowError("intif_saveregistry: Invalid type %d\n", type);
+		return -1;
+	}
+	WFIFOHEAD(inter_fd, 288 * MAX_REG_NUM+13);
+	WFIFOW(inter_fd,0)=0x3004;
+	WFIFOL(inter_fd,4)=sd->status.account_id;
+	WFIFOL(inter_fd,8)=sd->status.char_id;
+	WFIFOB(inter_fd,12)=type;
+	for( p = 13, i = 0; i < count; i++ ) {
+		if (reg[i].str[0] != '\0' && reg[i].value[0] != '\0') {
+			p+= sprintf((char*)WFIFOP(inter_fd,p), "%s", reg[i].str)+1; //We add 1 to consider the '\0' in place.
+			p+= sprintf((char*)WFIFOP(inter_fd,p), "%s", reg[i].value)+1;
+		}
+	}
+	WFIFOW(inter_fd,2)=p;
+	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));
+	return 0;
+}
+
+//Request the registries for this player.
+int intif_request_registry(struct map_session_data *sd, int flag)
+{
+	nullpo_ret(sd);
+
+	sd->save_reg.account2_num = -1;
+	sd->save_reg.account_num = -1;
+	sd->save_reg.global_num = -1;
+
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,6);
+	WFIFOW(inter_fd,0) = 0x3005;
+	WFIFOL(inter_fd,2) = sd->status.account_id;
+	WFIFOL(inter_fd,6) = sd->status.char_id;
+	WFIFOB(inter_fd,10) = (flag&1?1:0); //Request Acc Reg 2
+	WFIFOB(inter_fd,11) = (flag&2?1:0); //Request Acc Reg
+	WFIFOB(inter_fd,12) = (flag&4?1:0); //Request Char Reg
+	WFIFOSET(inter_fd,13);
+
+	return 0;
+}
+
+int intif_request_guild_storage(int account_id,int guild_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x3018;
+	WFIFOL(inter_fd,2) = account_id;
+	WFIFOL(inter_fd,6) = guild_id;
+	WFIFOSET(inter_fd,10);
+	return 0;
+}
+int intif_send_guild_storage(int account_id,struct guild_storage *gstor)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,sizeof(struct guild_storage)+12);
+	WFIFOW(inter_fd,0) = 0x3019;
+	WFIFOW(inter_fd,2) = (unsigned short)sizeof(struct guild_storage)+12;
+	WFIFOL(inter_fd,4) = account_id;
+	WFIFOL(inter_fd,8) = gstor->guild_id;
+	memcpy( WFIFOP(inter_fd,12),gstor, sizeof(struct guild_storage) );
+	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));
+	return 0;
+}
+
+// Party creation request
+int intif_create_party(struct party_member *member,char *name,int item,int item2)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	nullpo_ret(member);
+
+	WFIFOHEAD(inter_fd,64);
+	WFIFOW(inter_fd,0) = 0x3020;
+	WFIFOW(inter_fd,2) = 30+sizeof(struct party_member);
+	memcpy(WFIFOP(inter_fd,4),name, NAME_LENGTH);
+	WFIFOB(inter_fd,28)= item;
+	WFIFOB(inter_fd,29)= item2;
+	memcpy(WFIFOP(inter_fd,30), member, sizeof(struct party_member));
+	WFIFOSET(inter_fd,WFIFOW(inter_fd, 2));
+	return 0;
+}
+
+// Party information request
+int intif_request_partyinfo(int party_id, int char_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x3021;
+	WFIFOL(inter_fd,2) = party_id;
+	WFIFOL(inter_fd,6) = char_id;
+	WFIFOSET(inter_fd,10);
+	return 0;
+}
+
+// Request to add a member to party
+int intif_party_addmember(int party_id,struct party_member *member)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,42);
+	WFIFOW(inter_fd,0)=0x3022;
+	WFIFOW(inter_fd,2)=8+sizeof(struct party_member);
+	WFIFOL(inter_fd,4)=party_id;
+	memcpy(WFIFOP(inter_fd,8),member,sizeof(struct party_member));
+	WFIFOSET(inter_fd,WFIFOW(inter_fd, 2));
+	return 1;
+}
+
+// Request to change party configuration (exp,item share)
+int intif_party_changeoption(int party_id,int account_id,int exp,int item)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,14);
+	WFIFOW(inter_fd,0)=0x3023;
+	WFIFOL(inter_fd,2)=party_id;
+	WFIFOL(inter_fd,6)=account_id;
+	WFIFOW(inter_fd,10)=exp;
+	WFIFOW(inter_fd,12)=item;
+	WFIFOSET(inter_fd,14);
+	return 0;
+}
+
+// Request to leave party
+int intif_party_leave(int party_id,int account_id, int char_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,14);
+	WFIFOW(inter_fd,0)=0x3024;
+	WFIFOL(inter_fd,2)=party_id;
+	WFIFOL(inter_fd,6)=account_id;
+	WFIFOL(inter_fd,10)=char_id;
+	WFIFOSET(inter_fd,14);
+	return 0;
+}
+
+// Request keeping party for new map ??
+int intif_party_changemap(struct map_session_data *sd,int online)
+{
+	int16 m, mapindex;
+
+	if (intif->CheckForCharServer())
+		return 0;
+	if(!sd)
+		return 0;
+
+	if( (m=iMap->mapindex2mapid(sd->mapindex)) >= 0 && map[m].instance_id >= 0 )
+		mapindex = map[map[m].instance_src_map].index;
+	else
+		mapindex = sd->mapindex;
+
+	WFIFOHEAD(inter_fd,19);
+	WFIFOW(inter_fd,0)=0x3025;
+	WFIFOL(inter_fd,2)=sd->status.party_id;
+	WFIFOL(inter_fd,6)=sd->status.account_id;
+	WFIFOL(inter_fd,10)=sd->status.char_id;
+	WFIFOW(inter_fd,14)=mapindex;
+	WFIFOB(inter_fd,16)=online;
+	WFIFOW(inter_fd,17)=sd->status.base_level;
+	WFIFOSET(inter_fd,19);
+	return 1;
+}
+
+// Request breaking party
+int intif_break_party(int party_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,6);
+	WFIFOW(inter_fd,0)=0x3026;
+	WFIFOL(inter_fd,2)=party_id;
+	WFIFOSET(inter_fd,6);
+	return 0;
+}
+
+// Sending party chat
+int intif_party_message(int party_id,int account_id,const char *mes,int len)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	if (chrif->other_mapserver_count < 1)
+		return 0; //No need to send.
+
+	WFIFOHEAD(inter_fd,len + 12);
+	WFIFOW(inter_fd,0)=0x3027;
+	WFIFOW(inter_fd,2)=len+12;
+	WFIFOL(inter_fd,4)=party_id;
+	WFIFOL(inter_fd,8)=account_id;
+	memcpy(WFIFOP(inter_fd,12),mes,len);
+	WFIFOSET(inter_fd,len+12);
+	return 0;
+}
+
+// Request a new leader for party
+int intif_party_leaderchange(int party_id,int account_id,int char_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,14);
+	WFIFOW(inter_fd,0)=0x3029;
+	WFIFOL(inter_fd,2)=party_id;
+	WFIFOL(inter_fd,6)=account_id;
+	WFIFOL(inter_fd,10)=char_id;
+	WFIFOSET(inter_fd,14);
+	return 0;
+}
+
+// Request a Guild creation
+int intif_guild_create(const char *name,const struct guild_member *master)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	nullpo_ret(master);
+
+	WFIFOHEAD(inter_fd,sizeof(struct guild_member)+(8+NAME_LENGTH));
+	WFIFOW(inter_fd,0)=0x3030;
+	WFIFOW(inter_fd,2)=sizeof(struct guild_member)+(8+NAME_LENGTH);
+	WFIFOL(inter_fd,4)=master->account_id;
+	memcpy(WFIFOP(inter_fd,8),name,NAME_LENGTH);
+	memcpy(WFIFOP(inter_fd,8+NAME_LENGTH),master,sizeof(struct guild_member));
+	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));
+	return 0;
+}
+
+// Request Guild information
+int intif_guild_request_info(int guild_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,6);
+	WFIFOW(inter_fd,0) = 0x3031;
+	WFIFOL(inter_fd,2) = guild_id;
+	WFIFOSET(inter_fd,6);
+	return 0;
+}
+
+// Request to add member to the guild
+int intif_guild_addmember(int guild_id,struct guild_member *m)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,sizeof(struct guild_member)+8);
+	WFIFOW(inter_fd,0) = 0x3032;
+	WFIFOW(inter_fd,2) = sizeof(struct guild_member)+8;
+	WFIFOL(inter_fd,4) = guild_id;
+	memcpy(WFIFOP(inter_fd,8),m,sizeof(struct guild_member));
+	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));
+	return 0;
+}
+
+// Request a new leader for guild
+int intif_guild_change_gm(int guild_id, const char* name, int len)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, len + 8);
+	WFIFOW(inter_fd, 0)=0x3033;
+	WFIFOW(inter_fd, 2)=len+8;
+	WFIFOL(inter_fd, 4)=guild_id;
+	memcpy(WFIFOP(inter_fd,8),name,len);
+	WFIFOSET(inter_fd,len+8);
+	return 0;
+}
+
+// Request to leave guild
+int intif_guild_leave(int guild_id,int account_id,int char_id,int flag,const char *mes)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, 55);
+	WFIFOW(inter_fd, 0) = 0x3034;
+	WFIFOL(inter_fd, 2) = guild_id;
+	WFIFOL(inter_fd, 6) = account_id;
+	WFIFOL(inter_fd,10) = char_id;
+	WFIFOB(inter_fd,14) = flag;
+	safestrncpy((char*)WFIFOP(inter_fd,15),mes,40);
+	WFIFOSET(inter_fd,55);
+	return 0;
+}
+
+//Update request / Lv online status of the guild members
+int intif_guild_memberinfoshort(int guild_id,int account_id,int char_id,int online,int lv,int class_)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, 19);
+	WFIFOW(inter_fd, 0) = 0x3035;
+	WFIFOL(inter_fd, 2) = guild_id;
+	WFIFOL(inter_fd, 6) = account_id;
+	WFIFOL(inter_fd,10) = char_id;
+	WFIFOB(inter_fd,14) = online;
+	WFIFOW(inter_fd,15) = lv;
+	WFIFOW(inter_fd,17) = class_;
+	WFIFOSET(inter_fd,19);
+	return 0;
+}
+
+//Guild disbanded notification
+int intif_guild_break(int guild_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, 6);
+	WFIFOW(inter_fd, 0) = 0x3036;
+	WFIFOL(inter_fd, 2) = guild_id;
+	WFIFOSET(inter_fd,6);
+	return 0;
+}
+
+// Send a guild message
+int intif_guild_message(int guild_id,int account_id,const char *mes,int len)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	if (chrif->other_mapserver_count < 1)
+		return 0; //No need to send.
+
+	WFIFOHEAD(inter_fd, len + 12);
+	WFIFOW(inter_fd,0)=0x3037;
+	WFIFOW(inter_fd,2)=len+12;
+	WFIFOL(inter_fd,4)=guild_id;
+	WFIFOL(inter_fd,8)=account_id;
+	memcpy(WFIFOP(inter_fd,12),mes,len);
+	WFIFOSET(inter_fd,len+12);
+
+	return 0;
+}
+
+// Request a change of Guild basic information
+int intif_guild_change_basicinfo(int guild_id,int type,const void *data,int len)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, len + 10);
+	WFIFOW(inter_fd,0)=0x3039;
+	WFIFOW(inter_fd,2)=len+10;
+	WFIFOL(inter_fd,4)=guild_id;
+	WFIFOW(inter_fd,8)=type;
+	memcpy(WFIFOP(inter_fd,10),data,len);
+	WFIFOSET(inter_fd,len+10);
+	return 0;
+}
+
+// Request a change of Guild member information
+int intif_guild_change_memberinfo(int guild_id,int account_id,int char_id,
+	int type,const void *data,int len)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, len + 18);
+	WFIFOW(inter_fd, 0)=0x303a;
+	WFIFOW(inter_fd, 2)=len+18;
+	WFIFOL(inter_fd, 4)=guild_id;
+	WFIFOL(inter_fd, 8)=account_id;
+	WFIFOL(inter_fd,12)=char_id;
+	WFIFOW(inter_fd,16)=type;
+	memcpy(WFIFOP(inter_fd,18),data,len);
+	WFIFOSET(inter_fd,len+18);
+	return 0;
+}
+
+// Request a change of Guild title
+int intif_guild_position(int guild_id,int idx,struct guild_position *p)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, sizeof(struct guild_position)+12);
+	WFIFOW(inter_fd,0)=0x303b;
+	WFIFOW(inter_fd,2)=sizeof(struct guild_position)+12;
+	WFIFOL(inter_fd,4)=guild_id;
+	WFIFOL(inter_fd,8)=idx;
+	memcpy(WFIFOP(inter_fd,12),p,sizeof(struct guild_position));
+	WFIFOSET(inter_fd,WFIFOW(inter_fd,2));
+	return 0;
+}
+
+// Request an update of Guildskill skill_id
+int intif_guild_skillup(int guild_id, uint16 skill_id, int account_id, int max)
+{
+	if( intif->CheckForCharServer() )
+		return 0;
+	WFIFOHEAD(inter_fd, 18);
+	WFIFOW(inter_fd, 0)  = 0x303c;
+	WFIFOL(inter_fd, 2)  = guild_id;
+	WFIFOL(inter_fd, 6)  = skill_id;
+	WFIFOL(inter_fd, 10) = account_id;
+	WFIFOL(inter_fd, 14) = max;
+	WFIFOSET(inter_fd, 18);
+	return 0;
+}
+
+// Request a new guild relationship
+int intif_guild_alliance(int guild_id1,int guild_id2,int account_id1,int account_id2,int flag)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,19);
+	WFIFOW(inter_fd, 0)=0x303d;
+	WFIFOL(inter_fd, 2)=guild_id1;
+	WFIFOL(inter_fd, 6)=guild_id2;
+	WFIFOL(inter_fd,10)=account_id1;
+	WFIFOL(inter_fd,14)=account_id2;
+	WFIFOB(inter_fd,18)=flag;
+	WFIFOSET(inter_fd,19);
+	return 0;
+}
+
+// Request to change guild notice
+int intif_guild_notice(int guild_id,const char *mes1,const char *mes2)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,186);
+	WFIFOW(inter_fd,0)=0x303e;
+	WFIFOL(inter_fd,2)=guild_id;
+	memcpy(WFIFOP(inter_fd,6),mes1,MAX_GUILDMES1);
+	memcpy(WFIFOP(inter_fd,66),mes2,MAX_GUILDMES2);
+	WFIFOSET(inter_fd,186);
+	return 0;
+}
+
+// Request to change guild emblem
+int intif_guild_emblem(int guild_id,int len,const char *data)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	if(guild_id<=0 || len<0 || len>2000)
+		return 0;
+	WFIFOHEAD(inter_fd,len + 12);
+	WFIFOW(inter_fd,0)=0x303f;
+	WFIFOW(inter_fd,2)=len+12;
+	WFIFOL(inter_fd,4)=guild_id;
+	WFIFOL(inter_fd,8)=0;
+	memcpy(WFIFOP(inter_fd,12),data,len);
+	WFIFOSET(inter_fd,len+12);
+	return 0;
+}
+
+/**
+ * Requests guild castles data from char-server.
+ * @param num Number of castles, size of castle_ids array.
+ * @param castle_ids Pointer to array of castle IDs.
+ */
+int intif_guild_castle_dataload(int num, int *castle_ids)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, 4 + num * sizeof(int));
+	WFIFOW(inter_fd, 0) = 0x3040;
+	WFIFOW(inter_fd, 2) = 4 + num * sizeof(int);
+	memcpy(WFIFOP(inter_fd, 4), castle_ids, num * sizeof(int));
+	WFIFOSET(inter_fd, WFIFOW(inter_fd, 2));
+	return 1;
+}
+
+
+// Request change castle guild owner and save data
+int intif_guild_castle_datasave(int castle_id,int index, int value)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd,9);
+	WFIFOW(inter_fd,0)=0x3041;
+	WFIFOW(inter_fd,2)=castle_id;
+	WFIFOB(inter_fd,4)=index;
+	WFIFOL(inter_fd,5)=value;
+	WFIFOSET(inter_fd,9);
+	return 1;
+}
+
+//-----------------------------------------------------------------
+// Homunculus Packets send to Inter server [albator]
+//-----------------------------------------------------------------
+
+int intif_homunculus_create(int account_id, struct s_homunculus *sh)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, sizeof(struct s_homunculus)+8);
+	WFIFOW(inter_fd,0) = 0x3090;
+	WFIFOW(inter_fd,2) = sizeof(struct s_homunculus)+8;
+	WFIFOL(inter_fd,4) = account_id;
+	memcpy(WFIFOP(inter_fd,8),sh,sizeof(struct s_homunculus));
+	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
+	return 0;
+}
+
+bool intif_homunculus_requestload(int account_id, int homun_id) {
+	if (intif->CheckForCharServer())
+		return false;
+	WFIFOHEAD(inter_fd, 10);
+	WFIFOW(inter_fd,0) = 0x3091;
+	WFIFOL(inter_fd,2) = account_id;
+	WFIFOL(inter_fd,6) = homun_id;
+	WFIFOSET(inter_fd, 10);
+	return true;
+}
+
+int intif_homunculus_requestsave(int account_id, struct s_homunculus* sh)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, sizeof(struct s_homunculus)+8);
+	WFIFOW(inter_fd,0) = 0x3092;
+	WFIFOW(inter_fd,2) = sizeof(struct s_homunculus)+8;
+	WFIFOL(inter_fd,4) = account_id;
+	memcpy(WFIFOP(inter_fd,8),sh,sizeof(struct s_homunculus));
+	WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
+	return 0;
+
+}
+
+int intif_homunculus_requestdelete(int homun_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+	WFIFOHEAD(inter_fd, 6);
+	WFIFOW(inter_fd, 0) = 0x3093;
+	WFIFOL(inter_fd,2) = homun_id;
+	WFIFOSET(inter_fd,6);
+	return 0;
+
+}
+
+
+//-----------------------------------------------------------------
+// Packets receive from inter server
+
+// Wisp/Page reception // rewritten by [Yor]
+int intif_parse_WisMessage(int fd)
+{
+	struct map_session_data* sd;
+	char *wisp_source;
+	char name[NAME_LENGTH];
+	int id, i;
+
+	id=RFIFOL(fd,4);
+
+	safestrncpy(name, (char*)RFIFOP(fd,32), NAME_LENGTH);
+	sd = iMap->nick2sd(name);
+	if(sd == NULL || strcmp(sd->status.name, name) != 0)
+	{	//Not found
+		intif_wis_replay(id,1);
+		return 0;
+	}
+	if(sd->state.ignoreAll) {
+		intif_wis_replay(id, 2);
+		return 0;
+	}
+	wisp_source = (char *) RFIFOP(fd,8); // speed up [Yor]
+	for(i=0; i < MAX_IGNORE_LIST &&
+		sd->ignore[i].name[0] != '\0' &&
+		strcmp(sd->ignore[i].name, wisp_source) != 0
+		; i++);
+
+	if (i < MAX_IGNORE_LIST && sd->ignore[i].name[0] != '\0')
+	{	//Ignored
+		intif_wis_replay(id, 2);
+		return 0;
+	}
+	//Success to send whisper.
+	clif->wis_message(sd->fd, wisp_source, (char*)RFIFOP(fd,56),RFIFOW(fd,2)-56);
+	intif_wis_replay(id,0);   // succes
+	return 0;
+}
+
+// Wisp/page transmission result reception
+int intif_parse_WisEnd(int fd)
+{
+	struct map_session_data* sd;
+
+	if (battle_config.etc_log)
+		ShowInfo("intif_parse_wisend: player: %s, flag: %d\n", RFIFOP(fd,2), RFIFOB(fd,26)); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+	sd = (struct map_session_data *)iMap->nick2sd((char *) RFIFOP(fd,2));
+	if (sd != NULL)
+		clif->wis_end(sd->fd, RFIFOB(fd,26));
+
+	return 0;
+}
+
+static int mapif_parse_WisToGM_sub(struct map_session_data* sd,va_list va)
+{
+	int permission = va_arg(va, int);
+	char *wisp_name;
+	char *message;
+	int len;
+
+	if (!pc_has_permission(sd, permission))
+		return 0;
+	wisp_name = va_arg(va, char*);
+	message = va_arg(va, char*);
+	len = va_arg(va, int);
+	clif->wis_message(sd->fd, wisp_name, message, len);
+	return 1;
+}
+
+// Received wisp message from map-server via char-server for ALL gm
+// 0x3003/0x3803 <packet_len>.w <wispname>.24B <permission>.l <message>.?B
+int mapif_parse_WisToGM(int fd)
+{
+	int permission, mes_len;
+	char Wisp_name[NAME_LENGTH];
+	char mbuf[255];
+	char *message;
+
+	mes_len =  RFIFOW(fd,2) - 32;
+	message = (char *) (mes_len >= 255 ? (char *) aMalloc(mes_len) : mbuf);
+
+	permission = RFIFOL(fd,28);
+	safestrncpy(Wisp_name, (char*)RFIFOP(fd,4), NAME_LENGTH);
+	safestrncpy(message, (char*)RFIFOP(fd,32), mes_len);
+	// information is sent to all online GM
+	iMap->map_foreachpc(mapif_parse_WisToGM_sub, permission, Wisp_name, message, mes_len);
+
+	if (message != mbuf)
+		aFree(message);
+	return 0;
+}
+
+// Request player registre
+int intif_parse_Registers(int fd)
+{
+	int j,p,len,max, flag;
+	struct map_session_data *sd;
+	struct global_reg *reg;
+	int *qty;
+	int account_id = RFIFOL(fd,4), char_id = RFIFOL(fd,8);
+	struct auth_node *node = chrif->auth_check(account_id, char_id, ST_LOGIN);
+	if (node)
+		sd = node->sd;
+	else { //Normally registries should arrive for in log-in chars.
+		sd = iMap->id2sd(account_id);
+		if (sd && RFIFOB(fd,12) == 3 && sd->status.char_id != char_id)
+			sd = NULL; //Character registry from another character.
+	}
+	if (!sd) return 1;
+
+	flag = (sd->save_reg.global_num == -1 || sd->save_reg.account_num == -1 || sd->save_reg.account2_num == -1);
+
+	switch (RFIFOB(fd,12)) {
+		case 3: //Character Registry
+			reg = sd->save_reg.global;
+			qty = &sd->save_reg.global_num;
+			max = GLOBAL_REG_NUM;
+		break;
+		case 2: //Account Registry
+			reg = sd->save_reg.account;
+			qty = &sd->save_reg.account_num;
+			max = ACCOUNT_REG_NUM;
+		break;
+		case 1: //Account2 Registry
+			reg = sd->save_reg.account2;
+			qty = &sd->save_reg.account2_num;
+			max = ACCOUNT_REG2_NUM;
+		break;
+		default:
+			ShowError("intif_parse_Registers: Unrecognized type %d\n",RFIFOB(fd,12));
+			return 0;
+	}
+	for(j=0,p=13;j<max && p<RFIFOW(fd,2);j++){
+		sscanf((char*)RFIFOP(fd,p), "%31c%n", reg[j].str,&len);
+		reg[j].str[len]='\0';
+		p += len+1; //+1 to skip the '\0' between strings.
+		sscanf((char*)RFIFOP(fd,p), "%255c%n", reg[j].value,&len);
+		reg[j].value[len]='\0';
+		p += len+1;
+	}
+	*qty = j;
+
+	if (flag && sd->save_reg.global_num > -1 && sd->save_reg.account_num > -1 && sd->save_reg.account2_num > -1)
+		pc->reg_received(sd); //Received all registry values, execute init scripts and what-not. [Skotlex]
+	return 1;
+}
+
+int intif_parse_LoadGuildStorage(int fd)
+{
+	struct guild_storage *gstor;
+	struct map_session_data *sd;
+	int guild_id;
+
+	guild_id = RFIFOL(fd,8);
+	if(guild_id <= 0)
+		return 1;
+	sd=iMap->id2sd( RFIFOL(fd,4) );
+	if(sd==NULL){
+		ShowError("intif_parse_LoadGuildStorage: user not found %d\n",RFIFOL(fd,4));
+		return 1;
+	}
+	gstor=gstorage->id2storage(guild_id);
+	if(!gstor) {
+		ShowWarning("intif_parse_LoadGuildStorage: error guild_id %d not exist\n",guild_id);
+		return 1;
+	}
+	if (gstor->storage_status == 1) { // Already open.. lets ignore this update
+		ShowWarning("intif_parse_LoadGuildStorage: storage received for a client already open (User %d:%d)\n", sd->status.account_id, sd->status.char_id);
+		return 1;
+	}
+	if (gstor->dirty) { // Already have storage, and it has been modified and not saved yet! Exploit! [Skotlex]
+		ShowWarning("intif_parse_LoadGuildStorage: received storage for an already modified non-saved storage! (User %d:%d)\n", sd->status.account_id, sd->status.char_id);
+		return 1;
+	}
+	if( RFIFOW(fd,2)-12 != sizeof(struct guild_storage) ){
+		ShowError("intif_parse_LoadGuildStorage: data size error %d %d\n",RFIFOW(fd,2)-12 , sizeof(struct guild_storage));
+		gstor->storage_status = 0;
+		return 1;
+	}
+
+	memcpy(gstor,RFIFOP(fd,12),sizeof(struct guild_storage));
+	gstorage->open(sd);
+	return 0;
+}
+
+// ACK guild_storage saved
+int intif_parse_SaveGuildStorage(int fd)
+{
+	gstorage->saved(/*RFIFOL(fd,2), */RFIFOL(fd,6));
+	return 0;
+}
+
+// ACK party creation
+int intif_parse_PartyCreated(int fd)
+{
+	if(battle_config.etc_log)
+		ShowInfo("intif: party created by account %d\n\n", RFIFOL(fd,2));
+	party->created(RFIFOL(fd,2), RFIFOL(fd,6),RFIFOB(fd,10),RFIFOL(fd,11), (char *)RFIFOP(fd,15));
+	return 0;
+}
+
+// Receive party info
+int intif_parse_PartyInfo(int fd)
+{
+	if( RFIFOW(fd,2) == 12 ){
+		ShowWarning("intif: party noinfo (char_id=%d party_id=%d)\n", RFIFOL(fd,4), RFIFOL(fd,8));
+		party->recv_noinfo(RFIFOL(fd,8), RFIFOL(fd,4));
+		return 0;
+	}
+
+	if( RFIFOW(fd,2) != 8+sizeof(struct party) )
+		ShowError("intif: party info : data size error (char_id=%d party_id=%d packet_len=%d expected_len=%d)\n", RFIFOL(fd,4), RFIFOL(fd,8), RFIFOW(fd,2), 8+sizeof(struct party));
+	party->recv_info((struct party *)RFIFOP(fd,8), RFIFOL(fd,4));
+	return 0;
+}
+
+// ACK adding party member
+int intif_parse_PartyMemberAdded(int fd)
+{
+	if(battle_config.etc_log)
+		ShowInfo("intif: party member added Party (%d), Account(%d), Char(%d)\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
+	party->member_added(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10), RFIFOB(fd, 14));
+	return 0;
+}
+
+// ACK changing party option
+int intif_parse_PartyOptionChanged(int fd)
+{
+	party->optionchanged(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOW(fd,10),RFIFOW(fd,12),RFIFOB(fd,14));
+	return 0;
+}
+
+// ACK member leaving party
+int intif_parse_PartyMemberWithdraw(int fd)
+{
+	if(battle_config.etc_log)
+		ShowInfo("intif: party member withdraw: Party(%d), Account(%d), Char(%d)\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
+	party->member_withdraw(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
+	return 0;
+}
+
+// ACK party break
+int intif_parse_PartyBroken(int fd)
+{
+	party->broken(RFIFOL(fd,2));
+	return 0;
+}
+
+// ACK party on new map
+int intif_parse_PartyMove(int fd)
+{
+	party->recv_movemap(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOW(fd,14),RFIFOB(fd,16),RFIFOW(fd,17));
+	return 0;
+}
+
+// ACK party messages
+int intif_parse_PartyMessage(int fd)
+{
+	party->recv_message(RFIFOL(fd,4),RFIFOL(fd,8),(char *) RFIFOP(fd,12),RFIFOW(fd,2)-12);
+	return 0;
+}
+
+// ACK guild creation
+int intif_parse_GuildCreated(int fd)
+{
+	guild->created(RFIFOL(fd,2),RFIFOL(fd,6));
+	return 0;
+}
+
+// ACK guild infos
+int intif_parse_GuildInfo(int fd)
+{
+	if(RFIFOW(fd,2) == 8) {
+		ShowWarning("intif: guild noinfo %d\n",RFIFOL(fd,4));
+		guild->recv_noinfo(RFIFOL(fd,4));
+		return 0;
+	}
+	if( RFIFOW(fd,2)!=sizeof(struct guild)+4 )
+		ShowError("intif: guild info : data size error Gid: %d recv size: %d Expected size: %d\n",RFIFOL(fd,4),RFIFOW(fd,2),sizeof(struct guild)+4);
+	guild->recv_info((struct guild *)RFIFOP(fd,4));
+	return 0;
+}
+
+// ACK adding guild member
+int intif_parse_GuildMemberAdded(int fd)
+{
+	if(battle_config.etc_log)
+		ShowInfo("intif: guild member added %d %d %d %d\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14));
+	guild->member_added(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14));
+	return 0;
+}
+
+// ACK member leaving guild
+int intif_parse_GuildMemberWithdraw(int fd)
+{
+	guild->member_withdraw(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),(char *)RFIFOP(fd,55),(char *)RFIFOP(fd,15));
+	return 0;
+}
+
+// ACK guild member basic info
+int intif_parse_GuildMemberInfoShort(int fd)
+{
+	guild->recv_memberinfoshort(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOW(fd,17));
+	return 0;
+}
+
+// ACK guild break
+int intif_parse_GuildBroken(int fd)
+{
+	guild->broken(RFIFOL(fd,2),RFIFOB(fd,6));
+	return 0;
+}
+
+// basic guild info change notice
+// 0x3839 <packet len>.w <guild id>.l <type>.w <data>.?b
+int intif_parse_GuildBasicInfoChanged(int fd)
+{
+	//int len = RFIFOW(fd,2) - 10;
+	int guild_id = RFIFOL(fd,4);
+	int type = RFIFOW(fd,8);
+	//void* data = RFIFOP(fd,10);
+
+	struct guild* g = guild->search(guild_id);
+	if( g == NULL )
+		return 0;
+
+	switch(type) {
+	case GBI_EXP:        g->exp = RFIFOQ(fd,10); break;
+	case GBI_GUILDLV:    g->guild_lv = RFIFOW(fd,10); break;
+	case GBI_SKILLPOINT: g->skill_point = RFIFOL(fd,10); break;
+	}
+
+	return 0;
+}
+
+// guild member info change notice
+// 0x383a <packet len>.w <guild id>.l <account id>.l <char id>.l <type>.w <data>.?b
+int intif_parse_GuildMemberInfoChanged(int fd)
+{
+	//int len = RFIFOW(fd,2) - 18;
+	int guild_id = RFIFOL(fd,4);
+	int account_id = RFIFOL(fd,8);
+	int char_id = RFIFOL(fd,12);
+	int type = RFIFOW(fd,16);
+	//void* data = RFIFOP(fd,18);
+
+	struct guild* g;
+	int idx;
+
+	g = guild->search(guild_id);
+	if( g == NULL )
+		return 0;
+
+	idx = guild->getindex(g,account_id,char_id);
+	if( idx == -1 )
+		return 0;
+
+	switch( type ) {
+	case GMI_POSITION:   g->member[idx].position   = RFIFOW(fd,18); guild->memberposition_changed(g,idx,RFIFOW(fd,18)); break;
+	case GMI_EXP:        g->member[idx].exp        = RFIFOQ(fd,18); break;
+	case GMI_HAIR:       g->member[idx].hair       = RFIFOW(fd,18); break;
+	case GMI_HAIR_COLOR: g->member[idx].hair_color = RFIFOW(fd,18); break;
+	case GMI_GENDER:     g->member[idx].gender     = RFIFOW(fd,18); break;
+	case GMI_CLASS:      g->member[idx].class_     = RFIFOW(fd,18); break;
+	case GMI_LEVEL:      g->member[idx].lv         = RFIFOW(fd,18); break;
+	}
+	return 0;
+}
+
+// ACK change of guild title
+int intif_parse_GuildPosition(int fd)
+{
+	if( RFIFOW(fd,2)!=sizeof(struct guild_position)+12 )
+		ShowError("intif: guild info : data size error\n %d %d %d",RFIFOL(fd,4),RFIFOW(fd,2),sizeof(struct guild_position)+12);
+	guild->position_changed(RFIFOL(fd,4),RFIFOL(fd,8),(struct guild_position *)RFIFOP(fd,12));
+	return 0;
+}
+
+// ACK change of guild skill update
+int intif_parse_GuildSkillUp(int fd)
+{
+	guild->skillupack(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
+	return 0;
+}
+
+// ACK change of guild relationship
+int intif_parse_GuildAlliance(int fd)
+{
+	guild->allianceack(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOL(fd,14),RFIFOB(fd,18),(char *) RFIFOP(fd,19),(char *) RFIFOP(fd,43));
+	return 0;
+}
+
+// ACK change of guild notice
+int intif_parse_GuildNotice(int fd)
+{
+	guild->notice_changed(RFIFOL(fd,2),(char *) RFIFOP(fd,6),(char *) RFIFOP(fd,66));
+	return 0;
+}
+
+// ACK change of guild emblem
+int intif_parse_GuildEmblem(int fd)
+{
+	guild->emblem_changed(RFIFOW(fd,2)-12,RFIFOL(fd,4),RFIFOL(fd,8), (char *)RFIFOP(fd,12));
+	return 0;
+}
+
+// ACK guild message
+int intif_parse_GuildMessage(int fd)
+{
+	guild->recv_message(RFIFOL(fd,4),RFIFOL(fd,8),(char *) RFIFOP(fd,12),RFIFOW(fd,2)-12);
+	return 0;
+}
+
+// Reply guild castle data request
+int intif_parse_GuildCastleDataLoad(int fd)
+{
+	return guild->castledataloadack(RFIFOW(fd,2), (struct guild_castle *)RFIFOP(fd,4));
+}
+
+// ACK change of guildmaster
+int intif_parse_GuildMasterChanged(int fd)
+{
+	return guild->gm_changed(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
+}
+
+// Request pet creation
+int intif_parse_CreatePet(int fd)
+{
+	pet_get_egg(RFIFOL(fd,2),RFIFOL(fd,7),RFIFOB(fd,6));
+	return 0;
+}
+
+// ACK pet data
+int intif_parse_RecvPetData(int fd)
+{
+	struct s_pet p;
+	int len;
+	len=RFIFOW(fd,2);
+	if(sizeof(struct s_pet)!=len-9) {
+		if(battle_config.etc_log)
+			ShowError("intif: pet data: data size error %d %d\n",sizeof(struct s_pet),len-9);
+	}
+	else{
+		memcpy(&p,RFIFOP(fd,9),sizeof(struct s_pet));
+		pet_recv_petdata(RFIFOL(fd,4),&p,RFIFOB(fd,8));
+	}
+
+	return 0;
+}
+
+// ACK pet save data
+int intif_parse_SavePetOk(int fd)
+{
+	if(RFIFOB(fd,6) == 1)
+		ShowError("pet data save failure\n");
+
+	return 0;
+}
+
+// ACK deleting pet
+int intif_parse_DeletePetOk(int fd)
+{
+	if(RFIFOB(fd,2) == 1)
+		ShowError("pet data delete failure\n");
+
+	return 0;
+}
+
+// ACK changing name resquest, players,pets,hommon
+int intif_parse_ChangeNameOk(int fd)
+{
+	struct map_session_data *sd = NULL;
+	if((sd=iMap->id2sd(RFIFOL(fd,2)))==NULL ||
+		sd->status.char_id != RFIFOL(fd,6))
+		return 0;
+
+	switch (RFIFOB(fd,10)) {
+	case 0: //Players [NOT SUPPORTED YET]
+		break;
+	case 1: //Pets
+		pet_change_name_ack(sd, (char*)RFIFOP(fd,12), RFIFOB(fd,11));
+		break;
+	case 2: //Hom
+		homun->change_name_ack(sd, (char*)RFIFOP(fd,12), RFIFOB(fd,11));
+		break;
+	}
+	return 0;
+}
+
+//----------------------------------------------------------------
+// Homunculus recv packets [albator]
+
+int intif_parse_CreateHomunculus(int fd)
+{
+	int len;
+	len=RFIFOW(fd,2)-9;
+	if(sizeof(struct s_homunculus)!=len) {
+		if(battle_config.etc_log)
+			ShowError("intif: create homun data: data size error %d != %d\n",sizeof(struct s_homunculus),len);
+		return 0;
+	}
+	homun->recv_data(RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,9), RFIFOB(fd,8)) ;
+	return 0;
+}
+
+int intif_parse_RecvHomunculusData(int fd)
+{
+	int len;
+
+	len=RFIFOW(fd,2)-9;
+
+	if(sizeof(struct s_homunculus)!=len) {
+		if(battle_config.etc_log)
+			ShowError("intif: homun data: data size error %d %d\n",sizeof(struct s_homunculus),len);
+		return 0;
+	}
+	homun->recv_data(RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,9), RFIFOB(fd,8));
+	return 0;
+}
+
+int intif_parse_SaveHomunculusOk(int fd)
+{
+	if(RFIFOB(fd,6) != 1)
+		ShowError("homunculus data save failure for account %d\n", RFIFOL(fd,2));
+
+	return 0;
+}
+
+int intif_parse_DeleteHomunculusOk(int fd)
+{
+	if(RFIFOB(fd,2) != 1)
+		ShowError("Homunculus data delete failure\n");
+
+	return 0;
+}
+
+/**************************************
+
+QUESTLOG SYSTEM FUNCTIONS
+
+***************************************/
+
+int intif_request_questlog(TBL_PC *sd)
+{
+	WFIFOHEAD(inter_fd,6);
+	WFIFOW(inter_fd,0) = 0x3060;
+	WFIFOL(inter_fd,2) = sd->status.char_id;
+	WFIFOSET(inter_fd,6);
+	return 0;
+}
+
+int intif_parse_questlog(int fd)
+{
+	int char_id = RFIFOL(fd, 4);
+	int i;
+	TBL_PC * sd = iMap->charid2sd(char_id);
+
+	//User not online anymore
+	if(!sd)
+		return -1;
+
+	sd->avail_quests = sd->num_quests = (RFIFOW(fd, 2)-8)/sizeof(struct quest);
+
+	memset(&sd->quest_log, 0, sizeof(sd->quest_log));
+
+	for( i = 0; i < sd->num_quests; i++ )
+	{
+		memcpy(&sd->quest_log[i], RFIFOP(fd, i*sizeof(struct quest)+8), sizeof(struct quest));
+
+		sd->quest_index[i] = quest_search_db(sd->quest_log[i].quest_id);
+
+		if( sd->quest_index[i] < 0 )
+		{
+			ShowError("intif_parse_questlog: quest %d not found in DB.\n",sd->quest_log[i].quest_id);
+			sd->avail_quests--;
+			sd->num_quests--;
+			i--;
+			continue;
+		}
+
+		if( sd->quest_log[i].state == Q_COMPLETE )
+			sd->avail_quests--;
+	}
+
+	quest_pc_login(sd);
+
+	return 0;
+}
+
+int intif_parse_questsave(int fd)
+{
+	int cid = RFIFOL(fd, 2);
+	TBL_PC *sd = iMap->id2sd(cid);
+
+	if( !RFIFOB(fd, 6) )
+		ShowError("intif_parse_questsave: Failed to save quest(s) for character %d!\n", cid);
+	else if( sd )
+		sd->save_quest = false;
+
+	return 0;
+}
+
+int intif_quest_save(TBL_PC *sd)
+{
+	int len;
+
+	if(intif->CheckForCharServer())
+		return 0;
+
+	len = sizeof(struct quest)*sd->num_quests + 8;
+
+	WFIFOHEAD(inter_fd, len);
+	WFIFOW(inter_fd,0) = 0x3061;
+	WFIFOW(inter_fd,2) = len;
+	WFIFOL(inter_fd,4) = sd->status.char_id;
+	if( sd->num_quests )
+		memcpy(WFIFOP(inter_fd,8), &sd->quest_log, sizeof(struct quest)*sd->num_quests);
+	WFIFOSET(inter_fd,  len);
+
+	return 0;
+}
+
+/*==========================================
+ * MAIL SYSTEM
+ * By Zephyrus
+ *==========================================*/
+
+/*------------------------------------------
+ * Inbox Request
+ * flag: 0 Update Inbox | 1 OpenMail
+ *------------------------------------------*/
+int intif_Mail_requestinbox(int char_id, unsigned char flag)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,7);
+	WFIFOW(inter_fd,0) = 0x3048;
+	WFIFOL(inter_fd,2) = char_id;
+	WFIFOB(inter_fd,6) = flag;
+	WFIFOSET(inter_fd,7);
+
+	return 0;
+}
+
+int intif_parse_Mail_inboxreceived(int fd)
+{
+	struct map_session_data *sd;
+	unsigned char flag = RFIFOB(fd,8);
+
+	sd = iMap->charid2sd(RFIFOL(fd,4));
+
+	if (sd == NULL)
+	{
+		ShowError("intif_parse_Mail_inboxreceived: char not found %d\n",RFIFOL(fd,4));
+		return 1;
+	}
+
+	if (RFIFOW(fd,2) - 9 != sizeof(struct mail_data))
+	{
+		ShowError("intif_parse_Mail_inboxreceived: data size error %d %d\n", RFIFOW(fd,2) - 9, sizeof(struct mail_data));
+		return 1;
+	}
+
+	//FIXME: this operation is not safe [ultramage]
+	memcpy(&sd->mail.inbox, RFIFOP(fd,9), sizeof(struct mail_data));
+	sd->mail.changed = false; // cache is now in sync
+
+	if (flag)
+		clif->mail_refreshinbox(sd);
+	else if( battle_config.mail_show_status && ( battle_config.mail_show_status == 1 || sd->mail.inbox.unread ) )
+	{
+		char output[128];
+		sprintf(output, msg_txt(510), sd->mail.inbox.unchecked, sd->mail.inbox.unread + sd->mail.inbox.unchecked);
+		clif->disp_onlyself(sd, output, strlen(output));
+	}
+	return 0;
+}
+/*------------------------------------------
+ * Mail Read
+ *------------------------------------------*/
+int intif_Mail_read(int mail_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,6);
+	WFIFOW(inter_fd,0) = 0x3049;
+	WFIFOL(inter_fd,2) = mail_id;
+	WFIFOSET(inter_fd,6);
+
+	return 0;
+}
+/*------------------------------------------
+ * Get Attachment
+ *------------------------------------------*/
+int intif_Mail_getattach(int char_id, int mail_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x304a;
+	WFIFOL(inter_fd,2) = char_id;
+	WFIFOL(inter_fd,6) = mail_id;
+	WFIFOSET(inter_fd, 10);
+
+	return 0;
+}
+
+int intif_parse_Mail_getattach(int fd)
+{
+	struct map_session_data *sd;
+	struct item item;
+	int zeny = RFIFOL(fd,8);
+
+	sd = iMap->charid2sd( RFIFOL(fd,4) );
+
+	if (sd == NULL)
+	{
+		ShowError("intif_parse_Mail_getattach: char not found %d\n",RFIFOL(fd,4));
+		return 1;
+	}
+
+	if (RFIFOW(fd,2) - 12 != sizeof(struct item))
+	{
+		ShowError("intif_parse_Mail_getattach: data size error %d %d\n", RFIFOW(fd,2) - 16, sizeof(struct item));
+		return 1;
+	}
+
+	memcpy(&item, RFIFOP(fd,12), sizeof(struct item));
+
+	mail->getattachment(sd, zeny, &item);
+	return 0;
+}
+/*------------------------------------------
+ * Delete Message
+ *------------------------------------------*/
+int intif_Mail_delete(int char_id, int mail_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x304b;
+	WFIFOL(inter_fd,2) = char_id;
+	WFIFOL(inter_fd,6) = mail_id;
+	WFIFOSET(inter_fd,10);
+
+	return 0;
+}
+
+int intif_parse_Mail_delete(int fd)
+{
+	int char_id = RFIFOL(fd,2);
+	int mail_id = RFIFOL(fd,6);
+	bool failed = RFIFOB(fd,10);
+
+	struct map_session_data *sd = iMap->charid2sd(char_id);
+	if (sd == NULL)
+	{
+		ShowError("intif_parse_Mail_delete: char not found %d\n", char_id);
+		return 1;
+	}
+
+	if (!failed)
+	{
+		int i;
+		ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
+		if( i < MAIL_MAX_INBOX )
+		{
+			memset(&sd->mail.inbox.msg[i], 0, sizeof(struct mail_message));
+			sd->mail.inbox.amount--;
+		}
+
+		if( sd->mail.inbox.full )
+			intif_Mail_requestinbox(sd->status.char_id, 1); // Free space is available for new mails
+	}
+
+	clif->mail_delete(sd->fd, mail_id, failed);
+	return 0;
+}
+/*------------------------------------------
+ * Return Message
+ *------------------------------------------*/
+int intif_Mail_return(int char_id, int mail_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x304c;
+	WFIFOL(inter_fd,2) = char_id;
+	WFIFOL(inter_fd,6) = mail_id;
+	WFIFOSET(inter_fd,10);
+
+	return 0;
+}
+
+int intif_parse_Mail_return(int fd)
+{
+	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));
+	int mail_id = RFIFOL(fd,6);
+	short fail = RFIFOB(fd,10);
+
+	if( sd == NULL )
+	{
+		ShowError("intif_parse_Mail_return: char not found %d\n",RFIFOL(fd,2));
+		return 1;
+	}
+
+	if( !fail )
+	{
+		int i;
+		ARR_FIND(0, MAIL_MAX_INBOX, i, sd->mail.inbox.msg[i].id == mail_id);
+		if( i < MAIL_MAX_INBOX )
+		{
+			memset(&sd->mail.inbox.msg[i], 0, sizeof(struct mail_message));
+			sd->mail.inbox.amount--;
+		}
+
+		if( sd->mail.inbox.full )
+			intif_Mail_requestinbox(sd->status.char_id, 1); // Free space is available for new mails
+	}
+
+	clif->mail_return(sd->fd, mail_id, fail);
+	return 0;
+}
+/*------------------------------------------
+ * Send Mail
+ *------------------------------------------*/
+int intif_Mail_send(int account_id, struct mail_message *msg)
+{
+	int len = sizeof(struct mail_message) + 8;
+
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,len);
+	WFIFOW(inter_fd,0) = 0x304d;
+	WFIFOW(inter_fd,2) = len;
+	WFIFOL(inter_fd,4) = account_id;
+	memcpy(WFIFOP(inter_fd,8), msg, sizeof(struct mail_message));
+	WFIFOSET(inter_fd,len);
+
+	return 1;
+}
+
+static void intif_parse_Mail_send(int fd)
+{
+	struct mail_message msg;
+	struct map_session_data *sd;
+	bool fail;
+
+	if( RFIFOW(fd,2) - 4 != sizeof(struct mail_message) )
+	{
+		ShowError("intif_parse_Mail_send: data size error %d %d\n", RFIFOW(fd,2) - 4, sizeof(struct mail_message));
+		return;
+	}
+
+	memcpy(&msg, RFIFOP(fd,4), sizeof(struct mail_message));
+	fail = (msg.id == 0);
+
+	// notify sender
+	sd = iMap->charid2sd(msg.send_id);
+	if( sd != NULL )
+	{
+		if( fail )
+			mail->deliveryfail(sd, &msg);
+		else
+		{
+			clif->mail_send(sd->fd, false);
+			if( iMap->save_settings&16 )
+				chrif->save(sd, 0);
+		}
+	}
+}
+
+static void intif_parse_Mail_new(int fd)
+{
+	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));
+	int mail_id = RFIFOL(fd,6);
+	const char* sender_name = (char*)RFIFOP(fd,10);
+	const char* title = (char*)RFIFOP(fd,34);
+
+	if( sd == NULL )
+		return;
+
+	sd->mail.changed = true;
+	clif->mail_new(sd->fd, mail_id, sender_name, title);
+}
+
+/*==========================================
+ * AUCTION SYSTEM
+ * By Zephyrus
+ *==========================================*/
+int intif_Auction_requestlist(int char_id, short type, int price, const char* searchtext, short page)
+{
+	int len = NAME_LENGTH + 16;
+
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,len);
+	WFIFOW(inter_fd,0) = 0x3050;
+	WFIFOW(inter_fd,2) = len;
+	WFIFOL(inter_fd,4) = char_id;
+	WFIFOW(inter_fd,8) = type;
+	WFIFOL(inter_fd,10) = price;
+	WFIFOW(inter_fd,14) = page;
+	memcpy(WFIFOP(inter_fd,16), searchtext, NAME_LENGTH);
+	WFIFOSET(inter_fd,len);
+
+	return 0;
+}
+
+static void intif_parse_Auction_results(int fd)
+{
+	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,4));
+	short count = RFIFOW(fd,8);
+	short pages = RFIFOW(fd,10);
+	uint8* data = RFIFOP(fd,12);
+
+	if( sd == NULL )
+		return;
+
+	clif->auction_results(sd, count, pages, data);
+}
+
+int intif_Auction_register(struct auction_data *auction)
+{
+	int len = sizeof(struct auction_data) + 4;
+
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,len);
+	WFIFOW(inter_fd,0) = 0x3051;
+	WFIFOW(inter_fd,2) = len;
+	memcpy(WFIFOP(inter_fd,4), auction, sizeof(struct auction_data));
+	WFIFOSET(inter_fd,len);
+
+	return 1;
+}
+
+static void intif_parse_Auction_register(int fd)
+{
+	struct map_session_data *sd;
+	struct auction_data auction;
+
+	if( RFIFOW(fd,2) - 4 != sizeof(struct auction_data) )
+	{
+		ShowError("intif_parse_Auction_register: data size error %d %d\n", RFIFOW(fd,2) - 4, sizeof(struct auction_data));
+		return;
+	}
+
+	memcpy(&auction, RFIFOP(fd,4), sizeof(struct auction_data));
+	if( (sd = iMap->charid2sd(auction.seller_id)) == NULL )
+		return;
+
+	if( auction.auction_id > 0 )
+	{
+		clif->auction_message(sd->fd, 1); // Confirmation Packet ??
+		if( iMap->save_settings&32 )
+			chrif->save(sd,0);
+	}
+	else
+	{
+		int zeny = auction.hours*battle_config.auction_feeperhour;
+
+		clif->auction_message(sd->fd, 4);
+		pc->additem(sd, &auction.item, auction.item.amount, LOG_TYPE_AUCTION);
+
+		pc->getzeny(sd, zeny, LOG_TYPE_AUCTION, NULL);
+	}
+}
+
+int intif_Auction_cancel(int char_id, unsigned int auction_id)
+{
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x3052;
+	WFIFOL(inter_fd,2) = char_id;
+	WFIFOL(inter_fd,6) = auction_id;
+	WFIFOSET(inter_fd,10);
+
+	return 0;
+}
+
+static void intif_parse_Auction_cancel(int fd)
+{
+	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));
+	int result = RFIFOB(fd,6);
+
+	if( sd == NULL )
+		return;
+
+	switch( result )
+	{
+	case 0: clif->auction_message(sd->fd, 2); break;
+	case 1: clif->auction_close(sd->fd, 2); break;
+	case 2: clif->auction_close(sd->fd, 1); break;
+	case 3: clif->auction_message(sd->fd, 3); break;
+	}
+}
+
+int intif_Auction_close(int char_id, unsigned int auction_id)
+{
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x3053;
+	WFIFOL(inter_fd,2) = char_id;
+	WFIFOL(inter_fd,6) = auction_id;
+	WFIFOSET(inter_fd,10);
+
+	return 0;
+}
+
+static void intif_parse_Auction_close(int fd)
+{
+	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));
+	unsigned char result = RFIFOB(fd,6);
+
+	if( sd == NULL )
+		return;
+
+	clif->auction_close(sd->fd, result);
+	if( result == 0 )
+	{
+		// FIXME: Leeching off a parse function
+		clif->pAuction_cancelreg(fd, sd);
+		intif_Auction_requestlist(sd->status.char_id, 6, 0, "", 1);
+	}
+}
+
+int intif_Auction_bid(int char_id, const char* name, unsigned int auction_id, int bid)
+{
+	int len = 16 + NAME_LENGTH;
+
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,len);
+	WFIFOW(inter_fd,0) = 0x3055;
+	WFIFOW(inter_fd,2) = len;
+	WFIFOL(inter_fd,4) = char_id;
+	WFIFOL(inter_fd,8) = auction_id;
+	WFIFOL(inter_fd,12) = bid;
+	memcpy(WFIFOP(inter_fd,16), name, NAME_LENGTH);
+	WFIFOSET(inter_fd,len);
+
+	return 0;
+}
+
+static void intif_parse_Auction_bid(int fd)
+{
+	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));
+	int bid = RFIFOL(fd,6);
+	unsigned char result = RFIFOB(fd,10);
+
+	if( sd == NULL )
+		return;
+
+	clif->auction_message(sd->fd, result);
+	if( bid > 0 ) {
+		pc->getzeny(sd, bid, LOG_TYPE_AUCTION,NULL);
+	}
+	if( result == 1 ) { // To update the list, display your buy list
+		clif->pAuction_cancelreg(fd, sd);
+		intif_Auction_requestlist(sd->status.char_id, 7, 0, "", 1);
+	}
+}
+
+// Used to send 'You have won the auction' and 'You failed to won the auction' messages
+static void intif_parse_Auction_message(int fd)
+{
+	struct map_session_data *sd = iMap->charid2sd(RFIFOL(fd,2));
+	unsigned char result = RFIFOB(fd,6);
+
+	if( sd == NULL )
+		return;
+
+	clif->auction_message(sd->fd, result);
+}
+
+/*==========================================
+ * Mercenary's System
+ *------------------------------------------*/
+int intif_mercenary_create(struct s_mercenary *merc)
+{
+	int size = sizeof(struct s_mercenary) + 4;
+
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,size);
+	WFIFOW(inter_fd,0) = 0x3070;
+	WFIFOW(inter_fd,2) = size;
+	memcpy(WFIFOP(inter_fd,4), merc, sizeof(struct s_mercenary));
+	WFIFOSET(inter_fd,size);
+	return 0;
+}
+
+int intif_parse_mercenary_received(int fd)
+{
+	int len = RFIFOW(fd,2) - 5;
+	if( sizeof(struct s_mercenary) != len )
+	{
+		if( battle_config.etc_log )
+			ShowError("intif: create mercenary data size error %d != %d\n", sizeof(struct s_mercenary), len);
+		return 0;
+	}
+
+	mercenary->merc_data_received((struct s_mercenary*)RFIFOP(fd,5), RFIFOB(fd,4));
+	return 0;
+}
+
+int intif_mercenary_request(int merc_id, int char_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x3071;
+	WFIFOL(inter_fd,2) = merc_id;
+	WFIFOL(inter_fd,6) = char_id;
+	WFIFOSET(inter_fd,10);
+	return 0;
+}
+
+int intif_mercenary_delete(int merc_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,6);
+	WFIFOW(inter_fd,0) = 0x3072;
+	WFIFOL(inter_fd,2) = merc_id;
+	WFIFOSET(inter_fd,6);
+	return 0;
+}
+
+int intif_parse_mercenary_deleted(int fd)
+{
+	if( RFIFOB(fd,2) != 1 )
+		ShowError("Mercenary data delete failure\n");
+
+	return 0;
+}
+
+int intif_mercenary_save(struct s_mercenary *merc)
+{
+	int size = sizeof(struct s_mercenary) + 4;
+
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,size);
+	WFIFOW(inter_fd,0) = 0x3073;
+	WFIFOW(inter_fd,2) = size;
+	memcpy(WFIFOP(inter_fd,4), merc, sizeof(struct s_mercenary));
+	WFIFOSET(inter_fd,size);
+	return 0;
+}
+
+int intif_parse_mercenary_saved(int fd)
+{
+	if( RFIFOB(fd,2) != 1 )
+		ShowError("Mercenary data save failure\n");
+
+	return 0;
+}
+
+/*==========================================
+ * Elemental's System
+ *------------------------------------------*/
+int intif_elemental_create(struct s_elemental *ele)
+{
+	int size = sizeof(struct s_elemental) + 4;
+
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,size);
+	WFIFOW(inter_fd,0) = 0x307c;
+	WFIFOW(inter_fd,2) = size;
+	memcpy(WFIFOP(inter_fd,4), ele, sizeof(struct s_elemental));
+	WFIFOSET(inter_fd,size);
+	return 0;
+}
+
+int intif_parse_elemental_received(int fd)
+{
+	int len = RFIFOW(fd,2) - 5;
+	if( sizeof(struct s_elemental) != len )
+	{
+		if( battle_config.etc_log )
+			ShowError("intif: create elemental data size error %d != %d\n", sizeof(struct s_elemental), len);
+		return 0;
+	}
+
+	elemental->data_received((struct s_elemental*)RFIFOP(fd,5), RFIFOB(fd,4));
+	return 0;
+}
+
+int intif_elemental_request(int ele_id, int char_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,10);
+	WFIFOW(inter_fd,0) = 0x307d;
+	WFIFOL(inter_fd,2) = ele_id;
+	WFIFOL(inter_fd,6) = char_id;
+	WFIFOSET(inter_fd,10);
+	return 0;
+}
+
+int intif_elemental_delete(int ele_id)
+{
+	if (intif->CheckForCharServer())
+		return 0;
+
+	WFIFOHEAD(inter_fd,6);
+	WFIFOW(inter_fd,0) = 0x307e;
+	WFIFOL(inter_fd,2) = ele_id;
+	WFIFOSET(inter_fd,6);
+	return 0;
+}
+
+int intif_parse_elemental_deleted(int fd)
+{
+	if( RFIFOB(fd,2) != 1 )
+		ShowError("Elemental data delete failure\n");
+
+	return 0;
+}
+
+int intif_elemental_save(struct s_elemental *ele)
+{
+	int size = sizeof(struct s_elemental) + 4;
+
+	if( intif->CheckForCharServer() )
+		return 0;
+
+	WFIFOHEAD(inter_fd,size);
+	WFIFOW(inter_fd,0) = 0x307f;
+	WFIFOW(inter_fd,2) = size;
+	memcpy(WFIFOP(inter_fd,4), ele, sizeof(struct s_elemental));
+	WFIFOSET(inter_fd,size);
+	return 0;
+}
+
+int intif_parse_elemental_saved(int fd)
+{
+	if( RFIFOB(fd,2) != 1 )
+		ShowError("Elemental data save failure\n");
+
+	return 0;
+}
+
+void intif_request_accinfo( int u_fd, int aid, int group_lv, char* query ) {
+
+
+	WFIFOHEAD(inter_fd,2 + 4 + 4 + 4 + NAME_LENGTH);
+
+	WFIFOW(inter_fd,0) = 0x3007;
+	WFIFOL(inter_fd,2) = u_fd;
+	WFIFOL(inter_fd,6) = aid;
+	WFIFOL(inter_fd,10) = group_lv;
+    safestrncpy((char *)WFIFOP(inter_fd,14), query, NAME_LENGTH);
+
+	WFIFOSET(inter_fd,2 + 4 + 4 + 4 + NAME_LENGTH);
+
+	return;
+}
+
+void intif_parse_MessageToFD(int fd) {
+	int u_fd = RFIFOL(fd,4);
+
+	if( session[u_fd] && session[u_fd]->session_data ) {
+		int aid = RFIFOL(fd,8);
+		struct map_session_data * sd = session[u_fd]->session_data;
+		/* matching e.g. previous fd owner didn't dc during request or is still the same */
+		if( sd->bl.id == aid ) {
+			char msg[512];
+			safestrncpy(msg, (char*)RFIFOP(fd,12), RFIFOW(fd,2) - 12);
+			clif->message(u_fd,msg);
+		}
+
+	}
+
+	return;
+}
+
+//-----------------------------------------------------------------
+// Communication from the inter server
+// Return a 0 (false) if there were any errors.
+// 1, 2 if there are not enough to return the length of the packet if the packet processing
+int intif_parse(int fd)
+{
+	int packet_len, cmd;
+	cmd = RFIFOW(fd,0);
+    // Verify ID of the packet
+	if(cmd<0x3800 || cmd>=0x3800+(sizeof(packet_len_table)/sizeof(packet_len_table[0])) ||
+	   packet_len_table[cmd-0x3800]==0){
+	   	return 0;
+	}
+    // Check the length of the packet
+	packet_len = packet_len_table[cmd-0x3800];
+	if(packet_len==-1){
+		if(RFIFOREST(fd)<4)
+			return 2;
+		packet_len = RFIFOW(fd,2);
+	}
+	if((int)RFIFOREST(fd)<packet_len){
+		return 2;
+	}
+    // Processing branch
+	switch(cmd){
+	case 0x3800:
+		if (RFIFOL(fd,4) == 0xFF000000) //Normal announce.
+			clif->broadcast(NULL, (char *) RFIFOP(fd,16), packet_len-16, 0, ALL_CLIENT);
+		else //Color announce.
+			clif->broadcast2(NULL, (char *) RFIFOP(fd,16), packet_len-16, RFIFOL(fd,4), RFIFOW(fd,8), RFIFOW(fd,10), RFIFOW(fd,12), RFIFOW(fd,14), ALL_CLIENT);
+		break;
+	case 0x3801:	intif_parse_WisMessage(fd); break;
+	case 0x3802:	intif_parse_WisEnd(fd); break;
+	case 0x3803:	mapif_parse_WisToGM(fd); break;
+	case 0x3804:	intif_parse_Registers(fd); break;
+	case 0x3806:	intif_parse_ChangeNameOk(fd); break;
+	case 0x3807:	intif_parse_MessageToFD(fd); break;
+	case 0x3818:	intif_parse_LoadGuildStorage(fd); break;
+	case 0x3819:	intif_parse_SaveGuildStorage(fd); break;
+	case 0x3820:	intif_parse_PartyCreated(fd); break;
+	case 0x3821:	intif_parse_PartyInfo(fd); break;
+	case 0x3822:	intif_parse_PartyMemberAdded(fd); break;
+	case 0x3823:	intif_parse_PartyOptionChanged(fd); break;
+	case 0x3824:	intif_parse_PartyMemberWithdraw(fd); break;
+	case 0x3825:	intif_parse_PartyMove(fd); break;
+	case 0x3826:	intif_parse_PartyBroken(fd); break;
+	case 0x3827:	intif_parse_PartyMessage(fd); break;
+	case 0x3830:	intif_parse_GuildCreated(fd); break;
+	case 0x3831:	intif_parse_GuildInfo(fd); break;
+	case 0x3832:	intif_parse_GuildMemberAdded(fd); break;
+	case 0x3834:	intif_parse_GuildMemberWithdraw(fd); break;
+	case 0x3835:	intif_parse_GuildMemberInfoShort(fd); break;
+	case 0x3836:	intif_parse_GuildBroken(fd); break;
+	case 0x3837:	intif_parse_GuildMessage(fd); break;
+	case 0x3839:	intif_parse_GuildBasicInfoChanged(fd); break;
+	case 0x383a:	intif_parse_GuildMemberInfoChanged(fd); break;
+	case 0x383b:	intif_parse_GuildPosition(fd); break;
+	case 0x383c:	intif_parse_GuildSkillUp(fd); break;
+	case 0x383d:	intif_parse_GuildAlliance(fd); break;
+	case 0x383e:	intif_parse_GuildNotice(fd); break;
+	case 0x383f:	intif_parse_GuildEmblem(fd); break;
+	case 0x3840:	intif_parse_GuildCastleDataLoad(fd); break;
+	case 0x3843:	intif_parse_GuildMasterChanged(fd); break;
+
+	//Quest system
+	case 0x3860:	intif_parse_questlog(fd); break;
+	case 0x3861:	intif_parse_questsave(fd); break;
+
+// Mail System
+	case 0x3848:	intif_parse_Mail_inboxreceived(fd); break;
+	case 0x3849:	intif_parse_Mail_new(fd); break;
+	case 0x384a:	intif_parse_Mail_getattach(fd); break;
+	case 0x384b:	intif_parse_Mail_delete(fd); break;
+	case 0x384c:	intif_parse_Mail_return(fd); break;
+	case 0x384d:	intif_parse_Mail_send(fd); break;
+// Auction System
+	case 0x3850:	intif_parse_Auction_results(fd); break;
+	case 0x3851:	intif_parse_Auction_register(fd); break;
+	case 0x3852:	intif_parse_Auction_cancel(fd); break;
+	case 0x3853:	intif_parse_Auction_close(fd); break;
+	case 0x3854:	intif_parse_Auction_message(fd); break;
+	case 0x3855:	intif_parse_Auction_bid(fd); break;
+
+// Mercenary System
+	case 0x3870:	intif_parse_mercenary_received(fd); break;
+	case 0x3871:	intif_parse_mercenary_deleted(fd); break;
+	case 0x3872:	intif_parse_mercenary_saved(fd); break;
+// Elemental System
+	case 0x387c:	intif_parse_elemental_received(fd); break;
+	case 0x387d:	intif_parse_elemental_deleted(fd); break;
+	case 0x387e:	intif_parse_elemental_saved(fd); break;
+
+	case 0x3880:	intif_parse_CreatePet(fd); break;
+	case 0x3881:	intif_parse_RecvPetData(fd); break;
+	case 0x3882:	intif_parse_SavePetOk(fd); break;
+	case 0x3883:	intif_parse_DeletePetOk(fd); break;
+	case 0x3890:	intif_parse_CreateHomunculus(fd); break;
+	case 0x3891:	intif_parse_RecvHomunculusData(fd); break;
+	case 0x3892:	intif_parse_SaveHomunculusOk(fd); break;
+	case 0x3893:	intif_parse_DeleteHomunculusOk(fd); break;
+	default:
+		ShowError("intif_parse : unknown packet %d %x\n",fd,RFIFOW(fd,0));
+		return 0;
+	}
+    // Skip packet
+	RFIFOSKIP(fd,packet_len);
+	return 1;
+}
+
+/*=====================================
+* Default Functions : intif.h 
+* Generated by HerculesInterfaceMaker
+* created by Susu
+*-------------------------------------*/
+void intif_defaults(void) {
+	intif = &intif_s;
+
+	/* funcs */
+	
+	intif->parse = intif_parse;
+	
+	intif->broadcast = intif_broadcast;
+	intif->broadcast2 = intif_broadcast2;
+	intif->main_message = intif_main_message;
+	
+	intif->wis_message = intif_wis_message;
+	intif->wis_message_to_gm = intif_wis_message_to_gm;
+	
+	intif->saveregistry = intif_saveregistry;
+	intif->request_registry = intif_request_registry;
+	
+	intif->request_guild_storage = intif_request_guild_storage;
+	intif->send_guild_storage = intif_send_guild_storage;
+	
+	intif->create_party = intif_create_party;
+	intif->request_partyinfo = intif_request_partyinfo;
+	
+	intif->party_addmember = intif_party_addmember;
+	intif->party_changeoption = intif_party_changeoption;
+	intif->party_leave = intif_party_leave;
+	intif->party_changemap = intif_party_changemap;
+	intif->break_party = intif_break_party;
+	intif->party_message = intif_party_message;
+	intif->party_leaderchange = intif_party_leaderchange;
+	
+	intif->guild_create = intif_guild_create;
+	intif->guild_request_info = intif_guild_request_info;
+	intif->guild_addmember = intif_guild_addmember;
+	intif->guild_leave = intif_guild_leave;
+	intif->guild_memberinfoshort = intif_guild_memberinfoshort;
+	intif->guild_break = intif_guild_break;
+	intif->guild_message = intif_guild_message;
+	intif->guild_change_gm = intif_guild_change_gm;
+	intif->guild_change_basicinfo = intif_guild_change_basicinfo;
+	intif->guild_change_memberinfo = intif_guild_change_memberinfo;
+	intif->guild_position = intif_guild_position;
+	intif->guild_skillup = intif_guild_skillup;
+	intif->guild_alliance = intif_guild_alliance;
+	intif->guild_notice = intif_guild_notice;
+	intif->guild_emblem = intif_guild_emblem;
+	intif->guild_castle_dataload = intif_guild_castle_dataload;
+	intif->guild_castle_datasave = intif_guild_castle_datasave;
+	intif->request_petdata = intif_request_petdata;
+	intif->save_petdata = intif_save_petdata;
+	intif->delete_petdata = intif_delete_petdata;
+	intif->rename = intif_rename;
+	intif->homunculus_create = intif_homunculus_create;
+	intif->homunculus_requestload = intif_homunculus_requestload;
+	intif->homunculus_requestsave = intif_homunculus_requestsave;
+	intif->homunculus_requestdelete = intif_homunculus_requestdelete;
+	/******QUEST SYTEM*******/
+	intif->request_questlog = intif_request_questlog;
+	intif->quest_save = intif_quest_save;
+	// MERCENARY SYSTEM
+	intif->mercenary_create = intif_mercenary_create;
+	intif->mercenary_request = intif_mercenary_request;
+	intif->mercenary_delete = intif_mercenary_delete;
+	intif->mercenary_save = intif_mercenary_save;
+	// MAIL SYSTEM
+	intif->Mail_requestinbox = intif_Mail_requestinbox;
+	intif->Mail_read = intif_Mail_read;
+	intif->Mail_getattach = intif_Mail_getattach;
+	intif->Mail_delete = intif_Mail_delete;
+	intif->Mail_return = intif_Mail_return;
+	intif->Mail_send = intif_Mail_send;
+	// AUCTION SYSTEM
+	intif->Auction_requestlist = intif_Auction_requestlist;
+	intif->Auction_register = intif_Auction_register;
+	intif->Auction_cancel = intif_Auction_cancel;
+	intif->Auction_close = intif_Auction_close;
+	intif->Auction_bid = intif_Auction_bid;
+	// ELEMENTAL SYSTEM
+	intif->elemental_create = intif_elemental_create;
+	intif->elemental_request = intif_elemental_request;
+	intif->elemental_delete = intif_elemental_delete;
+	intif->elemental_save = intif_elemental_save;
+	/* @accinfo */
+	intif->request_accinfo = intif_request_accinfo;
+	
+	intif->CheckForCharServer = CheckForCharServer;
+}
diff --git a/src/map/map.c b/src/map/map.c
index 5db5431a8..88e254d03 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -5159,6 +5159,7 @@ void map_hp_symbols(void) {
 	HPM->share(iDuel,"iDuel");
 	HPM->share(elemental,"elemental");
 	HPM->share(intif,"intif");
+	HPM->share(mercenary,"mercenary");
 
 
 	/* partial */
@@ -5201,6 +5202,7 @@ void map_load_defaults(void) {
 	iDuel_defaults();
 	elemental_defaults();
 	intif_defaults();
+	mercenary_defaults();
 }
 int do_init(int argc, char *argv[])
 {
@@ -5396,7 +5398,7 @@ int do_init(int argc, char *argv[])
 	storage->init();
 	do_init_pet();
 	homun->init();
-	do_init_mercenary();
+	mercenary->do_init_mercenary();
 	elemental->do_init_elemental();
 	do_init_quest();
 	do_init_npc();
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 72ed7628a..d6d5ce081 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -1,511 +1,551 @@
-// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
-// See the LICENSE file
-// Portions Copyright (c) Athena Dev Teams
-
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mmo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
-
-#include "log.h"
-#include "clif.h"
-#include "chrif.h"
-#include "intif.h"
-#include "itemdb.h"
-#include "map.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
-#include "mob.h"
-#include "pet.h"
-#include "battle.h"
-#include "party.h"
-#include "guild.h"
-#include "atcommand.h"
-#include "script.h"
-#include "npc.h"
-#include "trade.h"
-#include "unit.h"
-#include "mercenary.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS]; // Mercenary Database
-
-int merc_search_index(int class_)
-{
-	int i;
-	ARR_FIND(0, MAX_MERCENARY_CLASS, i, mercenary_db[i].class_ == class_);
-	return (i == MAX_MERCENARY_CLASS)?-1:i;
-}
-
-bool merc_class(int class_)
-{
-	return (bool)(merc_search_index(class_) > -1);
-}
-
-struct view_data * merc_get_viewdata(int class_)
-{
-	int i = merc_search_index(class_);
-	if( i < 0 )
-		return 0;
-
-	return &mercenary_db[i].vd;
-}
-
-int merc_create(struct map_session_data *sd, int class_, unsigned int lifetime)
-{
-	struct s_mercenary merc;
-	struct s_mercenary_db *db;
-	int i;
-	nullpo_retr(0,sd);
-
-	if( (i = merc_search_index(class_)) < 0 )
-		return 0;
-
-	db = &mercenary_db[i];
-	memset(&merc,0,sizeof(struct s_mercenary));
-
-	merc.char_id = sd->status.char_id;
-	merc.class_ = class_;
-	merc.hp = db->status.max_hp;
-	merc.sp = db->status.max_sp;
-	merc.life_time = lifetime;
-
-	// Request Char Server to create this mercenary
-	intif->mercenary_create(&merc);
-
-	return 1;
-}
-
-int mercenary_get_lifetime(struct mercenary_data *md)
-{
-	const struct TimerData * td;
-	if( md == NULL || md->contract_timer == INVALID_TIMER )
-		return 0;
-
-	td = iTimer->get_timer(md->contract_timer);
-	return (td != NULL) ? DIFF_TICK(td->tick, iTimer->gettick()) : 0;
-}
-
-int mercenary_get_guild(struct mercenary_data *md)
-{
-	int class_;
-
-	if( md == NULL || md->db == NULL )
-		return -1;
-
-	class_ = md->db->class_;
-
-	if( class_ >= 6017 && class_ <= 6026 )
-		return ARCH_MERC_GUILD;
-	if( class_ >= 6027 && class_ <= 6036 )
-		return SPEAR_MERC_GUILD;
-	if( class_ >= 6037 && class_ <= 6046 )
-		return SWORD_MERC_GUILD;
-
-	return -1;
-}
-
-int mercenary_get_faith(struct mercenary_data *md)
-{
-	struct map_session_data *sd;
-	int class_;
-
-	if( md == NULL || md->db == NULL || (sd = md->master) == NULL )
-		return 0;
-
-	class_ = md->db->class_;
-
-	if( class_ >= 6017 && class_ <= 6026 )
-		return sd->status.arch_faith;
-	if( class_ >= 6027 && class_ <= 6036 )
-		return sd->status.spear_faith;
-	if( class_ >= 6037 && class_ <= 6046 )
-		return sd->status.sword_faith;
-
-	return 0;
-}
-
-int mercenary_set_faith(struct mercenary_data *md, int value)
-{
-	struct map_session_data *sd;
-	int class_, *faith;
-
-	if( md == NULL || md->db == NULL || (sd = md->master) == NULL )
-		return 0;
-
-	class_ = md->db->class_;
-
-	if( class_ >= 6017 && class_ <= 6026 )
-		faith = &sd->status.arch_faith;
-	else if( class_ >= 6027 && class_ <= 6036 )
-		faith = &sd->status.spear_faith;
-	else if( class_ >= 6037 && class_ <= 6046 )
-		faith = &sd->status.sword_faith;
-	else
-		return 0;
-
-	*faith += value;
-	*faith = cap_value(*faith, 0, SHRT_MAX);
-	clif->mercenary_updatestatus(sd, SP_MERCFAITH);
-
-	return 0;
-}
-
-int mercenary_get_calls(struct mercenary_data *md)
-{
-	struct map_session_data *sd;
-	int class_;
-
-	if( md == NULL || md->db == NULL || (sd = md->master) == NULL )
-		return 0;
-
-	class_ = md->db->class_;
-
-	if( class_ >= 6017 && class_ <= 6026 )
-		return sd->status.arch_calls;
-	if( class_ >= 6027 && class_ <= 6036 )
-		return sd->status.spear_calls;
-	if( class_ >= 6037 && class_ <= 6046 )
-		return sd->status.sword_calls;
-
-	return 0;
-}
-
-int mercenary_set_calls(struct mercenary_data *md, int value)
-{
-	struct map_session_data *sd;
-	int class_, *calls;
-
-	if( md == NULL || md->db == NULL || (sd = md->master) == NULL )
-		return 0;
-
-	class_ = md->db->class_;
-
-	if( class_ >= 6017 && class_ <= 6026 )
-		calls = &sd->status.arch_calls;
-	else if( class_ >= 6027 && class_ <= 6036 )
-		calls = &sd->status.spear_calls;
-	else if( class_ >= 6037 && class_ <= 6046 )
-		calls = &sd->status.sword_calls;
-	else
-		return 0;
-
-	*calls += value;
-	*calls = cap_value(*calls, 0, INT_MAX);
-
-	return 0;
-}
-
-int mercenary_save(struct mercenary_data *md)
-{
-	md->mercenary.hp = md->battle_status.hp;
-	md->mercenary.sp = md->battle_status.sp;
-	md->mercenary.life_time = mercenary_get_lifetime(md);
-
-	intif->mercenary_save(&md->mercenary);
-	return 1;
-}
-
-static int merc_contract_end(int tid, unsigned int tick, int id, intptr_t data)
-{
-	struct map_session_data *sd;
-	struct mercenary_data *md;
-
-	if( (sd = iMap->id2sd(id)) == NULL )
-		return 1;
-	if( (md = sd->md) == NULL )
-		return 1;
-
-	if( md->contract_timer != tid )
-	{
-		ShowError("merc_contract_end %d != %d.\n", md->contract_timer, tid);
-		return 0;
-	}
-
-	md->contract_timer = INVALID_TIMER;
-	merc_delete(md, 0); // Mercenary soldier's duty hour is over.
-
-	return 0;
-}
-
-int merc_delete(struct mercenary_data *md, int reply)
-{
-	struct map_session_data *sd = md->master;
-	md->mercenary.life_time = 0;
-
-	merc_contract_stop(md);
-
-	if( !sd )
-		return unit_free(&md->bl, CLR_OUTSIGHT);
-
-	if( md->devotion_flag )
-	{
-		md->devotion_flag = 0;
-		status_change_end(&sd->bl, SC_DEVOTION, INVALID_TIMER);
-	}
-
-	switch( reply )
-	{
-		case 0: mercenary_set_faith(md, 1); break; // +1 Loyalty on Contract ends.
-		case 1: mercenary_set_faith(md, -1); break; // -1 Loyalty on Mercenary killed
-	}
-
-	clif->mercenary_message(sd, reply);
-	return unit_remove_map(&md->bl, CLR_OUTSIGHT);
-}
-
-void merc_contract_stop(struct mercenary_data *md)
-{
-	nullpo_retv(md);
-	if( md->contract_timer != INVALID_TIMER )
-		iTimer->delete_timer(md->contract_timer, merc_contract_end);
-	md->contract_timer = INVALID_TIMER;
-}
-
-void merc_contract_init(struct mercenary_data *md)
-{
-	if( md->contract_timer == INVALID_TIMER )
-		md->contract_timer = iTimer->add_timer(iTimer->gettick() + md->mercenary.life_time, merc_contract_end, md->master->bl.id, 0);
-
-	md->regen.state.block = 0;
-}
-
-int merc_data_received(struct s_mercenary *merc, bool flag)
-{
-	struct map_session_data *sd;
-	struct mercenary_data *md;
-	struct s_mercenary_db *db;
-	int i = merc_search_index(merc->class_);
-
-	if( (sd = iMap->charid2sd(merc->char_id)) == NULL )
-		return 0;
-	if( !flag || i < 0 )
-	{ // Not created - loaded - DB info
-		sd->status.mer_id = 0;
-		return 0;
-	}
-
-	db = &mercenary_db[i];
-	if( !sd->md )
-	{
-		sd->md = md = (struct mercenary_data*)aCalloc(1,sizeof(struct mercenary_data));
-		md->bl.type = BL_MER;
-		md->bl.id = npc_get_new_npc_id();
-		md->devotion_flag = 0;
-
-		md->master = sd;
-		md->db = db;
-		memcpy(&md->mercenary, merc, sizeof(struct s_mercenary));
-		iStatus->set_viewdata(&md->bl, md->mercenary.class_);
-		iStatus->change_init(&md->bl);
-		unit_dataset(&md->bl);
-		md->ud.dir = sd->ud.dir;
-
-		md->bl.m = sd->bl.m;
-		md->bl.x = sd->bl.x;
-		md->bl.y = sd->bl.y;
-		unit_calc_pos(&md->bl, sd->bl.x, sd->bl.y, sd->ud.dir);
-		md->bl.x = md->ud.to_x;
-		md->bl.y = md->ud.to_y;
-
-		iMap->addiddb(&md->bl);
-		status_calc_mercenary(md,1);
-		md->contract_timer = INVALID_TIMER;
-		merc_contract_init(md);
-	}
-	else
-	{
-		memcpy(&sd->md->mercenary, merc, sizeof(struct s_mercenary));
-		md = sd->md;
-	}
-
-	if( sd->status.mer_id == 0 )
-		mercenary_set_calls(md, 1);
-	sd->status.mer_id = merc->mercenary_id;
-
-	if( md && md->bl.prev == NULL && sd->bl.prev != NULL )
-	{
-		iMap->addblock(&md->bl);
-		clif->spawn(&md->bl);
-		clif->mercenary_info(sd);
-		clif->mercenary_skillblock(sd);
-	}
-
-	return 1;
-}
-
-void mercenary_heal(struct mercenary_data *md, int hp, int sp)
-{
-	if( hp )
-		clif->mercenary_updatestatus(md->master, SP_HP);
-	if( sp )
-		clif->mercenary_updatestatus(md->master, SP_SP);
-}
-
-int mercenary_dead(struct mercenary_data *md)
-{
-	merc_delete(md, 1);
-	return 0;
-}
-
-int mercenary_killbonus(struct mercenary_data *md)
-{
-	const enum sc_type scs[] = { SC_MER_FLEE, SC_MER_ATK, SC_MER_HP, SC_MER_SP, SC_MER_HIT };
-	int index = rnd() % ARRAYLENGTH(scs);
-
-    sc_start(&md->bl, scs[index], 100, rnd() % 5, 600000);
-	return 0;
-}
-
-int mercenary_kills(struct mercenary_data *md)
-{
-	md->mercenary.kill_count++;
-	md->mercenary.kill_count = cap_value(md->mercenary.kill_count, 0, INT_MAX);
-
-	if( (md->mercenary.kill_count % 50) == 0 )
-	{
-		mercenary_set_faith(md, 1);
-		mercenary_killbonus(md);
-	}
-
-	if( md->master )
-		clif->mercenary_updatestatus(md->master, SP_MERCKILLS);
-
-	return 0;
-}
-
-int mercenary_checkskill(struct mercenary_data *md, uint16 skill_id)
-{
-	int i = skill_id - MC_SKILLBASE;
-
-	if( !md || !md->db )
-		return 0;
-	if( md->db->skill[i].id == skill_id )
-		return md->db->skill[i].lv;
-
-	return 0;
-}
-
-static bool read_mercenarydb_sub(char* str[], int columns, int current)
-{
-	int ele;
-	struct s_mercenary_db *db;
-	struct status_data *status;
-
-	db = &mercenary_db[current];
-	db->class_ = atoi(str[0]);
-	safestrncpy(db->sprite, str[1], NAME_LENGTH);
-	safestrncpy(db->name, str[2], NAME_LENGTH);
-	db->lv = atoi(str[3]);
-
-	status = &db->status;
-	db->vd.class_ = db->class_;
-
-	status->max_hp = atoi(str[4]);
-	status->max_sp = atoi(str[5]);
-	status->rhw.range = atoi(str[6]);
-	status->rhw.atk = atoi(str[7]);
-	status->rhw.atk2 = status->rhw.atk + atoi(str[8]);
-	status->def = atoi(str[9]);
-	status->mdef = atoi(str[10]);
-	status->str = atoi(str[11]);
-	status->agi = atoi(str[12]);
-	status->vit = atoi(str[13]);
-	status->int_ = atoi(str[14]);
-	status->dex = atoi(str[15]);
-	status->luk = atoi(str[16]);
-	db->range2 = atoi(str[17]);
-	db->range3 = atoi(str[18]);
-	status->size = atoi(str[19]);
-	status->race = atoi(str[20]);
-
-	ele = atoi(str[21]);
-	status->def_ele = ele%10;
-	status->ele_lv = ele/20;
-	if( status->def_ele >= ELE_MAX )
-	{
-		ShowWarning("Mercenary %d has invalid element type %d (max element is %d)\n", db->class_, status->def_ele, ELE_MAX - 1);
-		status->def_ele = ELE_NEUTRAL;
-	}
-	if( status->ele_lv < 1 || status->ele_lv > 4 )
-	{
-		ShowWarning("Mercenary %d has invalid element level %d (max is 4)\n", db->class_, status->ele_lv);
-		status->ele_lv = 1;
-	}
-
-	status->aspd_rate = 1000;
-	status->speed = atoi(str[22]);
-	status->adelay = atoi(str[23]);
-	status->amotion = atoi(str[24]);
-	status->dmotion = atoi(str[25]);
-
-	return true;
-}
-
-int read_mercenarydb(void)
-{
-	memset(mercenary_db,0,sizeof(mercenary_db));
-	sv->readdb(iMap->db_path, "mercenary_db.txt", ',', 26, 26, MAX_MERCENARY_CLASS, &read_mercenarydb_sub);
-
-	return 0;
-}
-
-static bool read_mercenary_skilldb_sub(char* str[], int columns, int current)
-{// <merc id>,<skill id>,<skill level>
-	struct s_mercenary_db *db;
-	int i, class_;
-	uint16 skill_id, skill_lv;
-
-	class_ = atoi(str[0]);
-	ARR_FIND(0, MAX_MERCENARY_CLASS, i, class_ == mercenary_db[i].class_);
-	if( i == MAX_MERCENARY_CLASS )
-	{
-		ShowError("read_mercenary_skilldb : Class %d not found in mercenary_db for skill entry.\n", class_);
-		return false;
-	}
-	
-	skill_id = atoi(str[1]);
-	if( skill_id < MC_SKILLBASE || skill_id >= MC_SKILLBASE + MAX_MERCSKILL )
-	{
-		ShowError("read_mercenary_skilldb : Skill %d out of range.\n", skill_id);
-		return false;
-	}
-
-	db = &mercenary_db[i];
-	skill_lv = atoi(str[2]);
-
-	i = skill_id - MC_SKILLBASE;
-	db->skill[i].id = skill_id;
-	db->skill[i].lv = skill_lv;
-
-	return true;
-}
-
-int read_mercenary_skilldb(void)
-{
-	sv->readdb(iMap->db_path, "mercenary_skill_db.txt", ',', 3, 3, -1, &read_mercenary_skilldb_sub);
-
-	return 0;
-}
-
-int do_init_mercenary(void)
-{
-	read_mercenarydb();
-	read_mercenary_skilldb();
-	
-	//add_timer_func_list(mercenary_contract, "mercenary_contract");
-	return 0;
-}
-
-int do_final_mercenary(void);
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.

+// See the LICENSE file

+// Portions Copyright (c) Athena Dev Teams

+

+#include "../common/cbasetypes.h"

+#include "../common/malloc.h"

+#include "../common/socket.h"

+#include "../common/timer.h"

+#include "../common/nullpo.h"

+#include "../common/mmo.h"

+#include "../common/random.h"

+#include "../common/showmsg.h"

+#include "../common/strlib.h"

+#include "../common/utils.h"

+

+#include "log.h"

+#include "clif.h"

+#include "chrif.h"

+#include "intif.h"

+#include "itemdb.h"

+#include "map.h"

+#include "pc.h"

+#include "status.h"

+#include "skill.h"

+#include "mob.h"

+#include "pet.h"

+#include "battle.h"

+#include "party.h"

+#include "guild.h"

+#include "atcommand.h"

+#include "script.h"

+#include "npc.h"

+#include "trade.h"

+#include "unit.h"

+#include "mercenary.h"

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+#include <math.h>

+

+struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS]; // Mercenary Database

+

+int merc_search_index(int class_)

+{

+	int i;

+	ARR_FIND(0, MAX_MERCENARY_CLASS, i, mercenary_db[i].class_ == class_);

+	return (i == MAX_MERCENARY_CLASS)?-1:i;

+}

+

+bool merc_class(int class_)

+{

+	return (bool)(merc_search_index(class_) > -1);

+}

+

+struct view_data * merc_get_viewdata(int class_)

+{

+	int i = merc_search_index(class_);

+	if( i < 0 )

+		return 0;

+

+	return &mercenary_db[i].vd;

+}

+

+int merc_create(struct map_session_data *sd, int class_, unsigned int lifetime)

+{

+	struct s_mercenary merc;

+	struct s_mercenary_db *db;

+	int i;

+	nullpo_retr(0,sd);

+

+	if( (i = merc_search_index(class_)) < 0 )

+		return 0;

+

+	db = &mercenary_db[i];

+	memset(&merc,0,sizeof(struct s_mercenary));

+

+	merc.char_id = sd->status.char_id;

+	merc.class_ = class_;

+	merc.hp = db->status.max_hp;

+	merc.sp = db->status.max_sp;

+	merc.life_time = lifetime;

+

+	// Request Char Server to create this mercenary

+	intif->mercenary_create(&merc);

+

+	return 1;

+}

+

+int mercenary_get_lifetime(struct mercenary_data *md)

+{

+	const struct TimerData * td;

+	if( md == NULL || md->contract_timer == INVALID_TIMER )

+		return 0;

+

+	td = iTimer->get_timer(md->contract_timer);

+	return (td != NULL) ? DIFF_TICK(td->tick, iTimer->gettick()) : 0;

+}

+

+int mercenary_get_guild(struct mercenary_data *md)

+{

+	int class_;

+

+	if( md == NULL || md->db == NULL )

+		return -1;

+

+	class_ = md->db->class_;

+

+	if( class_ >= 6017 && class_ <= 6026 )

+		return ARCH_MERC_GUILD;

+	if( class_ >= 6027 && class_ <= 6036 )

+		return SPEAR_MERC_GUILD;

+	if( class_ >= 6037 && class_ <= 6046 )

+		return SWORD_MERC_GUILD;

+

+	return -1;

+}

+

+int mercenary_get_faith(struct mercenary_data *md)

+{

+	struct map_session_data *sd;

+	int class_;

+

+	if( md == NULL || md->db == NULL || (sd = md->master) == NULL )

+		return 0;

+

+	class_ = md->db->class_;

+

+	if( class_ >= 6017 && class_ <= 6026 )

+		return sd->status.arch_faith;

+	if( class_ >= 6027 && class_ <= 6036 )

+		return sd->status.spear_faith;

+	if( class_ >= 6037 && class_ <= 6046 )

+		return sd->status.sword_faith;

+

+	return 0;

+}

+

+int mercenary_set_faith(struct mercenary_data *md, int value)

+{

+	struct map_session_data *sd;

+	int class_, *faith;

+

+	if( md == NULL || md->db == NULL || (sd = md->master) == NULL )

+		return 0;

+

+	class_ = md->db->class_;

+

+	if( class_ >= 6017 && class_ <= 6026 )

+		faith = &sd->status.arch_faith;

+	else if( class_ >= 6027 && class_ <= 6036 )

+		faith = &sd->status.spear_faith;

+	else if( class_ >= 6037 && class_ <= 6046 )

+		faith = &sd->status.sword_faith;

+	else

+		return 0;

+

+	*faith += value;

+	*faith = cap_value(*faith, 0, SHRT_MAX);

+	clif->mercenary_updatestatus(sd, SP_MERCFAITH);

+

+	return 0;

+}

+

+int mercenary_get_calls(struct mercenary_data *md)

+{

+	struct map_session_data *sd;

+	int class_;

+

+	if( md == NULL || md->db == NULL || (sd = md->master) == NULL )

+		return 0;

+

+	class_ = md->db->class_;

+

+	if( class_ >= 6017 && class_ <= 6026 )

+		return sd->status.arch_calls;

+	if( class_ >= 6027 && class_ <= 6036 )

+		return sd->status.spear_calls;

+	if( class_ >= 6037 && class_ <= 6046 )

+		return sd->status.sword_calls;

+

+	return 0;

+}

+

+int mercenary_set_calls(struct mercenary_data *md, int value)

+{

+	struct map_session_data *sd;

+	int class_, *calls;

+

+	if( md == NULL || md->db == NULL || (sd = md->master) == NULL )

+		return 0;

+

+	class_ = md->db->class_;

+

+	if( class_ >= 6017 && class_ <= 6026 )

+		calls = &sd->status.arch_calls;

+	else if( class_ >= 6027 && class_ <= 6036 )

+		calls = &sd->status.spear_calls;

+	else if( class_ >= 6037 && class_ <= 6046 )

+		calls = &sd->status.sword_calls;

+	else

+		return 0;

+

+	*calls += value;

+	*calls = cap_value(*calls, 0, INT_MAX);

+

+	return 0;

+}

+

+int mercenary_save(struct mercenary_data *md)

+{

+	md->mercenary.hp = md->battle_status.hp;

+	md->mercenary.sp = md->battle_status.sp;

+	md->mercenary.life_time = mercenary->get_lifetime(md);

+

+	intif->mercenary_save(&md->mercenary);

+	return 1;

+}

+

+static int merc_contract_end(int tid, unsigned int tick, int id, intptr_t data)

+{

+	struct map_session_data *sd;

+	struct mercenary_data *md;

+

+	if( (sd = iMap->id2sd(id)) == NULL )

+		return 1;

+	if( (md = sd->md) == NULL )

+		return 1;

+

+	if( md->contract_timer != tid )

+	{

+		ShowError("merc_contract_end %d != %d.\n", md->contract_timer, tid);

+		return 0;

+	}

+

+	md->contract_timer = INVALID_TIMER;

+	mercenary->merc_delete(md, 0); // Mercenary soldier's duty hour is over.

+

+	return 0;

+}

+

+int merc_delete(struct mercenary_data *md, int reply)

+{

+	struct map_session_data *sd = md->master;

+	md->mercenary.life_time = 0;

+

+	mercenary->merc_contract_stop(md);

+

+	if( !sd )

+		return unit_free(&md->bl, CLR_OUTSIGHT);

+

+	if( md->devotion_flag )

+	{

+		md->devotion_flag = 0;

+		status_change_end(&sd->bl, SC_DEVOTION, INVALID_TIMER);

+	}

+

+	switch( reply )

+	{

+		case 0: mercenary->set_faith(md, 1); break; // +1 Loyalty on Contract ends.

+		case 1: mercenary->set_faith(md, -1); break; // -1 Loyalty on Mercenary killed

+	}

+

+	clif->mercenary_message(sd, reply);

+	return unit_remove_map(&md->bl, CLR_OUTSIGHT);

+}

+

+void merc_contract_stop(struct mercenary_data *md)

+{

+	nullpo_retv(md);

+	if( md->contract_timer != INVALID_TIMER )

+		iTimer->delete_timer(md->contract_timer, merc_contract_end);

+	md->contract_timer = INVALID_TIMER;

+}

+

+void merc_contract_init(struct mercenary_data *md)

+{

+	if( md->contract_timer == INVALID_TIMER )

+		md->contract_timer = iTimer->add_timer(iTimer->gettick() + md->mercenary.life_time, merc_contract_end, md->master->bl.id, 0);

+

+	md->regen.state.block = 0;

+}

+

+int merc_data_received(struct s_mercenary *merc, bool flag)

+{

+	struct map_session_data *sd;

+	struct mercenary_data *md;

+	struct s_mercenary_db *db;

+	int i = merc_search_index(merc->class_);

+

+	if( (sd = iMap->charid2sd(merc->char_id)) == NULL )

+		return 0;

+	if( !flag || i < 0 )

+	{ // Not created - loaded - DB info

+		sd->status.mer_id = 0;

+		return 0;

+	}

+

+	db = &mercenary_db[i];

+	if( !sd->md )

+	{

+		sd->md = md = (struct mercenary_data*)aCalloc(1,sizeof(struct mercenary_data));

+		md->bl.type = BL_MER;

+		md->bl.id = npc_get_new_npc_id();

+		md->devotion_flag = 0;

+

+		md->master = sd;

+		md->db = db;

+		memcpy(&md->mercenary, merc, sizeof(struct s_mercenary));

+		iStatus->set_viewdata(&md->bl, md->mercenary.class_);

+		iStatus->change_init(&md->bl);

+		unit_dataset(&md->bl);

+		md->ud.dir = sd->ud.dir;

+

+		md->bl.m = sd->bl.m;

+		md->bl.x = sd->bl.x;

+		md->bl.y = sd->bl.y;

+		unit_calc_pos(&md->bl, sd->bl.x, sd->bl.y, sd->ud.dir);

+		md->bl.x = md->ud.to_x;

+		md->bl.y = md->ud.to_y;

+

+		iMap->addiddb(&md->bl);

+		status_calc_mercenary(md,1);

+		md->contract_timer = INVALID_TIMER;

+		merc_contract_init(md);

+	}

+	else

+	{

+		memcpy(&sd->md->mercenary, merc, sizeof(struct s_mercenary));

+		md = sd->md;

+	}

+

+	if( sd->status.mer_id == 0 )

+		mercenary->set_calls(md, 1);

+	sd->status.mer_id = merc->mercenary_id;

+

+	if( md && md->bl.prev == NULL && sd->bl.prev != NULL )

+	{

+		iMap->addblock(&md->bl);

+		clif->spawn(&md->bl);

+		clif->mercenary_info(sd);

+		clif->mercenary_skillblock(sd);

+	}

+

+	return 1;

+}

+

+void mercenary_heal(struct mercenary_data *md, int hp, int sp)

+{

+	if( hp )

+		clif->mercenary_updatestatus(md->master, SP_HP);

+	if( sp )

+		clif->mercenary_updatestatus(md->master, SP_SP);

+}

+

+int mercenary_dead(struct mercenary_data *md)

+{

+	mercenary->merc_delete(md, 1);

+	return 0;

+}

+

+int mercenary_killbonus(struct mercenary_data *md)

+{

+	const enum sc_type scs[] = { SC_MER_FLEE, SC_MER_ATK, SC_MER_HP, SC_MER_SP, SC_MER_HIT };

+	int index = rnd() % ARRAYLENGTH(scs);

+

+    sc_start(&md->bl, scs[index], 100, rnd() % 5, 600000);

+	return 0;

+}

+

+int mercenary_kills(struct mercenary_data *md)

+{

+	md->mercenary.kill_count++;

+	md->mercenary.kill_count = cap_value(md->mercenary.kill_count, 0, INT_MAX);

+

+	if( (md->mercenary.kill_count % 50) == 0 )

+	{

+		mercenary->set_faith(md, 1);

+		mercenary_killbonus(md);

+	}

+

+	if( md->master )

+		clif->mercenary_updatestatus(md->master, SP_MERCKILLS);

+

+	return 0;

+}

+

+int mercenary_checkskill(struct mercenary_data *md, uint16 skill_id)

+{

+	int i = skill_id - MC_SKILLBASE;

+

+	if( !md || !md->db )

+		return 0;

+	if( md->db->skill[i].id == skill_id )

+		return md->db->skill[i].lv;

+

+	return 0;

+}

+

+static bool read_mercenarydb_sub(char* str[], int columns, int current)

+{

+	int ele;

+	struct s_mercenary_db *db;

+	struct status_data *status;

+

+	db = &mercenary_db[current];

+	db->class_ = atoi(str[0]);

+	safestrncpy(db->sprite, str[1], NAME_LENGTH);

+	safestrncpy(db->name, str[2], NAME_LENGTH);

+	db->lv = atoi(str[3]);

+

+	status = &db->status;

+	db->vd.class_ = db->class_;

+

+	status->max_hp = atoi(str[4]);

+	status->max_sp = atoi(str[5]);

+	status->rhw.range = atoi(str[6]);

+	status->rhw.atk = atoi(str[7]);

+	status->rhw.atk2 = status->rhw.atk + atoi(str[8]);

+	status->def = atoi(str[9]);

+	status->mdef = atoi(str[10]);

+	status->str = atoi(str[11]);

+	status->agi = atoi(str[12]);

+	status->vit = atoi(str[13]);

+	status->int_ = atoi(str[14]);

+	status->dex = atoi(str[15]);

+	status->luk = atoi(str[16]);

+	db->range2 = atoi(str[17]);

+	db->range3 = atoi(str[18]);

+	status->size = atoi(str[19]);

+	status->race = atoi(str[20]);

+

+	ele = atoi(str[21]);

+	status->def_ele = ele%10;

+	status->ele_lv = ele/20;

+	if( status->def_ele >= ELE_MAX )

+	{

+		ShowWarning("Mercenary %d has invalid element type %d (max element is %d)\n", db->class_, status->def_ele, ELE_MAX - 1);

+		status->def_ele = ELE_NEUTRAL;

+	}

+	if( status->ele_lv < 1 || status->ele_lv > 4 )

+	{

+		ShowWarning("Mercenary %d has invalid element level %d (max is 4)\n", db->class_, status->ele_lv);

+		status->ele_lv = 1;

+	}

+

+	status->aspd_rate = 1000;

+	status->speed = atoi(str[22]);

+	status->adelay = atoi(str[23]);

+	status->amotion = atoi(str[24]);

+	status->dmotion = atoi(str[25]);

+

+	return true;

+}

+

+int read_mercenarydb(void)

+{

+	memset(mercenary_db,0,sizeof(mercenary_db));

+	sv->readdb(iMap->db_path, "mercenary_db.txt", ',', 26, 26, MAX_MERCENARY_CLASS, &read_mercenarydb_sub);

+

+	return 0;

+}

+

+static bool read_mercenary_skilldb_sub(char* str[], int columns, int current)

+{// <merc id>,<skill id>,<skill level>

+	struct s_mercenary_db *db;

+	int i, class_;

+	uint16 skill_id, skill_lv;

+

+	class_ = atoi(str[0]);

+	ARR_FIND(0, MAX_MERCENARY_CLASS, i, class_ == mercenary_db[i].class_);

+	if( i == MAX_MERCENARY_CLASS )

+	{

+		ShowError("read_mercenary_skilldb : Class %d not found in mercenary_db for skill entry.\n", class_);

+		return false;

+	}

+	

+	skill_id = atoi(str[1]);

+	if( skill_id < MC_SKILLBASE || skill_id >= MC_SKILLBASE + MAX_MERCSKILL )

+	{

+		ShowError("read_mercenary_skilldb : Skill %d out of range.\n", skill_id);

+		return false;

+	}

+

+	db = &mercenary_db[i];

+	skill_lv = atoi(str[2]);

+

+	i = skill_id - MC_SKILLBASE;

+	db->skill[i].id = skill_id;

+	db->skill[i].lv = skill_lv;

+

+	return true;

+}

+

+int read_mercenary_skilldb(void)

+{

+	sv->readdb(iMap->db_path, "mercenary_skill_db.txt", ',', 3, 3, -1, &read_mercenary_skilldb_sub);

+

+	return 0;

+}

+

+int do_init_mercenary(void)

+{

+	mercenary->read_mercenarydb();

+	mercenary->read_skilldb();

+	

+	//add_timer_func_list(mercenary_contract, "mercenary_contract");

+	return 0;

+}

+

+int do_final_mercenary(void);

+

+/*=====================================

+* Default Functions : mercenary.h 

+* Generated by HerculesInterfaceMaker

+* created by Susu

+*-------------------------------------*/

+void mercenary_defaults(void) {

+	mercenary = &mercenary_s;

+
	/* vars */

+	

+	mercenary->mercenary_db[MAX_MERCENARY_CLASS] = mercenary_db[MAX_MERCENARY_CLASS];

+
	/* funcs */

+	

+	mercenary->merc_class = merc_class;

+	mercenary->merc_get_viewdata = merc_get_viewdata;

+	

+	mercenary->merc_create = merc_create;

+	mercenary->merc_data_received = merc_data_received;

+	mercenary->save = mercenary_save;

+	

+	mercenary->heal = mercenary_heal;

+	mercenary->dead = mercenary_dead;

+	

+	mercenary->merc_delete = merc_delete;

+	mercenary->merc_contract_stop = merc_contract_stop;

+	

+	mercenary->get_lifetime = mercenary_get_lifetime;

+	mercenary->get_guild = mercenary_get_guild;

+	mercenary->get_faith = mercenary_get_faith;

+	mercenary->set_faith = mercenary_set_faith;

+	mercenary->get_calls = mercenary_get_calls;

+	mercenary->set_calls = mercenary_set_calls;

+	mercenary->kills = mercenary_kills;

+	

+	mercenary->checkskill = mercenary_checkskill;

+	mercenary->read_mercenarydb = read_mercenarydb;

+	mercenary->read_skilldb = read_mercenary_skilldb;

+	

+	mercenary->do_init_mercenary = do_init_mercenary;

+}

diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 994c7aaa4..5c69f9b60 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -1,83 +1,97 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _MERCENARY_H_
-#define _MERCENARY_H_
-
-#include "status.h" // struct status_data, struct status_change
-#include "unit.h" // struct unit_data
-
-// number of cells that a mercenary can walk to from it's master before being warped
-#define MAX_MER_DISTANCE 15
-
-enum {
-	ARCH_MERC_GUILD,
-	SPEAR_MERC_GUILD,
-	SWORD_MERC_GUILD,
-};
-
-struct s_mercenary_db {
-	int class_;
-	char sprite[NAME_LENGTH], name[NAME_LENGTH];
-	unsigned short lv;
-	short range2, range3;
-	struct status_data status;
-	struct view_data vd;
-	struct {
-		unsigned short id, lv;
-	} skill[MAX_MERCSKILL];
-};
-
-extern struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS];
-
-struct mercenary_data {
-	struct block_list bl;
-	struct unit_data ud;
-	struct view_data *vd;
-	struct status_data base_status, battle_status;
-	struct status_change sc;
-	struct regen_data regen;
-
-	struct s_mercenary_db *db;
-	struct s_mercenary mercenary;
-	char blockskill[MAX_SKILL];
-
-	struct map_session_data *master;
-	int contract_timer;
-	
-	unsigned devotion_flag : 1;
-	unsigned int masterteleport_timer;
-};
-
-bool merc_class(int class_);
-struct view_data * merc_get_viewdata(int class_);
-
-int merc_create(struct map_session_data *sd, int class_, unsigned int lifetime);
-int merc_data_received(struct s_mercenary *merc, bool flag);
-int mercenary_save(struct mercenary_data *md);
-
-void mercenary_heal(struct mercenary_data *md, int hp, int sp);
-int mercenary_dead(struct mercenary_data *md);
-
-int merc_delete(struct mercenary_data *md, int reply);
-void merc_contract_stop(struct mercenary_data *md);
-
-int mercenary_get_lifetime(struct mercenary_data *md);
-int mercenary_get_guild(struct mercenary_data *md);
-int mercenary_get_faith(struct mercenary_data *md);
-int mercenary_set_faith(struct mercenary_data *md, int value);
-int mercenary_get_calls(struct mercenary_data *md);
-int mercenary_set_calls(struct mercenary_data *md, int value);
-int mercenary_kills(struct mercenary_data *md);
-
-int mercenary_checkskill(struct mercenary_data *md, uint16 skill_id);
-
-/**
- * atcommand.c required
- **/
-int read_mercenarydb(void);
-int read_mercenary_skilldb(void);
-
-int do_init_mercenary(void);
-
-#endif /* _MERCENARY_H_ */
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL

+// For more information, see LICENCE in the main folder

+#ifndef _MERCENARY_H_

+#define _MERCENARY_H_

+#include "status.h" // struct status_data, struct status_change

+#include "unit.h" // struct unit_data

+// number of cells that a mercenary can walk to from it's master before being warped

+#define MAX_MER_DISTANCE 15

+enum {

+	ARCH_MERC_GUILD,

+	SPEAR_MERC_GUILD,

+	SWORD_MERC_GUILD,

+};

+struct s_mercenary_db {

+	int class_;

+	char sprite[NAME_LENGTH], name[NAME_LENGTH];

+	unsigned short lv;

+	short range2, range3;

+	struct status_data status;

+	struct view_data vd;

+	struct {

+		unsigned short id, lv;

+	} skill[MAX_MERCSKILL];

+};

+struct mercenary_data {

+	struct block_list bl;

+	struct unit_data ud;

+	struct view_data *vd;

+	struct status_data base_status, battle_status;

+	struct status_change sc;

+	struct regen_data regen;

+	struct s_mercenary_db *db;

+	struct s_mercenary mercenary;

+	char blockskill[MAX_SKILL];

+

+	struct map_session_data *master;

+	int contract_timer;

+	

+	unsigned devotion_flag : 1;

+	unsigned int masterteleport_timer;

+};

+

+

+

+

+

+

+

+/**

+ * atcommand.c required

+ **/

+

+

+/*=====================================

+* Interface : mercenary.h 

+* Generated by HerculesInterfaceMaker

+* created by Susu

+*-------------------------------------*/

+struct mercenary_interface {

+
	/* vars */

+	

+	struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS];

+
	/* funcs */

+	

+	bool (*merc_class) (int class_);

+	struct view_data * (*merc_get_viewdata) (int class_);

+	

+	int (*merc_create) (struct map_session_data *sd, int class_, unsigned int lifetime);

+	int (*merc_data_received) (struct s_mercenary *merc, bool flag);

+	int (*save) (struct mercenary_data *md);

+	

+	void (*heal) (struct mercenary_data *md, int hp, int sp);

+	int (*dead) (struct mercenary_data *md);

+	

+	int (*merc_delete) (struct mercenary_data *md, int reply);

+	void (*merc_contract_stop) (struct mercenary_data *md);

+	

+	int (*get_lifetime) (struct mercenary_data *md);

+	int (*get_guild) (struct mercenary_data *md);

+	int (*get_faith) (struct mercenary_data *md);

+	int (*set_faith) (struct mercenary_data *md, int value);

+	int (*get_calls) (struct mercenary_data *md);

+	int (*set_calls) (struct mercenary_data *md, int value);

+	int (*kills) (struct mercenary_data *md);

+	

+	int (*checkskill) (struct mercenary_data *md, uint16 skill_id);

+	int (*read_mercenarydb) (void);

+	int (*read_skilldb) (void);

+	

+	int (*do_init_mercenary) (void);

+} mercenary_s;

+

+struct mercenary_interface *mercenary;

+

+void mercenary_defaults(void);

+

+#endif /* _MERCENARY_H_ */

diff --git a/src/map/mob.c b/src/map/mob.c
index 04f3063e5..dedd541d9 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2578,7 +2578,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 				quest_update_objective(sd, md->class_);
 
 			if( sd->md && src && src->type != BL_HOM && mob_db(md->class_)->lv > sd->status.base_level/2 )
-				mercenary_kills(sd->md);
+				mercenary->kills(sd->md);
 		}
 
 		if( md->npc_event[0] && !md->state.npc_killmonster ) {
diff --git a/src/map/pc.c b/src/map/pc.c
index e6c3721c3..e0f2bf2f8 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6725,7 +6725,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
 	}
 
 	if( sd->md )
-		merc_delete(sd->md, 3); // Your mercenary soldier has ran away.
+		mercenary->merc_delete(sd->md, 3); // Your mercenary soldier has ran away.
 
 	if( sd->ed )
 		elemental->delete(sd->ed, 0);
diff --git a/src/map/script.c b/src/map/script.c
index 5e99d2e62..e9a93918b 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12459,10 +12459,10 @@ BUILDIN(getmercinfo)
 			else
 				script_pushconststr(st,"");
 			break;
-		case 3: script_pushint(st,md ? mercenary_get_faith(md) : 0); break;
-		case 4: script_pushint(st,md ? mercenary_get_calls(md) : 0); break;
+		case 3: script_pushint(st,md ? mercenary->get_faith(md) : 0); break;
+		case 4: script_pushint(st,md ? mercenary->get_calls(md) : 0); break;
 		case 5: script_pushint(st,md ? md->mercenary.kill_count : 0); break;
-		case 6: script_pushint(st,md ? mercenary_get_lifetime(md) : 0); break;
+		case 6: script_pushint(st,md ? mercenary->get_lifetime(md) : 0); break;
 		case 7: script_pushint(st,md ? md->db->lv : 0); break;
 		default:
 			ShowError("buildin_getmercinfo: Invalid type %d (char_id=%d).\n", type, sd->status.char_id);
@@ -15396,11 +15396,11 @@ BUILDIN(mercenary_create)
 	
 	class_ = script_getnum(st,2);
 	
-	if( !merc_class(class_) )
+	if( !mercenary->merc_class(class_) )
 		return true;
 	
 	contract_time = script_getnum(st,3);
-	merc_create(sd, class_, contract_time);
+	mercenary->merc_create(sd, class_, contract_time);
 	return true;
 }
 
@@ -15551,7 +15551,7 @@ BUILDIN(mercenary_set_faith)
 	
 	*calls += value;
 	*calls = cap_value(*calls, 0, INT_MAX);
-	if( mercenary_get_guild(sd->md) == guild )
+	if( mercenary->get_guild(sd->md) == guild )
 		clif->mercenary_updatestatus(sd,SP_MERCFAITH);
 	
 	return true;
diff --git a/src/map/status.c b/src/map/status.c
index 48a61cfcb..1ea86e163 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1242,7 +1242,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
 	case BL_PC:  pc->damage((TBL_PC*)target,src,hp,sp); break;
 	case BL_MOB: mob_damage((TBL_MOB*)target, src, hp); break;
 	case BL_HOM: homun->damaged((TBL_HOM*)target); break;
-	case BL_MER: mercenary_heal((TBL_MER*)target,hp,sp); break;
+	case BL_MER: mercenary->heal((TBL_MER*)target,hp,sp); break;
 	case BL_ELEM: elemental->heal((TBL_ELEM*)target,hp,sp); break;
 	}
 
@@ -1267,7 +1267,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
 	case BL_PC:  flag = pc->dead((TBL_PC*)target,src); break;
 	case BL_MOB: flag = mob_dead((TBL_MOB*)target, src, flag&4?3:0); break;
 	case BL_HOM: flag = homun->dead((TBL_HOM*)target); break;
-	case BL_MER: flag = mercenary_dead((TBL_MER*)target); break;
+	case BL_MER: flag = mercenary->dead((TBL_MER*)target); break;
 	case BL_ELEM: flag = elemental->dead((TBL_ELEM*)target); break;
 	default:	//Unhandled case, do nothing to object.
 		flag = 0;
@@ -1413,7 +1413,7 @@ int status_heal(struct block_list *bl,int hp,int sp, int flag)
 	case BL_PC:  pc->heal((TBL_PC*)bl,hp,sp,flag&2?1:0); break;
 	case BL_MOB: mob_heal((TBL_MOB*)bl,hp); break;
 	case BL_HOM: homun->healed((TBL_HOM*)bl); break;
-	case BL_MER: mercenary_heal((TBL_MER*)bl,hp,sp); break;
+	case BL_MER: mercenary->heal((TBL_MER*)bl,hp,sp); break;
 	case BL_ELEM: elemental->heal((TBL_ELEM*)bl,hp,sp); break;
 	}
 
@@ -6055,8 +6055,8 @@ void status_set_viewdata(struct block_list *bl, int class_)
 		vd = npc_get_viewdata(class_);
 	else if (homdb_checkid(class_))
 		vd = homun->get_viewdata(class_);
-	else if (merc_class(class_))
-		vd = merc_get_viewdata(class_);
+	else if (mercenary->merc_class(class_))
+		vd = mercenary->merc_get_viewdata(class_);
 	else if (elemental->class(class_))
 		vd = elemental->get_viewdata(class_);
 	else
@@ -8331,7 +8331,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
 				if( pc_isfalcon(sd) ) pc->setoption(sd, sd->sc.option&~OPTION_FALCON);
 				if( sd->status.pet_id > 0 ) pet_menu(sd, 3);
 				if( homun_alive(sd->hd) ) homun->vaporize(sd,1);
-				if( sd->md ) merc_delete(sd->md,3);
+				if( sd->md ) mercenary->merc_delete(sd->md,3);
 			}
 			break;
 		case SC__LAZINESS:
diff --git a/src/map/unit.c b/src/map/unit.c
index b9cdfa278..1860be342 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2252,7 +2252,7 @@ int unit_remove_map_(struct block_list *bl, clr_type clrtype, const char* file,
 		case BL_MER: {
 			struct mercenary_data *md = (struct mercenary_data *)bl;
 			ud->canact_tick = ud->canmove_tick;
-			if( mercenary_get_lifetime(md) <= 0 && !(md->master && !md->master->state.active) )
+			if( mercenary->get_lifetime(md) <= 0 && !(md->master && !md->master->state.active) )
 			{
 				clif->clearunit_area(bl,clrtype);
 				iMap->delblock(bl);
@@ -2531,8 +2531,8 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 		{
 			struct mercenary_data *md = (TBL_MER*)bl;
 			struct map_session_data *sd = md->master;
-			if( mercenary_get_lifetime(md) > 0 )
-				mercenary_save(md);
+			if( mercenary->get_lifetime(md) > 0 )
+				mercenary->save(md);
 			else
 			{
 				intif->mercenary_delete(md->mercenary.mercenary_id);
@@ -2542,7 +2542,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 			if( sd )
 				sd->md = NULL;
 
-			merc_contract_stop(md);
+			mercenary->merc_contract_stop(md);
 			break;
 		}
 		case BL_ELEM: {