Author: shadowmaster
Date: Fri Nov 2 18:42:15 2007
New Revision: 21434
URL: http://svn.gna.org/viewcvs/wesnoth?rev=21434&view=rev
Log:
* Added 'notifs' log domain.
* Added [debug_message] to game events processor, so that debug messages
* can be directly output to console, with a loglevel (err,warn,info)
* 'info' as default.
Modified:
trunk/src/game_events.cpp
trunk/src/log.cpp
trunk/src/log.hpp
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=21434&r1=21433&r2=21434&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Fri Nov 2 18:42:15 2007
@@ -53,6 +53,10 @@
#define ERR_NG LOG_STREAM(err, engine)
#define LOG_DP LOG_STREAM(info, display)
#define ERR_CF LOG_STREAM(err, config)
+
+#define LOG_NO LOG_STREAM(info, notifs)
+#define WRN_NO LOG_STREAM(warn, notifs)
+#define ERR_NO LOG_STREAM(err, notifs)
namespace {
@@ -1566,6 +1570,17 @@
const std::string message = cfg["message"];
lg::wml_error << message << '\n';
}
+
+ else if(cmd == "debug_message") {
+ const std::string log_level = cfg["logger"];
+ const std::string log_message = cfg["message"];
+ if (log_level == "err")
+ ERR_NO << log_message << "'\n";
+ else if (log_level == "warn" || log_level == "wrn")
+ WRN_NO << log_message << "'\n";
+ else
+ LOG_NO << log_message << "'\n";
+ }
// Display a message dialog
else if(cmd == "message") {
Modified: trunk/src/log.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/log.cpp?rev=21434&r1=21433&r2=21434&view=diff
==============================================================================
--- trunk/src/log.cpp (original)
+++ trunk/src/log.cpp Fri Nov 2 18:42:15 2007
@@ -57,7 +57,7 @@
logger err("error", 0), warn("warning", 1), info("info", 2), debug("debug", 3);
log_domain general("general"), ai("ai"), config("config"), display("display"),
engine("engine"), network("network"), mp_server("server"),
- filesystem("filesystem"), audio("audio"), paths("paths");
+ filesystem("filesystem"), audio("audio"), paths("paths"),
notifs("notifs");
log_domain::log_domain(char const *name) : domain_(log_domains.size())
{
Modified: trunk/src/log.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/log.hpp?rev=21434&r1=21433&r2=21434&view=diff
==============================================================================
--- trunk/src/log.hpp (original)
+++ trunk/src/log.hpp Fri Nov 2 18:42:15 2007
@@ -48,7 +48,7 @@
void timestamps(bool);
extern logger err, warn, info, debug;
-extern log_domain general, ai, config, display, engine, network, mp_server,
filesystem, audio, paths;
+extern log_domain general, ai, config, display, engine, network, mp_server,
filesystem, audio, paths, notifs;
class scope_logger
{
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
