mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r1343) -Fix: [Graphic] Autorail icon is now correct (Darkvater)
-Fix: [Graphic] Added resize icon (tnx tokai)
This commit is contained in:
parent
a72d993e65
commit
d382463f8a
BIN
data/openttd.grf
BIN
data/openttd.grf
Binary file not shown.
|
@ -215,7 +215,7 @@ static bool LoadNextSprite(int load_index, byte file_index)
|
||||||
|
|
||||||
_replace_sprites_offset[0]++;
|
_replace_sprites_offset[0]++;
|
||||||
_replace_sprites_count[0]--;
|
_replace_sprites_count[0]--;
|
||||||
|
|
||||||
if ((offset + count) <= NUM_SPRITES) {
|
if ((offset + count) <= NUM_SPRITES) {
|
||||||
load_index = offset;
|
load_index = offset;
|
||||||
} else {
|
} else {
|
||||||
|
@ -743,7 +743,7 @@ static const char * const _cached_filenames[4] = {
|
||||||
"cached_sprites.xx3",
|
"cached_sprites.xx3",
|
||||||
};
|
};
|
||||||
|
|
||||||
#define OPENTTD_SPRITES_COUNT 93
|
#define OPENTTD_SPRITES_COUNT 94
|
||||||
static const uint16 _openttd_grf_indexes[] = {
|
static const uint16 _openttd_grf_indexes[] = {
|
||||||
SPR_OPENTTD_BASE+0, SPR_OPENTTD_BASE+7, // icons etc
|
SPR_OPENTTD_BASE+0, SPR_OPENTTD_BASE+7, // icons etc
|
||||||
134, 134, // euro symbol medium size
|
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]);
|
s = str_fmt("%s%s", _path.data_dir, files_dos.basic[0]);
|
||||||
f = fopen(s, "r");
|
f = fopen(s, "r");
|
||||||
if (f != NULL) {
|
if (f != NULL) {
|
||||||
_use_dos_palette = true;
|
_use_dos_palette = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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_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_PIN_DOWN = SPR_OPENTTD_BASE + 63,
|
||||||
|
SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 94, // resize icon
|
||||||
|
|
||||||
|
|
||||||
/* Network GUI sprites */
|
/* Network GUI sprites */
|
||||||
SPR_SQUARE = SPR_OPENTTD_BASE + 23, // colored square (used for newgrf compatibility)
|
SPR_SQUARE = SPR_OPENTTD_BASE + 23, // colored square (used for newgrf compatibility)
|
||||||
SPR_LOCK = SPR_OPENTTD_BASE + 22, // lock icon (for password protected servers)
|
SPR_LOCK = SPR_OPENTTD_BASE + 22, // lock icon (for password protected servers)
|
||||||
|
@ -62,7 +63,7 @@ enum Sprites {
|
||||||
|
|
||||||
/* Shadow cell */
|
/* Shadow cell */
|
||||||
SPR_SHADOW_CELL = 1004,
|
SPR_SHADOW_CELL = 1004,
|
||||||
|
|
||||||
/* Sliced view shadow cells */
|
/* Sliced view shadow cells */
|
||||||
/* Maybe we have differen ones in the future */
|
/* Maybe we have differen ones in the future */
|
||||||
SPR_MAX_SLICE = SPR_OPENTTD_BASE + 71,
|
SPR_MAX_SLICE = SPR_OPENTTD_BASE + 71,
|
||||||
|
|
Loading…
Reference in New Issue