- Merged Adam's patch to let the char-server handle validation of pet-name-change requests through the allowed char letters config.

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

3 files changed, 131 insertions, 92 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 701240f60..fc8631c88 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2376,7 +2376,7 @@ int char_account_reg_reply(int fd,int account_id,int char_id) {
 	return 0;

 }

 

-void char_read_fame_list()

+void char_read_fame_list(void)

 {

 	int i, j, k;

 	struct fame_list fame_item;

diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 0c029e445..d787b9821 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -217,116 +217,149 @@ int mapif_delete_pet_ack(int fd,int flag)
 	WFIFOB(fd,2)=flag;

 	WFIFOSET(fd,3);

 

-	return 0;

-}

-

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

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

-{

-	struct s_pet *p;

-	p= (struct s_pet *) 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);

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

+	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_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) {

+	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;

-			mapif_pet_info(fd,account_id,p);

+		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 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;

-}

+		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);

+	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;

 	}

-	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;

+	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);

+		}

 

-		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_delete_pet(int fd,int pet_id)

-{

-	mapif_delete_pet_ack(fd,inter_pet_delete(pet_id));

+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;

 }

 

@@ -359,6 +392,11 @@ int mapif_parse_DeletePet(int fd)
 	return 0;

 }

 

+int mapif_parse_RenamePet(int fd){

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

+	return 0;

+}

+

 // map server からの通信

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

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

@@ -372,6 +410,7 @@ int inter_pet_parse_frommap(int fd)
 	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;

 	}

diff --git a/src/char/inter.c b/src/char/inter.c
index adedc6a7b..491eb8f3a 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -49,7 +49,7 @@ int inter_send_packet_length[] = {
 	 0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,

 	 0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,

 	 0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,

-	11,-1, 7, 3,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,

+	11,-1, 7, 3, 36, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,

 };

 // recv. packet list

 int inter_recv_packet_length[] = {

@@ -61,7 +61,7 @@ int inter_recv_packet_length[] = {
 	 0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,

 	 0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,

 	 0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0,

-	48,14,-1, 6,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3080-0x308f

+	48,14,-1, 6, 35, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3080-0x308f

 };

 

 struct WisData {