diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-27 01:48:13 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-27 01:48:13 +0000 |
commit | 2aa69c8f83e2afd25a355bc1c70acb646f425b9f (patch) | |
tree | 5ecb316636fce46b3f62d9c4eb8bd1c983a58871 /crawl-ref/source/maps.cc | |
parent | 298d76bd71d68a4e8d3b9ceafbdad1aece9a8f44 (diff) | |
download | crawl-ref-2aa69c8f83e2afd25a355bc1c70acb646f425b9f.tar.gz crawl-ref-2aa69c8f83e2afd25a355bc1c70acb646f425b9f.zip |
Added "error" channel for runtime errors, and changed error messages that
used the "danger" or "warning" channels to use that. Sending an error
message to the error channel has the side effect of interrupting all
activity.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5276 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/maps.cc')
-rw-r--r-- | crawl-ref/source/maps.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index 9caa13ee6c..5681996681 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -133,7 +133,7 @@ static bool resolve_map(map_def &map, const map_def &original) if (crawl_state.map_stat_gen) mapgen_report_error(map, err); #endif - mprf(MSGCH_WARN, "Lua error: %s", err.c_str()); + mprf(MSGCH_ERROR, "Lua error: %s", err.c_str()); return (false); } @@ -141,7 +141,7 @@ static bool resolve_map(map_def &map, const map_def &original) err = map.resolve(); if (!err.empty()) { - mprf(MSGCH_WARN, "Error: %s", err.c_str()); + mprf(MSGCH_ERROR, "Error: %s", err.c_str()); return (false); } @@ -721,7 +721,7 @@ void run_map_preludes() if (!chunk.empty()) { if (chunk.load_call(dlua, NULL)) - mprf(MSGCH_WARN, "Lua error: %s", chunk.orig_error().c_str()); + mprf(MSGCH_ERROR, "Lua error: %s", chunk.orig_error().c_str()); } } for (int i = 0, size = vdefs.size(); i < size; ++i) @@ -730,7 +730,7 @@ void run_map_preludes() { std::string err = vdefs[i].run_lua(true); if (!err.empty()) - mprf(MSGCH_WARN, "Lua error (map %s): %s", + mprf(MSGCH_ERROR, "Lua error (map %s): %s", vdefs[i].name.c_str(), err.c_str()); } } |