From 25aa47448d20f531852c6e027353015188d74050 Mon Sep 17 00:00:00 2001 From: pasky Date: Sun, 6 Mar 2005 15:22:28 +0000 Subject: (svn r1943) Show the sprite ID in the check_length() error message. Also show the correct sprite ID in the spriteskip notice. --- newgrf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/newgrf.c b/newgrf.c index f96459734..8703dd940 100644 --- a/newgrf.c +++ b/newgrf.c @@ -109,7 +109,8 @@ static void CDECL grfmsg(enum grfmsg_severity severity, const char *str, ...) #define check_length(real, wanted, where) \ do { \ if (real < wanted) { \ - grfmsg(GMS_ERROR, "%s: Invalid special sprite length %d (expected %d)!", where, real, wanted); \ + grfmsg(GMS_ERROR, "%s/%d: Invalid special sprite length %d (expected %d)!", \ + where, _cur_spriteid - _cur_grffile->sprite_offset, real, wanted); \ return; \ } \ } while (0) @@ -1694,7 +1695,7 @@ static void SkipIf(byte *buf, int len) } numsprites = grf_load_byte(&buf); - grfmsg(GMS_NOTICE, "Skipping %d->+%d sprites, test was true.", _cur_spriteid - _custom_sprites_base, numsprites); + grfmsg(GMS_NOTICE, "Skipping %d->+%d sprites, test was true.", _cur_spriteid - _cur_grffile->sprite_offset, numsprites); _skip_sprites = numsprites; if (_skip_sprites == 0) { /* Zero means there are no sprites to skip, so -- cgit v1.2.3-70-g09d2