0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace lg::wml_error with ERR_G, as lg::wml_error doesn't work in the editor

Browse source
This commit is contained in:
Alexander van Gessel 2010-06-19 14:28:58 +01:00
parent 6f5975f278
commit 0f6be69562
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/terrain.cpp
View file

@ -24,6 +24,7 @@
#include <set>
static lg::log_domain log_config("config");
#define ERR_G LOG_STREAM(err, lg::general)
#define WRN_G LOG_STREAM(warn, lg::general)
#define LOG_G LOG_STREAM(info, lg::general)
#define DBG_G LOG_STREAM(debug, lg::general)
@ -305,17 +306,17 @@ void create_terrain_maps(const config::const_child_itors &cfgs,
if(clean_merge) {
LOG_G << "Editor groups merged to: " << joined << "\n";
} else {
lg::wml_error << "Merged terrain " << terrain.number()
ERR_G << "Merged terrain " << terrain.number()
<< ": " << terrain.id() << " (" << terrain.name() << ") "
<< "with duplicate editor groups [" << terrain.editor_group() << "] "
<< "and [" << curr.editor_group() << "]\n";
}
} else {
lg::wml_error << "Duplicate terrain code definition found for " << terrain.number() << "\n";
lg::wml_error << "Failed to add terrain "
ERR_G << "Duplicate terrain code definition found for " << terrain.number() << "\n";
ERR_G << "Failed to add terrain "
<< terrain.id() << " (" << terrain.name() << ") "
<< "[" << terrain.editor_group() << "]" << "\n";
lg::wml_error << "which conflicts with "
ERR_G << "which conflicts with "
<< curr.id() << " (" << curr.name() << ") "
<< "[" << curr.editor_group() << "]" << "\n";
}