[Freeciv-commits] r25393 - in /trunk/client: packhand.c tilespec.c

[pepeto69]

Author: pepeto
Date: Sun Jul  6 10:23:07 2014
New Revision: 25393

URL: http://svn.gna.org/viewcvs/freeciv?rev=25393&view=rev
Log:
Downgrade "Map topology and tileset incompatible" message to
LOG_NORMAL to avoid error messages (and backtraces), but keep
the popup for warning the user.

See gna bug #22258

Modified:
    trunk/client/packhand.c
    trunk/client/tilespec.c

Modified: trunk/client/packhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=25393&r1=25392&r2=25393&view=diff
==============================================================================
--- trunk/client/packhand.c     (original)
+++ trunk/client/packhand.c     Sun Jul  6 10:23:07 2014
@@ -1750,7 +1750,7 @@
   map.ysize = ysize;
 
   if (!tileset_map_topo_compatible(topology_id, tileset)) {
-    tileset_error(LOG_ERROR, _("Map topology and tileset incompatible."));
+    tileset_error(LOG_NORMAL, _("Map topology and tileset incompatible."));
   }
 
   map.topology_id = topology_id;

Modified: trunk/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=25393&r1=25392&r2=25393&view=diff
==============================================================================
--- trunk/client/tilespec.c     (original)
+++ trunk/client/tilespec.c     Sun Jul  6 10:23:07 2014
@@ -581,7 +581,7 @@
 
   log_base(level, "%s", buf);
 
-  if (level <= LOG_ERROR) {
+  if (level <= LOG_NORMAL) {
     show_tileset_error(buf);
   }
 
@@ -1172,7 +1172,7 @@
   }
 
   if (!tileset_map_topo_compatible(map.topology_id, tileset)) {
-    tileset_error(LOG_ERROR, _("Map topology and tileset incompatible."));
+    tileset_error(LOG_NORMAL, _("Map topology and tileset incompatible."));
   }
 
   terrain_type_iterate(pterrain) {


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits