- Made the char_name_option char_athena.conf setting apply to parties and guilds as well. It cannot be applied to pets yet without adding a change-name-request interserver packet.

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

1 files changed, 15 insertions, 0 deletions

diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index ed30c7031..1849ba130 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -1185,6 +1185,21 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member
 		mapif_guild_created(fd,account_id,NULL);

 		return 0;

 	}

+	// Check Authorised letters/symbols in the name of the character

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

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

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

+				mapif_guild_created(fd,account_id,NULL);

+				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_guild_created(fd,account_id,NULL);

+				return 0;

+			}

+	}

+

 	g = (struct guild *)aMalloc(sizeof(struct guild));

 	memset(g,0,sizeof(struct guild));