diff options
| author | truelight <truelight@openttd.org> | 2005-01-03 18:49:45 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2005-01-03 18:49:45 +0000 |
| commit | d382463f8afad00bc944c3057c2e9a0ac90e721c (patch) | |
| tree | 8580bbcf5a20ca814aae886d0a1e597c41c788b0 | |
| parent | a72d993e65df5e3ad811a25227c2fce04925f461 (diff) | |
| download | openttd-d382463f8afad00bc944c3057c2e9a0ac90e721c.tar.xz | |
(svn r1343) -Fix: [Graphic] Autorail icon is now correct (Darkvater)
-Fix: [Graphic] Added resize icon (tnx tokai)
| -rw-r--r-- | data/openttd.grf | bin | 23016 -> 23069 bytes | |||
| -rw-r--r-- | spritecache.c | 6 | ||||
| -rw-r--r-- | table/sprites.h | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/data/openttd.grf b/data/openttd.grf Binary files differindex 3cf6c6c48..cceea1bdf 100644 --- a/data/openttd.grf +++ b/data/openttd.grf diff --git a/spritecache.c b/spritecache.c index 5cbcc8c6e..3d149467a 100644 --- a/spritecache.c +++ b/spritecache.c @@ -215,7 +215,7 @@ static bool LoadNextSprite(int load_index, byte file_index) _replace_sprites_offset[0]++; _replace_sprites_count[0]--; - + if ((offset + count) <= NUM_SPRITES) { load_index = offset; } else { @@ -743,7 +743,7 @@ static const char * const _cached_filenames[4] = { "cached_sprites.xx3", }; -#define OPENTTD_SPRITES_COUNT 93 +#define OPENTTD_SPRITES_COUNT 94 static const uint16 _openttd_grf_indexes[] = { SPR_OPENTTD_BASE+0, SPR_OPENTTD_BASE+7, // icons etc 134, 134, // euro symbol medium size @@ -777,7 +777,7 @@ static void CheckGrfFile() s = str_fmt("%s%s", _path.data_dir, files_dos.basic[0]); f = fopen(s, "r"); - if (f != NULL) { + if (f != NULL) { _use_dos_palette = true; return; } diff --git a/table/sprites.h b/table/sprites.h index f60ace649..5adbd731c 100644 --- a/table/sprites.h +++ b/table/sprites.h @@ -48,10 +48,11 @@ enum Sprites { SPR_BLOT = SPR_OPENTTD_BASE + 32, // colored circle (mainly used as vehicle profit marker and for sever compatibility) - SPR_PIN_UP = SPR_OPENTTD_BASE + 62, // pin icon + SPR_PIN_UP = SPR_OPENTTD_BASE + 62, // pin icon SPR_PIN_DOWN = SPR_OPENTTD_BASE + 63, - - + SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 94, // resize icon + + /* Network GUI sprites */ SPR_SQUARE = SPR_OPENTTD_BASE + 23, // colored square (used for newgrf compatibility) SPR_LOCK = SPR_OPENTTD_BASE + 22, // lock icon (for password protected servers) @@ -62,7 +63,7 @@ enum Sprites { /* Shadow cell */ SPR_SHADOW_CELL = 1004, - + /* Sliced view shadow cells */ /* Maybe we have differen ones in the future */ SPR_MAX_SLICE = SPR_OPENTTD_BASE + 71, |