author | rubidium |
Wed, 19 Sep 2007 16:36:42 +0000 | |
changeset 8097 | 68eefbb4ff46 |
parent 8088 | 7c1a4dd586ae |
child 8263 | cf890c002a88 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
3 |
/** @file gfxinit.cpp */ |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1844
diff
changeset
|
6 |
#include "openttd.h" |
1299
0a6510cc889b
(svn r1803) Move debugging stuff into files of it's own
tron
parents:
1250
diff
changeset
|
7 |
#include "debug.h" |
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
8 |
#include "functions.h" |
0 | 9 |
#include "gfx.h" |
2340
0a9f3eeccb96
(svn r2866) Move all functions and tables which aren't directly involved in managing the sprite heap to a new file gfxinit.c.
tron
parents:
2339
diff
changeset
|
10 |
#include "gfxinit.h" |
1349
07514c2cc6d1
(svn r1853) Move spritecache function declarations into a header of their own and use SpriteID as parameter type where appropriate
tron
parents:
1348
diff
changeset
|
11 |
#include "spritecache.h" |
1363
01d3de5d8039
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1361
diff
changeset
|
12 |
#include "table/sprites.h" |
0 | 13 |
#include "fileio.h" |
4200
a45420ba0c23
(svn r5684) - Codechange: create an strtolower() function that uses tolower() on a whole string and apply it in the places this was used.
Darkvater
parents:
4059
diff
changeset
|
14 |
#include "string.h" |
463
91bcad840bcd
(svn r687) Export InitNewGRFFile() and DecodeSpecialSprite() properly.
pasky
parents:
452
diff
changeset
|
15 |
#include "newgrf.h" |
961 | 16 |
#include "md5.h" |
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2142
diff
changeset
|
17 |
#include "variables.h" |
5156
5edaa8f9b295
(svn r7254) -Fix (r7250): move unicode glyph map initialisation to just before newgrf files are loaded, else newgrf glyphs will be cleared out too. (thanks Hadez)
peter1138
parents:
5151
diff
changeset
|
18 |
#include "fontcache.h" |
4472
745f9ebe2216
(svn r6257) Use memcmp() to check the MD5 sum instead of using a home brewed loop
tron
parents:
4209
diff
changeset
|
19 |
#include <string.h> |
0 | 20 |
|
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
21 |
struct MD5File { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
22 |
const char * filename; ///< filename |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
23 |
md5_byte_t hash[16]; ///< md5 sum of the file |
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
24 |
}; |
961 | 25 |
|
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
26 |
struct FileList { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
27 |
MD5File basic[4]; ///< grf files that always have to be loaded |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
28 |
MD5File landscape[3]; ///< landscape specific grf files |
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
29 |
}; |
0 | 30 |
|
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
31 |
enum { |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
32 |
SKIP = 0xFFFE, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
33 |
END = 0xFFFF |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
34 |
}; |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
35 |
|
961 | 36 |
#include "table/files.h" |
0 | 37 |
#include "table/landscape_sprite.h" |
38 |
||
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
39 |
static const SpriteID * const _landscape_spriteindexes[] = { |
0 | 40 |
_landscape_spriteindexes_1, |
41 |
_landscape_spriteindexes_2, |
|
42 |
_landscape_spriteindexes_3, |
|
43 |
}; |
|
44 |
||
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
45 |
static const SpriteID * const _slopes_spriteindexes[] = { |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
46 |
_slopes_spriteindexes_0, |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
47 |
_slopes_spriteindexes_1, |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
48 |
_slopes_spriteindexes_2, |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
49 |
_slopes_spriteindexes_3, |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
50 |
}; |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
51 |
|
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
52 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
53 |
static uint LoadGrfFile(const char* filename, uint load_index, int file_index) |
0 | 54 |
{ |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
55 |
uint load_index_org = load_index; |
7404
fc0559157f16
(svn r10157) -Fix: use as indentified for PNGs, the place of the image as it was in the grf, not the internal SpriteID
truelight
parents:
7276
diff
changeset
|
56 |
uint sprite_id = 0; |
0 | 57 |
|
58 |
FioOpenFile(file_index, filename); |
|
365
5752af05ed75
(svn r553) -newgrf: Special routine for loading newgrf files. LoadNewGrfFile() introduced; will get more handy when loading stages will be introduced (octo and pasky).
darkvater
parents:
364
diff
changeset
|
59 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5296
diff
changeset
|
60 |
DEBUG(sprite, 2, "Reading grf-file '%s'", filename); |
0 | 61 |
|
7404
fc0559157f16
(svn r10157) -Fix: use as indentified for PNGs, the place of the image as it was in the grf, not the internal SpriteID
truelight
parents:
7276
diff
changeset
|
62 |
while (LoadNextSprite(load_index, file_index, sprite_id)) { |
0 | 63 |
load_index++; |
7404
fc0559157f16
(svn r10157) -Fix: use as indentified for PNGs, the place of the image as it was in the grf, not the internal SpriteID
truelight
parents:
7276
diff
changeset
|
64 |
sprite_id++; |
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
65 |
if (load_index >= MAX_SPRITES) { |
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
66 |
error("Too many sprites. Recompile with higher MAX_SPRITES value or remove some custom GRF files."); |
0 | 67 |
} |
68 |
} |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5296
diff
changeset
|
69 |
DEBUG(sprite, 2, "Currently %i sprites are loaded", load_index); |
0 | 70 |
|
365
5752af05ed75
(svn r553) -newgrf: Special routine for loading newgrf files. LoadNewGrfFile() introduced; will get more handy when loading stages will be introduced (octo and pasky).
darkvater
parents:
364
diff
changeset
|
71 |
return load_index - load_index_org; |
5752af05ed75
(svn r553) -newgrf: Special routine for loading newgrf files. LoadNewGrfFile() introduced; will get more handy when loading stages will be introduced (octo and pasky).
darkvater
parents:
364
diff
changeset
|
72 |
} |
5752af05ed75
(svn r553) -newgrf: Special routine for loading newgrf files. LoadNewGrfFile() introduced; will get more handy when loading stages will be introduced (octo and pasky).
darkvater
parents:
364
diff
changeset
|
73 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
74 |
|
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
75 |
static void LoadGrfIndexed(const char* filename, const SpriteID* index_tbl, int file_index) |
365
5752af05ed75
(svn r553) -newgrf: Special routine for loading newgrf files. LoadNewGrfFile() introduced; will get more handy when loading stages will be introduced (octo and pasky).
darkvater
parents:
364
diff
changeset
|
76 |
{ |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
77 |
uint start; |
7404
fc0559157f16
(svn r10157) -Fix: use as indentified for PNGs, the place of the image as it was in the grf, not the internal SpriteID
truelight
parents:
7276
diff
changeset
|
78 |
uint sprite_id = 0; |
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
79 |
|
365
5752af05ed75
(svn r553) -newgrf: Special routine for loading newgrf files. LoadNewGrfFile() introduced; will get more handy when loading stages will be introduced (octo and pasky).
darkvater
parents:
364
diff
changeset
|
80 |
FioOpenFile(file_index, filename); |
5752af05ed75
(svn r553) -newgrf: Special routine for loading newgrf files. LoadNewGrfFile() introduced; will get more handy when loading stages will be introduced (octo and pasky).
darkvater
parents:
364
diff
changeset
|
81 |
|
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5296
diff
changeset
|
82 |
DEBUG(sprite, 2, "Reading indexed grf-file '%s'", filename); |
0 | 83 |
|
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
84 |
while ((start = *index_tbl++) != END) { |
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
85 |
uint end = *index_tbl++; |
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
86 |
|
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
87 |
if (start == SKIP) { // skip sprites (amount in second var) |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
88 |
SkipSprites(end); |
7404
fc0559157f16
(svn r10157) -Fix: use as indentified for PNGs, the place of the image as it was in the grf, not the internal SpriteID
truelight
parents:
7276
diff
changeset
|
89 |
sprite_id += end; |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
90 |
} else { // load sprites and use indexes from start to end |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
91 |
do { |
1844
372dae999453
(svn r2349) - Fix: remove warning from release build when assertions are no longer active
Darkvater
parents:
1725
diff
changeset
|
92 |
#ifdef NDEBUG |
7404
fc0559157f16
(svn r10157) -Fix: use as indentified for PNGs, the place of the image as it was in the grf, not the internal SpriteID
truelight
parents:
7276
diff
changeset
|
93 |
LoadNextSprite(start, file_index, sprite_id); |
1844
372dae999453
(svn r2349) - Fix: remove warning from release build when assertions are no longer active
Darkvater
parents:
1725
diff
changeset
|
94 |
#else |
7404
fc0559157f16
(svn r10157) -Fix: use as indentified for PNGs, the place of the image as it was in the grf, not the internal SpriteID
truelight
parents:
7276
diff
changeset
|
95 |
bool b = LoadNextSprite(start, file_index, sprite_id); |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
96 |
assert(b); |
1844
372dae999453
(svn r2349) - Fix: remove warning from release build when assertions are no longer active
Darkvater
parents:
1725
diff
changeset
|
97 |
#endif |
7404
fc0559157f16
(svn r10157) -Fix: use as indentified for PNGs, the place of the image as it was in the grf, not the internal SpriteID
truelight
parents:
7276
diff
changeset
|
98 |
sprite_id++; |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
99 |
} while (++start <= end); |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
100 |
} |
0 | 101 |
} |
184
dbeaaaf8b2bb
(svn r185) -Fix: [1016954] Cached_sprites does now work again
truelight
parents:
182
diff
changeset
|
102 |
} |
0 | 103 |
|
104 |
||
961 | 105 |
/* Check that the supplied MD5 hash matches that stored for the supplied filename */ |
106 |
static bool CheckMD5Digest(const MD5File file, md5_byte_t *digest, bool warn) |
|
107 |
{ |
|
4472
745f9ebe2216
(svn r6257) Use memcmp() to check the MD5 sum instead of using a home brewed loop
tron
parents:
4209
diff
changeset
|
108 |
if (memcmp(file.hash, digest, sizeof(file.hash)) == 0) return true; |
745f9ebe2216
(svn r6257) Use memcmp() to check the MD5 sum instead of using a home brewed loop
tron
parents:
4209
diff
changeset
|
109 |
if (warn) fprintf(stderr, "MD5 of %s is ****INCORRECT**** - File Corrupt.\n", file.filename); |
745f9ebe2216
(svn r6257) Use memcmp() to check the MD5 sum instead of using a home brewed loop
tron
parents:
4209
diff
changeset
|
110 |
return false; |
961 | 111 |
} |
112 |
||
1019
6363b8a4273e
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
966
diff
changeset
|
113 |
/* Calculate and check the MD5 hash of the supplied filename. |
961 | 114 |
* returns true if the checksum is correct */ |
115 |
static bool FileMD5(const MD5File file, bool warn) |
|
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
116 |
{ |
8070
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
7413
diff
changeset
|
117 |
size_t size; |
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
7413
diff
changeset
|
118 |
FILE *f = FioFOpenFile(file.filename, "rb", DATA_DIR, &size); |
5733
8b3c5398687f
(svn r7766) -Fix: [OSX] removed incorrect debug message about corrupted/missing grf files
bjarni
parents:
5726
diff
changeset
|
119 |
|
862
d7e52ef99f42
(svn r1343) -Fix: [Graphic] Autorail icon is now correct (Darkvater)
truelight
parents:
614
diff
changeset
|
120 |
if (f != NULL) { |
2028
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
121 |
md5_state_t filemd5state; |
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
122 |
md5_byte_t buffer[1024]; |
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
123 |
md5_byte_t digest[16]; |
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
124 |
size_t len; |
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
125 |
|
961 | 126 |
md5_init(&filemd5state); |
8070
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
7413
diff
changeset
|
127 |
while ((len = fread(buffer, 1, (size > sizeof(buffer)) ? sizeof(buffer) : size, f)) != 0 && size != 0) { |
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
7413
diff
changeset
|
128 |
size -= len; |
961 | 129 |
md5_append(&filemd5state, buffer, len); |
8070
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
7413
diff
changeset
|
130 |
} |
961 | 131 |
|
7413
eadff82c1b45
(svn r10170) -Codechange: remove some duplication of code.
rubidium
parents:
7404
diff
changeset
|
132 |
if (ferror(f) && warn) ShowInfoF("Error Reading from %s \n", file.filename); |
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8070
diff
changeset
|
133 |
FioFCloseFile(f); |
1019
6363b8a4273e
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
966
diff
changeset
|
134 |
|
961 | 135 |
md5_finish(&filemd5state, digest); |
2639 | 136 |
return CheckMD5Digest(file, digest, warn); |
961 | 137 |
} else { // file not found |
138 |
return false; |
|
1019
6363b8a4273e
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
966
diff
changeset
|
139 |
} |
961 | 140 |
} |
141 |
||
142 |
/* Checks, if either the Windows files exist (TRG1R.GRF) or the DOS files (TRG1.GRF) |
|
143 |
* by comparing the MD5 checksums of the files. _use_dos_palette is set accordingly. |
|
1019
6363b8a4273e
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
966
diff
changeset
|
144 |
* If neither are found, Windows palette is assumed. |
961 | 145 |
* |
146 |
* (Note: Also checks sample.cat for corruption) */ |
|
6573 | 147 |
void CheckExternalFiles() |
961 | 148 |
{ |
1355 | 149 |
uint i; |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
150 |
/* count of files from this version */ |
1355 | 151 |
uint dos = 0; |
152 |
uint win = 0; |
|
961 | 153 |
|
2028
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
154 |
for (i = 0; i < 2; i++) if (FileMD5(files_dos.basic[i], true)) dos++; |
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
155 |
for (i = 0; i < 3; i++) if (FileMD5(files_dos.landscape[i], true)) dos++; |
961 | 156 |
|
2028
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
157 |
for (i = 0; i < 2; i++) if (FileMD5(files_win.basic[i], true)) win++; |
d7686f53adf2
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
158 |
for (i = 0; i < 3; i++) if (FileMD5(files_win.landscape[i], true)) win++; |
961 | 159 |
|
1355 | 160 |
if (!FileMD5(sample_cat_win, false) && !FileMD5(sample_cat_dos, false)) |
5827
20879afb77f6
(svn r8013) -Codechange (r6921, rUnknown): Show the error message of corrupt or missing (own) files
Darkvater
parents:
5733
diff
changeset
|
161 |
ShowInfo("Your 'sample.cat' file is corrupted or missing!"); |
961 | 162 |
|
4934
5f937d83f3eb
(svn r6921) - PEBKAC: Add an MD5 sum check of our own data files, and warn if they don't match.
peter1138
parents:
4795
diff
changeset
|
163 |
for (i = 0; i < lengthof(files_openttd); i++) { |
5f937d83f3eb
(svn r6921) - PEBKAC: Add an MD5 sum check of our own data files, and warn if they don't match.
peter1138
parents:
4795
diff
changeset
|
164 |
if (!FileMD5(files_openttd[i], false)) { |
5827
20879afb77f6
(svn r8013) -Codechange (r6921, rUnknown): Show the error message of corrupt or missing (own) files
Darkvater
parents:
5733
diff
changeset
|
165 |
ShowInfoF("Your '%s' file is corrupted or missing!", files_openttd[i].filename); |
4934
5f937d83f3eb
(svn r6921) - PEBKAC: Add an MD5 sum check of our own data files, and warn if they don't match.
peter1138
parents:
4795
diff
changeset
|
166 |
} |
5f937d83f3eb
(svn r6921) - PEBKAC: Add an MD5 sum check of our own data files, and warn if they don't match.
peter1138
parents:
4795
diff
changeset
|
167 |
} |
5f937d83f3eb
(svn r6921) - PEBKAC: Add an MD5 sum check of our own data files, and warn if they don't match.
peter1138
parents:
4795
diff
changeset
|
168 |
|
1380
7faf03f67dc3
(svn r1884) Change palette detection algorithm: Use the DOS palette if there are no Windows .grfs but at least one DOS .grf
tron
parents:
1378
diff
changeset
|
169 |
/* |
1389 | 170 |
* forced DOS palette via command line -> leave it that way |
1380
7faf03f67dc3
(svn r1884) Change palette detection algorithm: Use the DOS palette if there are no Windows .grfs but at least one DOS .grf
tron
parents:
1378
diff
changeset
|
171 |
* all Windows files present -> Windows palette |
7faf03f67dc3
(svn r1884) Change palette detection algorithm: Use the DOS palette if there are no Windows .grfs but at least one DOS .grf
tron
parents:
1378
diff
changeset
|
172 |
* all DOS files present -> DOS palette |
7faf03f67dc3
(svn r1884) Change palette detection algorithm: Use the DOS palette if there are no Windows .grfs but at least one DOS .grf
tron
parents:
1378
diff
changeset
|
173 |
* no Windows files present and any DOS file present -> DOS palette |
7faf03f67dc3
(svn r1884) Change palette detection algorithm: Use the DOS palette if there are no Windows .grfs but at least one DOS .grf
tron
parents:
1378
diff
changeset
|
174 |
* otherwise -> Windows palette |
7faf03f67dc3
(svn r1884) Change palette detection algorithm: Use the DOS palette if there are no Windows .grfs but at least one DOS .grf
tron
parents:
1378
diff
changeset
|
175 |
*/ |
1389 | 176 |
if (_use_dos_palette) { |
177 |
return; |
|
178 |
} else if (win == 5) { |
|
961 | 179 |
_use_dos_palette = false; |
1381 | 180 |
} else if (dos == 5 || (win == 0 && dos > 0)) { |
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
181 |
_use_dos_palette = true; |
1380
7faf03f67dc3
(svn r1884) Change palette detection algorithm: Use the DOS palette if there are no Windows .grfs but at least one DOS .grf
tron
parents:
1378
diff
changeset
|
182 |
} else { |
961 | 183 |
_use_dos_palette = false; |
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
184 |
} |
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
185 |
} |
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
186 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
187 |
|
2353 | 188 |
static const SpriteID trg1idx[] = { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
189 |
0, 1, ///< Mouse cursor, ZZZ |
2353 | 190 |
/* Medium font */ |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
191 |
2, 92, ///< ' ' till 'z' |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
192 |
SKIP, 36, |
7225
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
193 |
160, 160, ///< Move Ÿ to the correct position |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
194 |
98, 98, ///< Up arrow |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
195 |
131, 133, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
196 |
SKIP, 1, ///< skip currency sign |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
197 |
135, 135, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
198 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
199 |
137, 137, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
200 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
201 |
139, 139, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
202 |
140, 140, ///< @todo Down arrow |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
203 |
141, 141, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
204 |
142, 142, ///< @todo Check mark |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
205 |
143, 143, ///< @todo Cross |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
206 |
144, 144, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
207 |
145, 145, ///< @todo Right arrow |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
208 |
146, 149, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
209 |
118, 122, ///< Transport markers |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
210 |
SKIP, 2, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
211 |
157, 157, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
212 |
114, 115, ///< Small up/down arrows |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
213 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
214 |
161, 225, |
2353 | 215 |
/* Small font */ |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
216 |
226, 316, ///< ' ' till 'z' |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
217 |
SKIP, 36, |
7225
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
218 |
384, 384, ///< Move Ÿ to the correct position |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
219 |
322, 322, ///< Up arrow |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
220 |
355, 357, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
221 |
SKIP, 1, ///< skip currency sign |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
222 |
359, 359, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
223 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
224 |
361, 361, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
225 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
226 |
363, 363, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
227 |
364, 364, ////< @todo Down arrow |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
228 |
365, 366, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
229 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
230 |
368, 368, |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
231 |
369, 369, ///< @todo Right arrow |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
232 |
370, 373, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
233 |
SKIP, 7, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
234 |
381, 381, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
235 |
SKIP, 3, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
236 |
385, 449, |
2353 | 237 |
/* Big font */ |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
238 |
450, 540, ///< ' ' till 'z' |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
239 |
SKIP, 36, |
7225
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
240 |
608, 608, ///< Move Ÿ to the correct position |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
241 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
242 |
579, 581, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
243 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
244 |
583, 583, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
245 |
SKIP, 5, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
246 |
589, 589, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
247 |
SKIP, 15, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
248 |
605, 605, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
249 |
SKIP, 3, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
250 |
609, 625, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
251 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
252 |
627, 632, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
253 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
254 |
634, 639, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
255 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
256 |
641, 657, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
257 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
258 |
659, 664, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
259 |
SKIP, 2, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
260 |
667, 671, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
261 |
SKIP, 1, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
262 |
673, 673, |
2353 | 263 |
/* Graphics */ |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
264 |
674, 4792, |
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
265 |
END |
2353 | 266 |
}; |
267 |
||
2565
19b3af477934
(svn r3102) - Fix (regression): Newly added sprite had problems when newgrf's where loaded. Thanks Tron for explaining what the problem was and how it should be solved.
Darkvater
parents:
2559
diff
changeset
|
268 |
/* NOTE: When adding a normal sprite, increase OPENTTD_SPRITES_COUNT with the |
19b3af477934
(svn r3102) - Fix (regression): Newly added sprite had problems when newgrf's where loaded. Thanks Tron for explaining what the problem was and how it should be solved.
Darkvater
parents:
2559
diff
changeset
|
269 |
* amount of sprites and add them to the end of the list, with the index of |
19b3af477934
(svn r3102) - Fix (regression): Newly added sprite had problems when newgrf's where loaded. Thanks Tron for explaining what the problem was and how it should be solved.
Darkvater
parents:
2559
diff
changeset
|
270 |
* the old sprite-count offset from SPR_OPENTTD_BASE. With this there is no |
19b3af477934
(svn r3102) - Fix (regression): Newly added sprite had problems when newgrf's where loaded. Thanks Tron for explaining what the problem was and how it should be solved.
Darkvater
parents:
2559
diff
changeset
|
271 |
* correspondence of any kind with the ID's in the grf file, but results in |
19b3af477934
(svn r3102) - Fix (regression): Newly added sprite had problems when newgrf's where loaded. Thanks Tron for explaining what the problem was and how it should be solved.
Darkvater
parents:
2559
diff
changeset
|
272 |
* a maximum use of sprite slots. */ |
2353 | 273 |
static const SpriteID _openttd_grf_indexes[] = { |
2571
ab7413dfe35a
(svn r3108) Confine the use of SPR_OPENTTD_BASE to table/sprites.h by adding/using some sprite enums
tron
parents:
2565
diff
changeset
|
274 |
SPR_IMG_AUTORAIL, SPR_CURSOR_WAYPOINT, // icons etc |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
275 |
134, 134, ///< euro symbol medium size |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
276 |
582, 582, ///< euro symbol large size |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
277 |
358, 358, ///< euro symbol tiny |
2571
ab7413dfe35a
(svn r3108) Confine the use of SPR_OPENTTD_BASE to table/sprites.h by adding/using some sprite enums
tron
parents:
2565
diff
changeset
|
278 |
SPR_CURSOR_CANAL, SPR_IMG_FASTFORWARD, // more icons |
7225
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
279 |
648, 648, ///< nordic char: æ |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
280 |
616, 616, ///< nordic char: Æ |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
281 |
666, 666, ///< nordic char: ø |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
282 |
634, 634, ///< nordic char: Ø |
4935
aa0721b7ae79
(svn r6922) -Feature: Add proper cloning sprites and cursors, different for each vehicle. Big thanks
Darkvater
parents:
4934
diff
changeset
|
283 |
SPR_PIN_UP, SPR_CURSOR_CLONE_TRAIN, // more icons |
7225
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
284 |
382, 383, ///< Œ œ tiny |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
285 |
158, 159, ///< Œ œ medium |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
286 |
606, 607, ///< Œ œ large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
287 |
360, 360, ///< Š tiny |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
288 |
362, 362, ///< š tiny |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
289 |
136, 136, ///< Š medium |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
290 |
138, 138, ///< š medium |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
291 |
584, 584, ///< Š large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
292 |
586, 586, ///< š large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
293 |
626, 626, ///< Ð large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
294 |
658, 658, ///< ð large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
295 |
374, 374, ///< Ž tiny |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
296 |
378, 378, ///< ž tiny |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
297 |
150, 150, ///< Ž medium |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
298 |
154, 154, ///< ž medium |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
299 |
598, 598, ///< Ž large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
300 |
602, 602, ///< ž large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
301 |
640, 640, ///< Þ large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
302 |
672, 672, ///< þ large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
303 |
380, 380, ///< º tiny |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
304 |
156, 156, ///< º medium |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
305 |
604, 604, ///< º large |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
306 |
317, 320, ///< { | } ~ tiny |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
307 |
93, 96, ///< { | } ~ medium |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6429
diff
changeset
|
308 |
541, 544, ///< { | } ~ large |
2571
ab7413dfe35a
(svn r3108) Confine the use of SPR_OPENTTD_BASE to table/sprites.h by adding/using some sprite enums
tron
parents:
2565
diff
changeset
|
309 |
SPR_HOUSE_ICON, SPR_HOUSE_ICON, |
7225
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
310 |
585, 585, ///< § large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
311 |
587, 587, ///< © large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
312 |
592, 592, ///< ® large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
313 |
594, 597, ///< ° ± ² ³ large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
314 |
633, 633, ///< × large |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
315 |
665, 665, ///< ÷ large |
4935
aa0721b7ae79
(svn r6922) -Feature: Add proper cloning sprites and cursors, different for each vehicle. Big thanks
Darkvater
parents:
4934
diff
changeset
|
316 |
SPR_SELL_TRAIN, SPR_SHARED_ORDERS_ICON, |
7225
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
317 |
377, 377, ///< · small |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
318 |
153, 153, ///< · medium |
e83351234693
(svn r9961) -Fix (r7182): some file were still in iso8859-15 instead of utf8.
rubidium
parents:
7187
diff
changeset
|
319 |
601, 601, ///< · large |
6429
02c062eb2c74
(svn r8838) -Feature: Show newgrf error messages loaded in Action B in the newgrf gui
maedhros
parents:
6338
diff
changeset
|
320 |
SPR_WARNING_SIGN, SPR_WARNING_SIGN, |
2588
40d7dba79fc7
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
321 |
END |
2353 | 322 |
}; |
323 |
||
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
324 |
|
6573 | 325 |
static void LoadSpriteTables() |
0 | 326 |
{ |
2639 | 327 |
const FileList* files = _use_dos_palette ? &files_dos : &files_win; |
328 |
uint load_index; |
|
1355 | 329 |
uint i; |
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
330 |
|
2353 | 331 |
LoadGrfIndexed(files->basic[0].filename, trg1idx, 0); |
2407 | 332 |
DupSprite( 2, 130); // non-breaking space medium |
333 |
DupSprite(226, 354); // non-breaking space tiny |
|
334 |
DupSprite(450, 578); // non-breaking space large |
|
2353 | 335 |
load_index = 4793; |
336 |
||
337 |
for (i = 1; files->basic[i].filename != NULL; i++) { |
|
2309 | 338 |
load_index += LoadGrfFile(files->basic[i].filename, load_index, i); |
339 |
} |
|
0 | 340 |
|
5151
0f939d1c0896
(svn r7246) -Codechange: Always reload sprite and NewGRF data when loading or starting a game, instead of only when the climate type is different.
peter1138
parents:
5000
diff
changeset
|
341 |
/* Load additional sprites for climates other than temperate */ |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6574
diff
changeset
|
342 |
if (_opt.landscape != LT_TEMPERATE) { |
2309 | 343 |
LoadGrfIndexed( |
5151
0f939d1c0896
(svn r7246) -Codechange: Always reload sprite and NewGRF data when loading or starting a game, instead of only when the climate type is different.
peter1138
parents:
5000
diff
changeset
|
344 |
files->landscape[_opt.landscape - 1].filename, |
0f939d1c0896
(svn r7246) -Codechange: Always reload sprite and NewGRF data when loading or starting a game, instead of only when the climate type is different.
peter1138
parents:
5000
diff
changeset
|
345 |
_landscape_spriteindexes[_opt.landscape - 1], |
2309 | 346 |
i++ |
347 |
); |
|
348 |
} |
|
0 | 349 |
|
4936
b51659a526ad
(svn r6923) -Codechange: Load nsignalsw.grf in the same way as other mandatory additional grfs
Darkvater
parents:
4935
diff
changeset
|
350 |
assert(load_index == SPR_SIGNALS_BASE); |
b51659a526ad
(svn r6923) -Codechange: Load nsignalsw.grf in the same way as other mandatory additional grfs
Darkvater
parents:
4935
diff
changeset
|
351 |
load_index += LoadGrfFile("nsignalsw.grf", load_index, i++); |
b51659a526ad
(svn r6923) -Codechange: Load nsignalsw.grf in the same way as other mandatory additional grfs
Darkvater
parents:
4935
diff
changeset
|
352 |
|
2512
fa66ff5ebf88
(svn r3038) Reorder the loading of standard graphics files to reflect a bit where in the sprite array the sprites end up and assert, that the indices are equal to the corresponding sprite base enums, to guard against typos.
tron
parents:
2411
diff
changeset
|
353 |
assert(load_index == SPR_CANALS_BASE); |
fa66ff5ebf88
(svn r3038) Reorder the loading of standard graphics files to reflect a bit where in the sprite array the sprites end up and assert, that the indices are equal to the corresponding sprite base enums, to guard against typos.
tron
parents:
2411
diff
changeset
|
354 |
load_index += LoadGrfFile("canalsw.grf", load_index, i++); |
fa66ff5ebf88
(svn r3038) Reorder the loading of standard graphics files to reflect a bit where in the sprite array the sprites end up and assert, that the indices are equal to the corresponding sprite base enums, to guard against typos.
tron
parents:
2411
diff
changeset
|
355 |
|
fa66ff5ebf88
(svn r3038) Reorder the loading of standard graphics files to reflect a bit where in the sprite array the sprites end up and assert, that the indices are equal to the corresponding sprite base enums, to guard against typos.
tron
parents:
2411
diff
changeset
|
356 |
assert(load_index == SPR_SLOPES_BASE); |
2309 | 357 |
LoadGrfIndexed("trkfoundw.grf", _slopes_spriteindexes[_opt.landscape], i++); |
1070
bef634a62323
(svn r1571) Feature: Visually enhanced autorail placing
dominik
parents:
1019
diff
changeset
|
358 |
|
2309 | 359 |
load_index = SPR_AUTORAIL_BASE; |
360 |
load_index += LoadGrfFile("autorail.grf", load_index, i++); |
|
142 | 361 |
|
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3252
diff
changeset
|
362 |
assert(load_index == SPR_ELRAIL_BASE); |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3252
diff
changeset
|
363 |
load_index += LoadGrfFile("elrailsw.grf", load_index, i++); |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3252
diff
changeset
|
364 |
|
3113
c0f312f22238
(svn r3717) - [2cc] Add 2cc colour maps and use for newgrf engines requiring them. Currently the second colour is fixed to be the player's colour.
peter1138
parents:
2639
diff
changeset
|
365 |
assert(load_index == SPR_2CCMAP_BASE); |
c0f312f22238
(svn r3717) - [2cc] Add 2cc colour maps and use for newgrf engines requiring them. Currently the second colour is fixed to be the player's colour.
peter1138
parents:
2639
diff
changeset
|
366 |
load_index += LoadGrfFile("2ccmap.grf", load_index, i++); |
c0f312f22238
(svn r3717) - [2cc] Add 2cc colour maps and use for newgrf engines requiring them. Currently the second colour is fixed to be the player's colour.
peter1138
parents:
2639
diff
changeset
|
367 |
|
2512
fa66ff5ebf88
(svn r3038) Reorder the loading of standard graphics files to reflect a bit where in the sprite array the sprites end up and assert, that the indices are equal to the corresponding sprite base enums, to guard against typos.
tron
parents:
2411
diff
changeset
|
368 |
assert(load_index == SPR_OPENTTD_BASE); |
fa66ff5ebf88
(svn r3038) Reorder the loading of standard graphics files to reflect a bit where in the sprite array the sprites end up and assert, that the indices are equal to the corresponding sprite base enums, to guard against typos.
tron
parents:
2411
diff
changeset
|
369 |
LoadGrfIndexed("openttd.grf", _openttd_grf_indexes, i++); |
2577
a122c0daa430
(svn r3114) Close two gaps in the sprite array when loading openttd.grf. That's seven more free sprite slots, yay!
tron
parents:
2571
diff
changeset
|
370 |
load_index = SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT; |
142 | 371 |
|
4059
f1442dfe1c8a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
3355
diff
changeset
|
372 |
assert(load_index == SPR_AIRPORTX_BASE); |
f1442dfe1c8a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
3355
diff
changeset
|
373 |
load_index += LoadGrfFile("airports.grf", load_index, i++); |
f1442dfe1c8a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
3355
diff
changeset
|
374 |
|
6338
0fb4f452873c
(svn r8735) -Feature: drive-through road stops made possible by the hard work of mart3p.
rubidium
parents:
6015
diff
changeset
|
375 |
assert(load_index == SPR_ROADSTOP_BASE); |
0fb4f452873c
(svn r8735) -Feature: drive-through road stops made possible by the hard work of mart3p.
rubidium
parents:
6015
diff
changeset
|
376 |
load_index += LoadGrfFile("roadstops.grf", load_index, i++); |
0fb4f452873c
(svn r8735) -Feature: drive-through road stops made possible by the hard work of mart3p.
rubidium
parents:
6015
diff
changeset
|
377 |
|
7139
4ae3ab180d05
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6683
diff
changeset
|
378 |
assert(load_index == SPR_GROUP_BASE); |
4ae3ab180d05
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6683
diff
changeset
|
379 |
load_index += LoadGrfFile("group.grf", load_index, i++); |
4ae3ab180d05
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6683
diff
changeset
|
380 |
|
7187
f7dc3204d457
(svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0.
rubidium
parents:
7139
diff
changeset
|
381 |
assert(load_index == SPR_TRAMWAY_BASE); |
f7dc3204d457
(svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0.
rubidium
parents:
7139
diff
changeset
|
382 |
load_index += LoadGrfFile("tramtrkw.grf", load_index, i++); |
f7dc3204d457
(svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0.
rubidium
parents:
7139
diff
changeset
|
383 |
|
7260
23cd58b6bf51
(svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road.
rubidium
parents:
7225
diff
changeset
|
384 |
assert(load_index == SPR_ONEWAY_BASE); |
23cd58b6bf51
(svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road.
rubidium
parents:
7225
diff
changeset
|
385 |
load_index += LoadGrfFile("oneway.grf", load_index, i++); |
23cd58b6bf51
(svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road.
rubidium
parents:
7225
diff
changeset
|
386 |
|
8097
68eefbb4ff46
(svn r11128) -Fix: a lot of graphical glitches by changing some bounding boxes. It's not perfect yet, but a *very* good step into the right direction. Patch by frosch.
rubidium
parents:
8088
diff
changeset
|
387 |
load_index++; // SPR_EMPTY_BOUNDING_BOX |
68eefbb4ff46
(svn r11128) -Fix: a lot of graphical glitches by changing some bounding boxes. It's not perfect yet, but a *very* good step into the right direction. Patch by frosch.
rubidium
parents:
8088
diff
changeset
|
388 |
|
7276
fdb2191fac67
(svn r10017) -Add (FS#790): more languages flags for servers
glx
parents:
7260
diff
changeset
|
389 |
assert(load_index == SPR_FLAGS_BASE); |
fdb2191fac67
(svn r10017) -Add (FS#790): more languages flags for servers
glx
parents:
7260
diff
changeset
|
390 |
load_index += LoadGrfFile("flags.grf", load_index, i++); |
fdb2191fac67
(svn r10017) -Add (FS#790): more languages flags for servers
glx
parents:
7260
diff
changeset
|
391 |
|
5156
5edaa8f9b295
(svn r7254) -Fix (r7250): move unicode glyph map initialisation to just before newgrf files are loaded, else newgrf glyphs will be cleared out too. (thanks Hadez)
peter1138
parents:
5151
diff
changeset
|
392 |
/* Initialize the unicode to sprite mapping table */ |
5edaa8f9b295
(svn r7254) -Fix (r7250): move unicode glyph map initialisation to just before newgrf files are loaded, else newgrf glyphs will be cleared out too. (thanks Hadez)
peter1138
parents:
5151
diff
changeset
|
393 |
InitializeUnicodeGlyphMap(); |
5edaa8f9b295
(svn r7254) -Fix (r7250): move unicode glyph map initialisation to just before newgrf files are loaded, else newgrf glyphs will be cleared out too. (thanks Hadez)
peter1138
parents:
5151
diff
changeset
|
394 |
|
2342
c19fb4f2df30
(svn r2868) Change the way NewGRFs are loaded: The loading process i no longer bolted onto the normal graphics loading.
tron
parents:
2340
diff
changeset
|
395 |
LoadNewGRF(load_index, i); |
0 | 396 |
} |
397 |
||
398 |
||
6573 | 399 |
void GfxLoadSprites() |
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1070
diff
changeset
|
400 |
{ |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5296
diff
changeset
|
401 |
DEBUG(sprite, 2, "Loading sprite set %d", _opt.landscape); |
0 | 402 |
|
5151
0f939d1c0896
(svn r7246) -Codechange: Always reload sprite and NewGRF data when loading or starting a game, instead of only when the climate type is different.
peter1138
parents:
5000
diff
changeset
|
403 |
GfxInitSpriteMem(); |
0f939d1c0896
(svn r7246) -Codechange: Always reload sprite and NewGRF data when loading or starting a game, instead of only when the climate type is different.
peter1138
parents:
5000
diff
changeset
|
404 |
LoadSpriteTables(); |
0f939d1c0896
(svn r7246) -Codechange: Always reload sprite and NewGRF data when loading or starting a game, instead of only when the climate type is different.
peter1138
parents:
5000
diff
changeset
|
405 |
GfxInitPalettes(); |
0 | 406 |
} |