Mercurial > hg > openttd
changeset 9848:54722400bef5 draft
(svn r13992) -Fix [FS#2189]: the dedicated console removed any character that was not a printable ASCII character instead. Now it allows UTF8 formated strings too.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Mon, 04 Aug 2008 15:07:17 +0000 |
parents | cc5c11ce4280 |
children | b296319b5c6f |
files | src/video/dedicated_v.cpp |
diffstat | 1 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/dedicated_v.cpp +++ b/src/video/dedicated_v.cpp @@ -230,21 +230,16 @@ SetEvent(_hWaitForInputHandling); #endif - /* XXX - strtok() does not 'forget' \n\r if it is the first character! */ - strtok(input_line, "\r\n"); // Forget about the final \n (or \r) - { /* Remove any special control characters */ - uint i; - for (i = 0; i < lengthof(input_line); i++) { - if (input_line[i] == '\n' || input_line[i] == '\r') // cut missed beginning '\0' - input_line[i] = '\0'; - - if (input_line[i] == '\0') - break; - - if (!IsInsideMM(input_line[i], ' ', 256)) - input_line[i] = ' '; + /* strtok() does not 'forget' \r\n if the string starts with it, + * so we have to manually remove that! */ + strtok(input_line, "\r\n"); + for (char *c = input_line; *c != '\0'; c++) { + if (*c == '\n' || *c == '\r' || c == lastof(input_line)) { + *c = '\0'; + break; } } + str_validate(input_line); IConsoleCmdExec(input_line); // execute command }