mail[Wesnoth-commits] r43594 - /trunk/src/terrain.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by AI0867 on June 19, 2010 - 15:28:
Author: ai0867
Date: Sat Jun 19 15:28:58 2010
New Revision: 43594

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43594&view=rev
Log:
Replace lg::wml_error with ERR_G, as lg::wml_error doesn't work in the editor

Modified:
    trunk/src/terrain.cpp

Modified: trunk/src/terrain.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/terrain.cpp?rev=43594&r1=43593&r2=43594&view=diff
==============================================================================
--- trunk/src/terrain.cpp (original)
+++ trunk/src/terrain.cpp Sat Jun 19 15:28:58 2010
@@ -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 @@
                                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";
                        }




Related Messages


Powered by MHonArc, Updated Sat Jun 19 17:00:16 2010