- Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.

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

1 files changed, 422 insertions, 422 deletions

diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 3ab48c8ae..97fef3799 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -1,422 +1,422 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL

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

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

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

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

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

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

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

-#include "char.h"

-#include "inter.h"

-#include "int_pet.h"

-

-char pet_txt[1024]="save/pet.txt";

-

-#ifndef TXT_SQL_CONVERT

-static struct dbt *pet_db;

-static int pet_newid = 100;

-

-int inter_pet_tostr(char *str,struct s_pet *p)

-{

-	int len;

-

-	if(p->hungry < 0)

-		p->hungry = 0;

-	else if(p->hungry > 100)

-		p->hungry = 100;

-	if(p->intimate < 0)

-		p->intimate = 0;

-	else if(p->intimate > 1000)

-		p->intimate = 1000;

-

-	len=sprintf(str,"%d,%d,%s\t%d,%d,%d,%d,%d,%d,%d,%d,%d",

-		p->pet_id,p->class_,p->name,p->account_id,p->char_id,p->level,p->egg_id,

-		p->equip,p->intimate,p->hungry,p->rename_flag,p->incuvate);

-

-	return 0;

-}

-#endif //TXT_SQL_CONVERT

-int inter_pet_fromstr(char *str,struct s_pet *p)

-{

-	int s;

-	int tmp_int[16];

-	char tmp_str[256];

-

-	memset(p,0,sizeof(struct s_pet));

-

-//	printf("sscanf pet main info\n");

-	s=sscanf(str,"%d,%d,%[^\t]\t%d,%d,%d,%d,%d,%d,%d,%d,%d",&tmp_int[0],&tmp_int[1],tmp_str,&tmp_int[2],

-		&tmp_int[3],&tmp_int[4],&tmp_int[5],&tmp_int[6],&tmp_int[7],&tmp_int[8],&tmp_int[9],&tmp_int[10]);

-

-	if(s!=12)

-		return 1;

-

-	p->pet_id = tmp_int[0];

-	p->class_ = tmp_int[1];

-	memcpy(p->name,tmp_str,NAME_LENGTH-1);

-	p->account_id = tmp_int[2];

-	p->char_id = tmp_int[3];

-	p->level = tmp_int[4];

-	p->egg_id = tmp_int[5];

-	p->equip = tmp_int[6];

-	p->intimate = tmp_int[7];

-	p->hungry = tmp_int[8];

-	p->rename_flag = tmp_int[9];

-	p->incuvate = tmp_int[10];

-

-	if(p->hungry < 0)

-		p->hungry = 0;

-	else if(p->hungry > 100)

-		p->hungry = 100;

-	if(p->intimate < 0)

-		p->intimate = 0;

-	else if(p->intimate > 1000)

-		p->intimate = 1000;

-

-	return 0;

-}

-#ifndef TXT_SQL_CONVERT

-int inter_pet_init()

-{

-	char line[8192];

-	struct s_pet *p;

-	FILE *fp;

-	int c=0;

-

-	pet_db= db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int));

-

-	if( (fp=fopen(pet_txt,"r"))==NULL )

-		return 1;

-	while(fgets(line,sizeof(line),fp)){

-		p = (struct s_pet*)aCalloc(sizeof(struct s_pet), 1);

-		if(p==NULL){

-			ShowFatalError("int_pet: out of memory!\n");

-			exit(0);

-		}

-		memset(p,0,sizeof(struct s_pet));

-		if(inter_pet_fromstr(line,p)==0 && p->pet_id>0){

-			if( p->pet_id >= pet_newid)

-				pet_newid=p->pet_id+1;

-			idb_put(pet_db,p->pet_id,p);

-		}else{

-			ShowError("int_pet: broken data [%s] line %d\n",pet_txt,c);

-			aFree(p);

-		}

-		c++;

-	}

-	fclose(fp);

-//	printf("int_pet: %s read done (%d pets)\n",pet_txt,c);

-	return 0;

-}

-

-void inter_pet_final()

-{

-	pet_db->destroy(pet_db, NULL);

-	return;

-}

-

-int inter_pet_save_sub(DBKey key,void *data,va_list ap)

-{

-	char line[8192];

-	FILE *fp;

-	inter_pet_tostr(line,(struct s_pet *)data);

-	fp=va_arg(ap,FILE *);

-	fprintf(fp,"%s" RETCODE,line);

-	return 0;

-}

-

-int inter_pet_save()

-{

-	FILE *fp;

-	int lock;

-	if( (fp=lock_fopen(pet_txt,&lock))==NULL ){

-		ShowError("int_pet: cant write [%s] !!! data is lost !!!\n",pet_txt);

-		return 1;

-	}

-	pet_db->foreach(pet_db,inter_pet_save_sub,fp);

-	lock_fclose(fp,pet_txt,&lock);

-//	printf("int_pet: %s saved.\n",pet_txt);

-	return 0;

-}

-

-int inter_pet_delete(int pet_id)

-{

-	struct s_pet *p;

-	p = idb_get(pet_db,pet_id);

-	if( p == NULL)

-		return 1;

-	else {

-		idb_remove(pet_db,pet_id);

-		ShowInfo("Deleted pet (pet_id: %d)\n",pet_id);

-	}

-	return 0;

-}

-

-int mapif_pet_created(int fd,int account_id,struct s_pet *p)

-{

-        WFIFOHEAD(fd, 11);

-	WFIFOW(fd,0)=0x3880;

-	WFIFOL(fd,2)=account_id;

-	if(p!=NULL){

-		WFIFOB(fd,6)=0;

-		WFIFOL(fd,7)=p->pet_id;

-		ShowInfo("Created pet (%d - %s)\n",p->pet_id,p->name);

-	}else{

-		WFIFOB(fd,6)=1;

-		WFIFOL(fd,7)=0;

-	}

-	WFIFOSET(fd,11);

-

-	return 0;

-}

-

-int mapif_pet_info(int fd,int account_id,struct s_pet *p)

-{

-	WFIFOHEAD(fd, sizeof(struct s_pet) + 9);

-	WFIFOW(fd,0)=0x3881;

-	WFIFOW(fd,2)=sizeof(struct s_pet) + 9;

-	WFIFOL(fd,4)=account_id;

-	WFIFOB(fd,8)=0;

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

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

-

-	return 0;

-}

-

-int mapif_pet_noinfo(int fd,int account_id)

-{

-        WFIFOHEAD(fd, sizeof(struct s_pet) + 9);

-	WFIFOW(fd,0)=0x3881;

-	WFIFOW(fd,2)=sizeof(struct s_pet) + 9;

-	WFIFOL(fd,4)=account_id;

-	WFIFOB(fd,8)=1;

-	memset(WFIFOP(fd,9),0,sizeof(struct s_pet));

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

-

-	return 0;

-}

-

-int mapif_save_pet_ack(int fd,int account_id,int flag)

-{

-        WFIFOHEAD(fd, 7);

-	WFIFOW(fd,0)=0x3882;

-	WFIFOL(fd,2)=account_id;

-	WFIFOB(fd,6)=flag;

-	WFIFOSET(fd,7);

-

-	return 0;

-}

-

-int mapif_delete_pet_ack(int fd,int flag)

-{

-        WFIFOHEAD(fd, 3);

-	WFIFOW(fd,0)=0x3883;

-	WFIFOB(fd,2)=flag;

-	WFIFOSET(fd,3);

-

-	return 0;

-}

-

-int mapif_rename_pet_ack(int fd, int account_id, int char_id, int flag, char *name){

-	WFIFOHEAD(fd, NAME_LENGTH+12);

-	WFIFOW(fd, 0) =0x3884;

-	WFIFOL(fd, 2) =account_id;

-	WFIFOL(fd, 6) =char_id;

-	WFIFOB(fd, 10) =flag;

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

-	WFIFOSET(fd, NAME_LENGTH+12);

-

-	return 0;

-}

-

-int mapif_create_pet(int fd,int account_id,int char_id,short pet_class,short pet_lv,short pet_egg_id,

-	short pet_equip,short intimate,short hungry,char rename_flag,char incuvate,char *pet_name)

-{

-	struct s_pet *p;

-	p= (struct s_pet *) aCalloc(sizeof(struct s_pet), 1);

-	if(p==NULL){

-		ShowFatalError("int_pet: out of memory !\n");

-		mapif_pet_created(fd,account_id,NULL);

-		return 0;

-	}

-//	memset(p,0,sizeof(struct s_pet)); unnecessary after aCalloc [Skotlex]

-	p->pet_id = pet_newid++;

-	memcpy(p->name,pet_name,NAME_LENGTH-1);

-	if(incuvate == 1)

-		p->account_id = p->char_id = 0;

-	else {

-		p->account_id = account_id;

-		p->char_id = char_id;

-	}

-	p->class_ = pet_class;

-	p->level = pet_lv;

-	p->egg_id = pet_egg_id;

-	p->equip = pet_equip;

-	p->intimate = intimate;

-	p->hungry = hungry;

-	p->rename_flag = rename_flag;

-	p->incuvate = incuvate;

-

-	if(p->hungry < 0)

-		p->hungry = 0;

-	else if(p->hungry > 100)

-		p->hungry = 100;

-	if(p->intimate < 0)

-		p->intimate = 0;

-	else if(p->intimate > 1000)

-		p->intimate = 1000;

-

-	idb_put(pet_db,p->pet_id,p);

-

-	mapif_pet_created(fd,account_id,p);

-

-	return 0;

-}

-

-int mapif_load_pet(int fd,int account_id,int char_id,int pet_id)

-{

-	struct s_pet *p;

-	p= idb_get(pet_db,pet_id);

-	if(p!=NULL) {

-		if(p->incuvate == 1) {

-			p->account_id = p->char_id = 0;

-			mapif_pet_info(fd,account_id,p);

-		}

-		else if(account_id == p->account_id && char_id == p->char_id)

-			mapif_pet_info(fd,account_id,p);

-		else

-			mapif_pet_noinfo(fd,account_id);

-	}

-	else

-		mapif_pet_noinfo(fd,account_id);

-

-	return 0;

-}

-

-static void* create_pet(DBKey key, va_list args) {

-	struct s_pet *p;

-	p=(struct s_pet *)aCalloc(sizeof(struct s_pet),1);

-	p->pet_id = key.i;

-	return p;

-}

-int mapif_save_pet(int fd,int account_id,struct s_pet *data)

-{

-	struct s_pet *p;

-	int pet_id, len;

-	RFIFOHEAD(fd);

-	len=RFIFOW(fd,2);

-	

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

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

-	}

-	else{

-		pet_id = data->pet_id;

-		if (pet_id == 0)

-			pet_id = data->pet_id = pet_newid++;

-		p= idb_ensure(pet_db,pet_id,create_pet);

-		if(data->hungry < 0)

-			data->hungry = 0;

-		else if(data->hungry > 100)

-			data->hungry = 100;

-		if(data->intimate < 0)

-			data->intimate = 0;

-		else if(data->intimate > 1000)

-			data->intimate = 1000;

-		memcpy(p,data,sizeof(struct s_pet));

-		if(p->incuvate == 1)

-			p->account_id = p->char_id = 0;

-

-		mapif_save_pet_ack(fd,account_id,0);

-	}

-

-	return 0;

-}

-

-int mapif_delete_pet(int fd,int pet_id)

-{

-	mapif_delete_pet_ack(fd,inter_pet_delete(pet_id));

-

-	return 0;

-}

-

-int mapif_rename_pet(int fd, int account_id, int char_id, char *name){

-	int i;

-

-	// Check Authorised letters/symbols in the name of the pet

-	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised

-		for (i = 0; i < NAME_LENGTH && name[i]; i++)

-		if (strchr(char_name_letters, name[i]) == NULL) {

-			mapif_rename_pet_ack(fd, account_id, char_id, 0, name);

-			return 0;

-		}

-	} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden

-		for (i = 0; i < NAME_LENGTH && name[i]; i++)

-		if (strchr(char_name_letters, name[i]) != NULL) {

-			mapif_rename_pet_ack(fd, account_id, char_id, 0, name);

-			return 0;

-		}

-	}

-

-	mapif_rename_pet_ack(fd, account_id, char_id, 1, name);

-	return 0;

-}

-

-int mapif_parse_CreatePet(int fd)

-{

-	RFIFOHEAD(fd);

-	mapif_create_pet(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOW(fd,10),RFIFOW(fd,12),RFIFOW(fd,14),RFIFOW(fd,16),RFIFOW(fd,18),

-		RFIFOW(fd,20),RFIFOB(fd,22),RFIFOB(fd,23),(char*)RFIFOP(fd,24));

-	return 0;

-}

-

-int mapif_parse_LoadPet(int fd)

-{

-	RFIFOHEAD(fd);

-	mapif_load_pet(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));

-	return 0;

-}

-

-int mapif_parse_SavePet(int fd)

-{

-	RFIFOHEAD(fd);

-	mapif_save_pet(fd,RFIFOL(fd,4),(struct s_pet *)RFIFOP(fd,8));

-	return 0;

-}

-

-int mapif_parse_DeletePet(int fd)

-{

-	RFIFOHEAD(fd);

-	mapif_delete_pet(fd,RFIFOL(fd,2));

-	return 0;

-}

-

-int mapif_parse_RenamePet(int fd){

-	RFIFOHEAD(fd);

-	mapif_rename_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOP(fd, 10));

-	return 0;

-}

-

-// map server からの通信

-// ・１パケットのみ解析すること

-// ・パケット長データはinter.cにセットしておくこと

-// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない

-// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない

-int inter_pet_parse_frommap(int fd)

-{

-	RFIFOHEAD(fd);

-	switch(RFIFOW(fd,0)){

-	case 0x3080: mapif_parse_CreatePet(fd); break;

-	case 0x3081: mapif_parse_LoadPet(fd); break;

-	case 0x3082: mapif_parse_SavePet(fd); break;

-	case 0x3083: mapif_parse_DeletePet(fd); break;

-	case 0x3084: mapif_parse_RenamePet(fd); break;

-	default:

-		return 0;

-	}

-	return 1;

-}

-#endif //TXT_SQL_CONVERT

+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../common/mmo.h"
+#include "../common/socket.h"
+#include "../common/db.h"
+#include "../common/lock.h"
+#include "../common/showmsg.h"
+#include "char.h"
+#include "inter.h"
+#include "int_pet.h"
+
+char pet_txt[1024]="save/pet.txt";
+
+#ifndef TXT_SQL_CONVERT
+static struct dbt *pet_db;
+static int pet_newid = 100;
+
+int inter_pet_tostr(char *str,struct s_pet *p)
+{
+	int len;
+
+	if(p->hungry < 0)
+		p->hungry = 0;
+	else if(p->hungry > 100)
+		p->hungry = 100;
+	if(p->intimate < 0)
+		p->intimate = 0;
+	else if(p->intimate > 1000)
+		p->intimate = 1000;
+
+	len=sprintf(str,"%d,%d,%s\t%d,%d,%d,%d,%d,%d,%d,%d,%d",
+		p->pet_id,p->class_,p->name,p->account_id,p->char_id,p->level,p->egg_id,
+		p->equip,p->intimate,p->hungry,p->rename_flag,p->incuvate);
+
+	return 0;
+}
+#endif //TXT_SQL_CONVERT
+int inter_pet_fromstr(char *str,struct s_pet *p)
+{
+	int s;
+	int tmp_int[16];
+	char tmp_str[256];
+
+	memset(p,0,sizeof(struct s_pet));
+
+//	printf("sscanf pet main info\n");
+	s=sscanf(str,"%d,%d,%[^\t]\t%d,%d,%d,%d,%d,%d,%d,%d,%d",&tmp_int[0],&tmp_int[1],tmp_str,&tmp_int[2],
+		&tmp_int[3],&tmp_int[4],&tmp_int[5],&tmp_int[6],&tmp_int[7],&tmp_int[8],&tmp_int[9],&tmp_int[10]);
+
+	if(s!=12)
+		return 1;
+
+	p->pet_id = tmp_int[0];
+	p->class_ = tmp_int[1];
+	memcpy(p->name,tmp_str,NAME_LENGTH-1);
+	p->account_id = tmp_int[2];
+	p->char_id = tmp_int[3];
+	p->level = tmp_int[4];
+	p->egg_id = tmp_int[5];
+	p->equip = tmp_int[6];
+	p->intimate = tmp_int[7];
+	p->hungry = tmp_int[8];
+	p->rename_flag = tmp_int[9];
+	p->incuvate = tmp_int[10];
+
+	if(p->hungry < 0)
+		p->hungry = 0;
+	else if(p->hungry > 100)
+		p->hungry = 100;
+	if(p->intimate < 0)
+		p->intimate = 0;
+	else if(p->intimate > 1000)
+		p->intimate = 1000;
+
+	return 0;
+}
+#ifndef TXT_SQL_CONVERT
+int inter_pet_init()
+{
+	char line[8192];
+	struct s_pet *p;
+	FILE *fp;
+	int c=0;
+
+	pet_db= db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int));
+
+	if( (fp=fopen(pet_txt,"r"))==NULL )
+		return 1;
+	while(fgets(line,sizeof(line),fp)){
+		p = (struct s_pet*)aCalloc(sizeof(struct s_pet), 1);
+		if(p==NULL){
+			ShowFatalError("int_pet: out of memory!\n");
+			exit(0);
+		}
+		memset(p,0,sizeof(struct s_pet));
+		if(inter_pet_fromstr(line,p)==0 && p->pet_id>0){
+			if( p->pet_id >= pet_newid)
+				pet_newid=p->pet_id+1;
+			idb_put(pet_db,p->pet_id,p);
+		}else{
+			ShowError("int_pet: broken data [%s] line %d\n",pet_txt,c);
+			aFree(p);
+		}
+		c++;
+	}
+	fclose(fp);
+//	printf("int_pet: %s read done (%d pets)\n",pet_txt,c);
+	return 0;
+}
+
+void inter_pet_final()
+{
+	pet_db->destroy(pet_db, NULL);
+	return;
+}
+
+int inter_pet_save_sub(DBKey key,void *data,va_list ap)
+{
+	char line[8192];
+	FILE *fp;
+	inter_pet_tostr(line,(struct s_pet *)data);
+	fp=va_arg(ap,FILE *);
+	fprintf(fp,"%s" RETCODE,line);
+	return 0;
+}
+
+int inter_pet_save()
+{
+	FILE *fp;
+	int lock;
+	if( (fp=lock_fopen(pet_txt,&lock))==NULL ){
+		ShowError("int_pet: cant write [%s] !!! data is lost !!!\n",pet_txt);
+		return 1;
+	}
+	pet_db->foreach(pet_db,inter_pet_save_sub,fp);
+	lock_fclose(fp,pet_txt,&lock);
+//	printf("int_pet: %s saved.\n",pet_txt);
+	return 0;
+}
+
+int inter_pet_delete(int pet_id)
+{
+	struct s_pet *p;
+	p = idb_get(pet_db,pet_id);
+	if( p == NULL)
+		return 1;
+	else {
+		idb_remove(pet_db,pet_id);
+		ShowInfo("Deleted pet (pet_id: %d)\n",pet_id);
+	}
+	return 0;
+}
+
+int mapif_pet_created(int fd,int account_id,struct s_pet *p)
+{
+        WFIFOHEAD(fd, 11);
+	WFIFOW(fd,0)=0x3880;
+	WFIFOL(fd,2)=account_id;
+	if(p!=NULL){
+		WFIFOB(fd,6)=0;
+		WFIFOL(fd,7)=p->pet_id;
+		ShowInfo("Created pet (%d - %s)\n",p->pet_id,p->name);
+	}else{
+		WFIFOB(fd,6)=1;
+		WFIFOL(fd,7)=0;
+	}
+	WFIFOSET(fd,11);
+
+	return 0;
+}
+
+int mapif_pet_info(int fd,int account_id,struct s_pet *p)
+{
+	WFIFOHEAD(fd, sizeof(struct s_pet) + 9);
+	WFIFOW(fd,0)=0x3881;
+	WFIFOW(fd,2)=sizeof(struct s_pet) + 9;
+	WFIFOL(fd,4)=account_id;
+	WFIFOB(fd,8)=0;
+	memcpy(WFIFOP(fd,9),p,sizeof(struct s_pet));
+	WFIFOSET(fd,WFIFOW(fd,2));
+
+	return 0;
+}
+
+int mapif_pet_noinfo(int fd,int account_id)
+{
+        WFIFOHEAD(fd, sizeof(struct s_pet) + 9);
+	WFIFOW(fd,0)=0x3881;
+	WFIFOW(fd,2)=sizeof(struct s_pet) + 9;
+	WFIFOL(fd,4)=account_id;
+	WFIFOB(fd,8)=1;
+	memset(WFIFOP(fd,9),0,sizeof(struct s_pet));
+	WFIFOSET(fd,WFIFOW(fd,2));
+
+	return 0;
+}
+
+int mapif_save_pet_ack(int fd,int account_id,int flag)
+{
+        WFIFOHEAD(fd, 7);
+	WFIFOW(fd,0)=0x3882;
+	WFIFOL(fd,2)=account_id;
+	WFIFOB(fd,6)=flag;
+	WFIFOSET(fd,7);
+
+	return 0;
+}
+
+int mapif_delete_pet_ack(int fd,int flag)
+{
+        WFIFOHEAD(fd, 3);
+	WFIFOW(fd,0)=0x3883;
+	WFIFOB(fd,2)=flag;
+	WFIFOSET(fd,3);
+
+	return 0;
+}
+
+int mapif_rename_pet_ack(int fd, int account_id, int char_id, int flag, char *name){
+	WFIFOHEAD(fd, NAME_LENGTH+12);
+	WFIFOW(fd, 0) =0x3884;
+	WFIFOL(fd, 2) =account_id;
+	WFIFOL(fd, 6) =char_id;
+	WFIFOB(fd, 10) =flag;
+	memcpy(WFIFOP(fd, 11), name, NAME_LENGTH);
+	WFIFOSET(fd, NAME_LENGTH+12);
+
+	return 0;
+}
+
+int mapif_create_pet(int fd,int account_id,int char_id,short pet_class,short pet_lv,short pet_egg_id,
+	short pet_equip,short intimate,short hungry,char rename_flag,char incuvate,char *pet_name)
+{
+	struct s_pet *p;
+	p= (struct s_pet *) aCalloc(sizeof(struct s_pet), 1);
+	if(p==NULL){
+		ShowFatalError("int_pet: out of memory !\n");
+		mapif_pet_created(fd,account_id,NULL);
+		return 0;
+	}
+//	memset(p,0,sizeof(struct s_pet)); unnecessary after aCalloc [Skotlex]
+	p->pet_id = pet_newid++;
+	memcpy(p->name,pet_name,NAME_LENGTH-1);
+	if(incuvate == 1)
+		p->account_id = p->char_id = 0;
+	else {
+		p->account_id = account_id;
+		p->char_id = char_id;
+	}
+	p->class_ = pet_class;
+	p->level = pet_lv;
+	p->egg_id = pet_egg_id;
+	p->equip = pet_equip;
+	p->intimate = intimate;
+	p->hungry = hungry;
+	p->rename_flag = rename_flag;
+	p->incuvate = incuvate;
+
+	if(p->hungry < 0)
+		p->hungry = 0;
+	else if(p->hungry > 100)
+		p->hungry = 100;
+	if(p->intimate < 0)
+		p->intimate = 0;
+	else if(p->intimate > 1000)
+		p->intimate = 1000;
+
+	idb_put(pet_db,p->pet_id,p);
+
+	mapif_pet_created(fd,account_id,p);
+
+	return 0;
+}
+
+int mapif_load_pet(int fd,int account_id,int char_id,int pet_id)
+{
+	struct s_pet *p;
+	p= idb_get(pet_db,pet_id);
+	if(p!=NULL) {
+		if(p->incuvate == 1) {
+			p->account_id = p->char_id = 0;
+			mapif_pet_info(fd,account_id,p);
+		}
+		else if(account_id == p->account_id && char_id == p->char_id)
+			mapif_pet_info(fd,account_id,p);
+		else
+			mapif_pet_noinfo(fd,account_id);
+	}
+	else
+		mapif_pet_noinfo(fd,account_id);
+
+	return 0;
+}
+
+static void* create_pet(DBKey key, va_list args) {
+	struct s_pet *p;
+	p=(struct s_pet *)aCalloc(sizeof(struct s_pet),1);
+	p->pet_id = key.i;
+	return p;
+}
+int mapif_save_pet(int fd,int account_id,struct s_pet *data)
+{
+	struct s_pet *p;
+	int pet_id, len;
+	RFIFOHEAD(fd);
+	len=RFIFOW(fd,2);
+	
+	if(sizeof(struct s_pet)!=len-8) {
+		ShowError("inter pet: data size error %d %d\n",sizeof(struct s_pet),len-8);
+	}
+	else{
+		pet_id = data->pet_id;
+		if (pet_id == 0)
+			pet_id = data->pet_id = pet_newid++;
+		p= idb_ensure(pet_db,pet_id,create_pet);
+		if(data->hungry < 0)
+			data->hungry = 0;
+		else if(data->hungry > 100)
+			data->hungry = 100;
+		if(data->intimate < 0)
+			data->intimate = 0;
+		else if(data->intimate > 1000)
+			data->intimate = 1000;
+		memcpy(p,data,sizeof(struct s_pet));
+		if(p->incuvate == 1)
+			p->account_id = p->char_id = 0;
+
+		mapif_save_pet_ack(fd,account_id,0);
+	}
+
+	return 0;
+}
+
+int mapif_delete_pet(int fd,int pet_id)
+{
+	mapif_delete_pet_ack(fd,inter_pet_delete(pet_id));
+
+	return 0;
+}
+
+int mapif_rename_pet(int fd, int account_id, int char_id, char *name){
+	int i;
+
+	// Check Authorised letters/symbols in the name of the pet
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+		for (i = 0; i < NAME_LENGTH && name[i]; i++)
+		if (strchr(char_name_letters, name[i]) == NULL) {
+			mapif_rename_pet_ack(fd, account_id, char_id, 0, name);
+			return 0;
+		}
+	} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
+		for (i = 0; i < NAME_LENGTH && name[i]; i++)
+		if (strchr(char_name_letters, name[i]) != NULL) {
+			mapif_rename_pet_ack(fd, account_id, char_id, 0, name);
+			return 0;
+		}
+	}
+
+	mapif_rename_pet_ack(fd, account_id, char_id, 1, name);
+	return 0;
+}
+
+int mapif_parse_CreatePet(int fd)
+{
+	RFIFOHEAD(fd);
+	mapif_create_pet(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOW(fd,10),RFIFOW(fd,12),RFIFOW(fd,14),RFIFOW(fd,16),RFIFOW(fd,18),
+		RFIFOW(fd,20),RFIFOB(fd,22),RFIFOB(fd,23),(char*)RFIFOP(fd,24));
+	return 0;
+}
+
+int mapif_parse_LoadPet(int fd)
+{
+	RFIFOHEAD(fd);
+	mapif_load_pet(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
+	return 0;
+}
+
+int mapif_parse_SavePet(int fd)
+{
+	RFIFOHEAD(fd);
+	mapif_save_pet(fd,RFIFOL(fd,4),(struct s_pet *)RFIFOP(fd,8));
+	return 0;
+}
+
+int mapif_parse_DeletePet(int fd)
+{
+	RFIFOHEAD(fd);
+	mapif_delete_pet(fd,RFIFOL(fd,2));
+	return 0;
+}
+
+int mapif_parse_RenamePet(int fd){
+	RFIFOHEAD(fd);
+	mapif_rename_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOP(fd, 10));
+	return 0;
+}
+
+// map server からの通信
+// ・１パケットのみ解析すること
+// ・パケット長データはinter.cにセットしておくこと
+// ・パケット長チェックや、RFIFOSKIPは呼び出し元で行われるので行ってはならない
+// ・エラーなら0(false)、そうでないなら1(true)をかえさなければならない
+int inter_pet_parse_frommap(int fd)
+{
+	RFIFOHEAD(fd);
+	switch(RFIFOW(fd,0)){
+	case 0x3080: mapif_parse_CreatePet(fd); break;
+	case 0x3081: mapif_parse_LoadPet(fd); break;
+	case 0x3082: mapif_parse_SavePet(fd); break;
+	case 0x3083: mapif_parse_DeletePet(fd); break;
+	case 0x3084: mapif_parse_RenamePet(fd); break;
+	default:
+		return 0;
+	}
+	return 1;
+}
+#endif //TXT_SQL_CONVERT