Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. Read more...

Feature #901829 ยป 0032-Tell-tileset-name-or-filename-in-scan_specfile-error.patch

Marko Lindqvist, 2020-12-01 09:50 AM

View differences:

client/tilespec.c
1588 1588
                                 "%s.y_top_left", sec_name)
1589 1589
          || !secfile_lookup_int(file, &dx, "%s.dx", sec_name)
1590 1590
          || !secfile_lookup_int(file, &dy, "%s.dy", sec_name)) {
1591
        log_error("Grid \"%s\" invalid: %s", sec_name, secfile_error());
1591
        log_error("%s grid \"%s\" invalid: %s",
1592
                  sf->file_name, sec_name, secfile_error());
1592 1593
        continue;
1593 1594
      }
1594 1595

  
......
1608 1609
            || !(tags = secfile_lookup_str_vec(file, &num_tags,
1609 1610
                                               "%s.tiles%d.tag",
1610 1611
                                               sec_name, j))) {
1611
          log_error("Small sprite \"%s.tiles%d\" invalid: %s",
1612
                    sec_name, j, secfile_error());
1612
          log_error("%s small sprite \"%s.tiles%d\" invalid: %s",
1613
                    sf->file_name, sec_name, j, secfile_error());
1613 1614
          continue;
1614 1615
        }
1615 1616
        hot_x = secfile_lookup_int_default(file, 0, "%s.tiles%d.hot_x",
......
1640 1641
        if (!duplicates_ok) {
1641 1642
          for (k = 0; k < num_tags; k++) {
1642 1643
            if (!sprite_hash_insert(t->sprite_hash, tags[k], ss)) {
1643
              log_error("warning: already have a sprite for \"%s\".",
1644
                        tags[k]);
1644
              log_error("warning: %s already has a sprite for \"%s\".",
1645
                        tileset_name_get(t), tags[k]);
1645 1646
            }
1646 1647
          }
1647 1648
        } else {
......
1670 1671
                                        "extra.sprites%d.tag", i))
1671 1672
        || !(filename = secfile_lookup_str(file,
1672 1673
                                           "extra.sprites%d.file", i))) {
1673
      log_error("Extra sprite \"extra.sprites%d\" invalid: %s",
1674
                i, secfile_error());
1674
      log_error("%s extra sprite \"extra.sprites%d\" invalid: %s",
1675
                sf->file_name, i, secfile_error());
1675 1676
      continue;
1676 1677
    }
1677 1678
    hot_x = secfile_lookup_int_default(file, 0, "extra.sprites%d.hot_x", i);
......
1690 1691
    if (!duplicates_ok) {
1691 1692
      for (k = 0; k < num_tags; k++) {
1692 1693
        if (!sprite_hash_insert(t->sprite_hash, tags[k], ss)) {
1693
          log_error("warning: already have a sprite for \"%s\".", tags[k]);
1694
          log_error("warning: %s already have a sprite for \"%s\".",
1695
                    tileset_name_get(t), tags[k]);
1694 1696
        }
1695 1697
      }
1696 1698
    } else {
1697
- 
    (1-1/1)