gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 22:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2333) - CodeChange: also don't execute command if user has typed all spaces (eg nothing worthwhile). Suggested and implemented by Tron.

Browse Source
This commit is contained in:
Darkvater 2005-05-16 15:05:49 +00:00
parent 653000bdd6
commit effbba74f5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console.c
View File

@ -1031,8 +1031,6 @@ void IConsoleCmdExec(const char *cmdstr)
bool longtoken = false; bool longtoken = false;
bool foundtoken = false; bool foundtoken = false;
if (*cmdstr == '\0') return; // don't execute empty commands
for (cmdptr = cmdstr; *cmdptr != '\0'; cmdptr++) { for (cmdptr = cmdstr; *cmdptr != '\0'; cmdptr++) {
if (!IsValidAsciiChar(*cmdptr)) { if (!IsValidAsciiChar(*cmdptr)) {
IConsoleError("command contains malformed characters, aborting"); IConsoleError("command contains malformed characters, aborting");
@ -1050,7 +1048,6 @@ void IConsoleCmdExec(const char *cmdstr)
/* 1. Split up commandline into tokens, seperated by spaces, commands /* 1. Split up commandline into tokens, seperated by spaces, commands
* enclosed in "" are taken as one token. We can only go as far as the amount * enclosed in "" are taken as one token. We can only go as far as the amount
* of characters in our stream or the max amount of tokens we can handle */ * of characters in our stream or the max amount of tokens we can handle */
tokens[0] = tokenstream;
for (cmdptr = cmdstr, t_index = 0, tstream_i = 0; *cmdptr != '\0'; cmdptr++) { for (cmdptr = cmdstr, t_index = 0, tstream_i = 0; *cmdptr != '\0'; cmdptr++) {
if (t_index >= lengthof(tokens) || tstream_i >= lengthof(tokenstream)) break; if (t_index >= lengthof(tokens) || tstream_i >= lengthof(tokenstream)) break;
@ -1087,6 +1084,7 @@ void IConsoleCmdExec(const char *cmdstr)
IConsolePrintF(_icolour_dbg, "condbg: token %d is: '%s'", i, tokens[i]); IConsolePrintF(_icolour_dbg, "condbg: token %d is: '%s'", i, tokens[i]);
} }
if (tokens[0] == '\0') return; // don't execute empty commands
/* 2. Determine type of command (cmd, alias or variable) and execute /* 2. Determine type of command (cmd, alias or variable) and execute
* First try commands, then aliases, and finally variables. Execute * First try commands, then aliases, and finally variables. Execute
* the found action taking into account its hooking code * the found action taking into account its hooking code