Mercurial > hg > openttd
changeset 14508:b84eef230c35 draft
(svn r19079) -Codechange: use _debug_console_level instead of _stdlib_con_developer
author | smatz <smatz@openttd.org> |
---|---|
date | Wed, 10 Feb 2010 16:10:05 +0000 |
parents | 220ac6606f69 |
children | 48f9a3fd032c |
files | src/console.cpp src/console_cmds.cpp src/debug.cpp src/debug.h |
diffstat | 4 files changed, 7 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/console.cpp +++ b/src/console.cpp @@ -33,7 +33,6 @@ /* ** stdlib ** */ byte _stdlib_developer = 1; -bool _stdlib_con_developer = false; FILE *_iconsole_output_file; void IConsoleInit() @@ -416,8 +415,7 @@ memset(&aliases, 0, sizeof(aliases)); memset(&aliasstream, 0, sizeof(aliasstream)); - if (_stdlib_con_developer) - IConsolePrintF(CC_DEBUG, "condbg: requested command is an alias; parsing..."); + DEBUG(console, 6, "condbg: requested command is an alias; parsing..."); aliases[0] = aliasstream; for (cmdptr = alias->cmdline, a_index = 0, astream_i = 0; *cmdptr != '\0'; cmdptr++) { @@ -696,8 +694,7 @@ byte t_index = tokencount; uint32 value; - if (_stdlib_con_developer) - IConsolePrintF(CC_DEBUG, "condbg: requested command is a variable"); + DEBUG(console, 6, "Requested command is a variable"); if (tokencount == 0) { // Just print out value IConsoleVarPrintGetValue(var); @@ -779,8 +776,7 @@ } } - if (_stdlib_con_developer) - IConsolePrintF(CC_DEBUG, "condbg: executing cmdline: '%s'", cmdstr); + DEBUG(console, 4, "Executing cmdline: '%s'", cmdstr); memset(&tokens, 0, sizeof(tokens)); memset(&tokenstream, 0, sizeof(tokenstream)); @@ -824,12 +820,8 @@ } } - if (_stdlib_con_developer) { - uint i; - - for (i = 0; tokens[i] != NULL; i++) { - IConsolePrintF(CC_DEBUG, "condbg: token %d is: '%s'", i, tokens[i]); - } + for (uint i = 0; tokens[i] != NULL; i++) { + DEBUG(console, 8, "condbg: token %d is: '%s'", i, tokens[i]); } if (tokens[0] == '\0') return; // don't execute empty commands
--- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -1766,10 +1766,6 @@ static void IConsoleDebugLibRegister() { - /* debugging variables and functions */ - extern bool _stdlib_con_developer; // XXX extern in .cpp - - IConsoleVarRegister("con_developer", &_stdlib_con_developer, ICONSOLE_VAR_BOOLEAN, "Enable/disable console debugging information (internal)"); IConsoleCmdRegister("resettile", ConResetTile); IConsoleCmdRegister("stopall", ConStopAllVehicles); IConsoleAliasRegister("dbg_echo", "echo %A; echo %B");