(svn r13218) [NoAI] -Add: added a [S/E/P/W/I] in front of DEBUG messages from AILog, to indicate the level of message (the one that goes to the stdout) (request by Mchl) noai
authortruebrain
Fri, 23 May 2008 08:52:29 +0000
branchnoai
changeset 10674 542470cee8a2
parent 10670 a39c9d7c2562
child 10675 b16fdb811ebb
(svn r13218) [NoAI] -Add: added a [S/E/P/W/I] in front of DEBUG messages from AILog, to indicate the level of message (the one that goes to the stdout) (request by Mchl)
bin/ai/regression/run.sh
src/ai/api/ai_log.cpp
--- a/bin/ai/regression/run.sh	Thu May 22 16:16:13 2008 +0000
+++ b/bin/ai/regression/run.sh	Fri May 23 08:52:29 2008 +0000
@@ -19,7 +19,7 @@
 if [ -n "$gdb" ]; then
 	$gdb ./openttd -a regression -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
 else
-	./openttd -a regression -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x\\(nil\\)", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); print $0; }' > tmp.regression
+	./openttd -a regression -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d ai=2 2>&1 | awk '{ gsub("0x\\(nil\\)", "0x00000000", $0); gsub("^dbg: \\[ai\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
 fi
 
 if [ -z "$gdb" ]; then
--- a/src/ai/api/ai_log.cpp	Thu May 22 16:16:13 2008 +0000
+++ b/src/ai/api/ai_log.cpp	Fri May 23 08:52:29 2008 +0000
@@ -50,8 +50,19 @@
 		break;
 	}
 
+	char logc;
+
+	switch (level) {
+		case LOG_SQ_ERROR: logc = 'S'; break;
+		case LOG_ERROR:    logc = 'E'; break;
+		case LOG_SQ_INFO:  logc = 'P'; break;
+		case LOG_WARNING:  logc = 'W'; break;
+		case LOG_INFO:     logc = 'I'; break;
+		default:           logc = '?'; break;
+	}
+
 	/* Also still print to debug window */
-	DEBUG(ai, level, "[%d] %s", (uint)_current_player, log->lines[log->pos]);
+	DEBUG(ai, level, "[%d] [%c] %s", (uint)_current_player, logc, log->lines[log->pos]);
 }
 
 /* static */ void AILog::FreeLogPointer()