summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordominik <dominik@openttd.org>2004-08-27 08:28:41 +0000
committerdominik <dominik@openttd.org>2004-08-27 08:28:41 +0000
commit48b1d70c89a15dbbb34b198251db7662c990dda1 (patch)
tree7b33ed3437b6360821ea8eed41c6f892baa35dce
parentdaf82a0b07632591f69536686eb933b42772915e (diff)
downloadopenttd-48b1d70c89a15dbbb34b198251db7662c990dda1.tar.xz
(svn r143) Fix: newgrfs are working again
-rw-r--r--spritecache.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/spritecache.c b/spritecache.c
index c8edb66cc..69f1b9564 100644
--- a/spritecache.c
+++ b/spritecache.c
@@ -662,6 +662,7 @@ static const char * const _cached_filenames[4] = {
"cached_sprites.xx3",
};
+#define OPENTTD_SPRITES_COUNT = 70
static const uint16 _openttd_grf_indexes[] = {
SPR_OPENTTD_BASE+0, SPR_OPENTTD_BASE+7, // icons etc
98,98, // euro symbol medium size
@@ -671,7 +672,7 @@ static const uint16 _openttd_grf_indexes[] = {
616, 616, // nordic char: Æ
666, 666, // nordic char: Ø
634, 634, // nordic char: Ø
- SPR_OPENTTD_BASE+62, SPR_OPENTTD_BASE+70, // more icons
+ SPR_OPENTTD_BASE+62, SPR_OPENTTD_BASE+SPR_OPENTTD_COUNT, // more icons
0xffff,
};
@@ -700,7 +701,9 @@ static void LoadSpriteTables()
load_index = SPR_CANALS_BASE;
load_index += LoadGrfFile("canalsw.grf", load_index, i++);
/* XXX: Only for debugging. Will be more generic. */
-
+
+ load_index = SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT;
+
for(j=0; j!=lengthof(_newgrf_files) && _newgrf_files[j]; j++)
load_index += LoadGrfFile(_newgrf_files[j], load_index, i++);