(svn r11509) -Fix: off-by-one error in some sprite numbers; increase sprite number counter before loading the next sprite instead of after doing so.
--- a/src/newgrf.cpp Sat Nov 24 09:55:17 2007 +0000
+++ b/src/newgrf.cpp Sat Nov 24 10:19:56 2007 +0000
@@ -2321,8 +2321,8 @@
);
for (uint16 i = 0; i < num_sets * num_ents; i++) {
+ _nfo_line++;
LoadNextSprite(_cur_spriteid++, _file_index, _nfo_line);
- _nfo_line++;
}
}
@@ -3392,8 +3392,8 @@
}
for (; num > 0; num--) {
+ _nfo_line++;
LoadNextSprite(replace == 0 ? _cur_spriteid++ : replace++, _file_index, _nfo_line);
- _nfo_line++;
}
_skip_sprites = skip_num;
@@ -3806,8 +3806,8 @@
);
for (uint j = 0; j < num_sprites; j++) {
+ _nfo_line++;
LoadNextSprite(first_sprite + j, _file_index, _nfo_line); // XXX
- _nfo_line++;
}
}
}
@@ -4642,8 +4642,8 @@
for (uint c = 0; c < num_char; c++) {
SetUnicodeGlyph(size, base_char + c, _cur_spriteid);
+ _nfo_line++;
LoadNextSprite(_cur_spriteid++, _file_index, _nfo_line);
- _nfo_line++;
}
}
}