- Added character 013 (enter) to the list of characters that are always removed from new character names.

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

3 files changed, 5 insertions, 3 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b09df77a5..4cfb4291d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.

 

 2006/07/18

+	* Added character 013 (enter) to the list of characters that are always

+	  removed from new character names. [Skotlex]

 	* Fixed a crash when trying to extend TK's infinite combo feature. [Skotlex]

 	* Corrected Poison React to counter regardless of distance, and to use the

 	  skill's 50+5*lv% counter chance (instead of 100%). [Skotlex]

diff --git a/src/char/char.c b/src/char/char.c
index 6c2e529f8..e3562946a 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -82,7 +82,7 @@ int subnet_count = 0;
 int name_ignoring_case = 0; // Allow or not identical name for characters but with a different case by [Yor]

 int char_name_option = 0; // Option to know which letters/symbols are authorised in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor]

 //The following are characters that are trimmed regardless because they cause confusion and problems on the servers. [Skotlex]

-#define TRIM_CHARS "\032\t\n "

+#define TRIM_CHARS "\032\t\n\013 "

 char char_name_letters[1024] = ""; // list of letters/symbols authorised (or not) in a character name. by [Yor]

 

 int log_char = 1;	// loggin char or not [devil]

diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index e390cd4e8..2a3259f7d 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -90,7 +90,7 @@ int name_ignoring_case = 0; // Allow or not identical name for characters but wi
 int char_name_option = 0; // Option to know which letters/symbols are authorised in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor]

 char char_name_letters[1024] = ""; // list of letters/symbols used to authorise or not a name of a character. by [Yor]

 //The following are characters that are trimmed regardless because they cause confusion and problems on the servers. [Skotlex]

-#define TRIM_CHARS "\032\t\n "

+#define TRIM_CHARS "\032\t\n\013 "

 int char_per_account = 0; //Maximum charas per account (default unlimited) [Sirius]

 

 int log_char = 1;	// loggin char or not [devil]

@@ -3034,7 +3034,7 @@ int parse_frommap(int fd) {
 			}

 

 			// no inter server packet. no char server packet -> disconnect

-			ShowError("Unknown packet 0x%04x ( %s ) from map server, disconnecting.\n", RFIFOW(fd,0), (char*)RFIFOP(fd,0));

+			ShowError("Unknown packet 0x%04x from map server, disconnecting.\n", RFIFOW(fd,0));

 			session[fd]->eof = 1;

 			return 0;

 		}