Author: cazfi
Date: Sun Apr 12 01:31:45 2015
New Revision: 28760

URL: http://svn.gna.org/viewcvs/freeciv?rev=28760&view=rev
Log:
Corrected tilespec error messages to complain about lack of the actual sprites 
and not
of their tags.

See bug #23299

Modified:
    trunk/client/tilespec.c

Modified: trunk/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=28760&r1=28759&r2=28760&view=diff
==============================================================================
--- trunk/client/tilespec.c     (original)
+++ trunk/client/tilespec.c     Sun Apr 12 01:31:45 2015
@@ -2183,7 +2183,7 @@
   do {                                                           \
     t->sprites.field = load_sprite(t, tag);                      \
     if (t->sprites.field == NULL) {                               \
-      tileset_error(LOG_FATAL, _("Sprite tag '%s' missing."), tag);    \
+      tileset_error(LOG_FATAL, _("Sprite for tag '%s' missing."), tag);    \
     }                                                             \
   } while(FALSE)
 
@@ -2195,7 +2195,7 @@
       t->sprites.field = load_sprite(t, alt);                              \
     }                                                                      \
     if (t->sprites.field == NULL) {                                         \
-      tileset_error(LOG_FATAL, _("Sprite tag '%s' and alternate '%s' are "  \
+      tileset_error(LOG_FATAL, _("Sprite for tags '%s' and alternate '%s' are 
"  \
                                  "both missing."), tag, alt);               \
     }                                                                       \
   } while(FALSE)
@@ -2972,7 +2972,7 @@
 
   if (!tileset_setup_unit_type_from_tag(t, uidx, ut->graphic_str)
       && !tileset_setup_unit_type_from_tag(t, uidx, ut->graphic_alt)) {
-    tileset_error(LOG_FATAL, _("Missing %s unit tag \"%s\" and alternative 
\"%s\"."),
+    tileset_error(LOG_FATAL, _("Missing %s unit sprite for tags \"%s\" and 
alternative \"%s\"."),
                   utype_rule_name(ut), ut->graphic_str, ut->graphic_alt);
   }
 }
@@ -3093,7 +3093,7 @@
           t->sprites.extras[id].u.cardinals[i] = load_sprite(t, 
pextra->graphic_alt);
         }
         if (!t->sprites.extras[id].u.cardinals[i]) {
-          tileset_error(LOG_FATAL, _("Sprite tag '%s' and alternate '%s' are "
+          tileset_error(LOG_FATAL, _("Sprite for tags '%s' and alternate '%s' 
are "
                                      "both missing."),
                         pextra->graphic_str, pextra->graphic_alt);
         }
@@ -3111,7 +3111,7 @@
     if (t->sprites.extras[id].activity == NULL) {
       t->sprites.extras[id].activity = load_sprite(t, pextra->act_gfx_alt);
       if (t->sprites.extras[id].activity == NULL) {
-        tileset_error(LOG_FATAL, _("Missing %s building activity tag \"%s\" 
and alternative \"%s\"."),
+        tileset_error(LOG_FATAL, _("Missing %s building activity sprite for 
tags \"%s\" and alternative \"%s\"."),
                       extra_rule_name(pextra), pextra->activity_gfx, 
pextra->act_gfx_alt);
       }
     }
@@ -3124,7 +3124,7 @@
     if (t->sprites.extras[id].rmact == NULL) {
       t->sprites.extras[id].rmact = load_sprite(t, pextra->rmact_gfx_alt);
       if (t->sprites.extras[id].rmact == NULL) {
-        tileset_error(LOG_FATAL, _("Missing %s removal activity tag \"%s\" and 
alternative \"%s\"."),
+        tileset_error(LOG_FATAL, _("Missing %s removal activity sprite for 
tags \"%s\" and alternative \"%s\"."),
                       extra_rule_name(pextra), pextra->rmact_gfx, 
pextra->rmact_gfx_alt);
       }
     }
@@ -3362,7 +3362,7 @@
        /* check for base sprite, allowing missing sprites above base */
        if (0 == i  &&  0 == l) {
           /* TRANS: 'base' means 'base of terrain gfx', not 'military base' */ 
-          tileset_error(LOG_FATAL, _("Missing base sprite tag \"%s\"."), 
buffer);
+          tileset_error(LOG_FATAL, _("Missing base sprite for tag \"%s\"."), 
buffer);
        }
        break;
       case MATCH_SAME:
@@ -3513,7 +3513,7 @@
                 sprite_vector_reserve(&dlp->allocated, vec_size + 1);
                 dlp->allocated.p[vec_size] = sprite;
              } else {
-                log_error("Terrain graphics tag \"%s\" missing.", buffer);
+                log_error("Terrain graphics sprite for tag \"%s\" missing.", 
buffer);
              }
 
              dlp->cells[i] = sprite;


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

Reply via email to