author | Darkvater |
Tue, 31 Oct 2006 23:04:47 +0000 | |
changeset 5009 | 0ae33f104d4f |
parent 5000 | 340be626096e |
child 5151 | 23150e1b0660 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
0 | 3 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1844
diff
changeset
|
4 |
#include "openttd.h" |
1299
39c06aba09aa
(svn r1803) Move debugging stuff into files of it's own
tron
parents:
1250
diff
changeset
|
5 |
#include "debug.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
6 |
#include "functions.h" |
0 | 7 |
#include "gfx.h" |
2340
e18ef06bc59a
(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
|
8 |
#include "gfxinit.h" |
1349
15979a2e9001
(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
|
9 |
#include "spritecache.h" |
1363
775a7ee52369
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1361
diff
changeset
|
10 |
#include "table/sprites.h" |
0 | 11 |
#include "fileio.h" |
4200
e6ba94085b81
(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
|
12 |
#include "string.h" |
463
97ec66c280f2
(svn r687) Export InitNewGRFFile() and DecodeSpecialSprite() properly.
pasky
parents:
452
diff
changeset
|
13 |
#include "newgrf.h" |
961 | 14 |
#include "md5.h" |
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2142
diff
changeset
|
15 |
#include "variables.h" |
4472
93758d1da52d
(svn r6257) Use memcmp() to check the MD5 sum instead of using a home brewed loop
tron
parents:
4209
diff
changeset
|
16 |
#include <string.h> |
0 | 17 |
|
961 | 18 |
typedef struct MD5File { |
19 |
const char * const filename; // filename |
|
962
efeee714810e
(svn r1454) -Fix: small warnings in spritecache.c
darkvater
parents:
961
diff
changeset
|
20 |
const md5_byte_t hash[16]; // md5 sum of the file |
961 | 21 |
} MD5File; |
22 |
||
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
23 |
typedef struct FileList { |
4936
ac3a8ba42785
(svn r6923) -Codechange: Load nsignalsw.grf in the same way as other mandatory additional grfs
Darkvater
parents:
4935
diff
changeset
|
24 |
const MD5File basic[4]; // grf files that always have to be loaded |
961 | 25 |
const MD5File landscape[3]; // landscape specific grf files |
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
26 |
} FileList; |
0 | 27 |
|
2588
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
28 |
enum { |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
29 |
SKIP = 0xFFFE, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
30 |
END = 0xFFFF |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
31 |
}; |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
32 |
|
961 | 33 |
#include "table/files.h" |
0 | 34 |
#include "table/landscape_sprite.h" |
35 |
||
2187
a0e206ce9fbf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
36 |
static const SpriteID * const _landscape_spriteindexes[] = { |
0 | 37 |
_landscape_spriteindexes_1, |
38 |
_landscape_spriteindexes_2, |
|
39 |
_landscape_spriteindexes_3, |
|
40 |
}; |
|
41 |
||
2187
a0e206ce9fbf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
42 |
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
|
43 |
_slopes_spriteindexes_0, |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
44 |
_slopes_spriteindexes_1, |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
45 |
_slopes_spriteindexes_2, |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
46 |
_slopes_spriteindexes_3, |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
47 |
}; |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
48 |
|
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
49 |
|
2342
aae24c9661ba
(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
|
50 |
static uint LoadGrfFile(const char* filename, uint load_index, int file_index) |
0 | 51 |
{ |
2342
aae24c9661ba
(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
|
52 |
uint load_index_org = load_index; |
0 | 53 |
|
54 |
FioOpenFile(file_index, filename); |
|
365
957b98a0e1e8
(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
|
55 |
|
366
05c09e262c8e
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
365
diff
changeset
|
56 |
DEBUG(spritecache, 2) ("Reading grf-file ``%s''", filename); |
0 | 57 |
|
58 |
while (LoadNextSprite(load_index, file_index)) { |
|
59 |
load_index++; |
|
2187
a0e206ce9fbf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
60 |
if (load_index >= MAX_SPRITES) { |
a0e206ce9fbf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
61 |
error("Too many sprites. Recompile with higher MAX_SPRITES value or remove some custom GRF files."); |
0 | 62 |
} |
63 |
} |
|
2187
a0e206ce9fbf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
64 |
DEBUG(spritecache, 2) ("Currently %i sprites are loaded", load_index); |
0 | 65 |
|
365
957b98a0e1e8
(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
|
66 |
return load_index - load_index_org; |
957b98a0e1e8
(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
|
67 |
} |
957b98a0e1e8
(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
|
68 |
|
2342
aae24c9661ba
(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
|
69 |
|
aae24c9661ba
(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
|
70 |
static void LoadGrfIndexed(const char* filename, const SpriteID* index_tbl, int file_index) |
365
957b98a0e1e8
(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 |
{ |
2342
aae24c9661ba
(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
|
72 |
uint start; |
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
73 |
|
365
957b98a0e1e8
(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
|
74 |
FioOpenFile(file_index, filename); |
957b98a0e1e8
(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
|
75 |
|
366
05c09e262c8e
(svn r554) -newgrf: Keep track of GRF files. Remember them all in a linked list, this already enables tests for an already loaded GRF file in SkipIf(). Patch by octo, heavily re-hammered by pasky
darkvater
parents:
365
diff
changeset
|
76 |
DEBUG(spritecache, 2) ("Reading indexed grf-file ``%s''", filename); |
0 | 77 |
|
2588
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
78 |
while ((start = *index_tbl++) != END) { |
2342
aae24c9661ba
(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
|
79 |
uint end = *index_tbl++; |
aae24c9661ba
(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
|
80 |
|
2588
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
81 |
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
|
82 |
SkipSprites(end); |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
83 |
} 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
|
84 |
do { |
1844
f1552d831ed5
(svn r2349) - Fix: remove warning from release build when assertions are no longer active
Darkvater
parents:
1725
diff
changeset
|
85 |
#ifdef NDEBUG |
f1552d831ed5
(svn r2349) - Fix: remove warning from release build when assertions are no longer active
Darkvater
parents:
1725
diff
changeset
|
86 |
LoadNextSprite(start, file_index); |
f1552d831ed5
(svn r2349) - Fix: remove warning from release build when assertions are no longer active
Darkvater
parents:
1725
diff
changeset
|
87 |
#else |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
88 |
bool b = LoadNextSprite(start, file_index); |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
89 |
assert(b); |
1844
f1552d831ed5
(svn r2349) - Fix: remove warning from release build when assertions are no longer active
Darkvater
parents:
1725
diff
changeset
|
90 |
#endif |
37
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
91 |
} while (++start <= end); |
61bf1df68d82
(svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents:
0
diff
changeset
|
92 |
} |
0 | 93 |
} |
184
dbeaaaf8b2bb
(svn r185) -Fix: [1016954] Cached_sprites does now work again
truelight
parents:
182
diff
changeset
|
94 |
} |
0 | 95 |
|
96 |
||
961 | 97 |
/* Check that the supplied MD5 hash matches that stored for the supplied filename */ |
98 |
static bool CheckMD5Digest(const MD5File file, md5_byte_t *digest, bool warn) |
|
99 |
{ |
|
4472
93758d1da52d
(svn r6257) Use memcmp() to check the MD5 sum instead of using a home brewed loop
tron
parents:
4209
diff
changeset
|
100 |
if (memcmp(file.hash, digest, sizeof(file.hash)) == 0) return true; |
93758d1da52d
(svn r6257) Use memcmp() to check the MD5 sum instead of using a home brewed loop
tron
parents:
4209
diff
changeset
|
101 |
if (warn) fprintf(stderr, "MD5 of %s is ****INCORRECT**** - File Corrupt.\n", file.filename); |
93758d1da52d
(svn r6257) Use memcmp() to check the MD5 sum instead of using a home brewed loop
tron
parents:
4209
diff
changeset
|
102 |
return false; |
961 | 103 |
} |
104 |
||
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
966
diff
changeset
|
105 |
/* Calculate and check the MD5 hash of the supplied filename. |
961 | 106 |
* returns true if the checksum is correct */ |
107 |
static bool FileMD5(const MD5File file, bool warn) |
|
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
108 |
{ |
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
109 |
FILE *f; |
961 | 110 |
char buf[MAX_PATH]; |
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
111 |
|
961 | 112 |
// open file |
113 |
sprintf(buf, "%s%s", _path.data_dir, file.filename); |
|
114 |
f = fopen(buf, "rb"); |
|
115 |
||
116 |
#if !defined(WIN32) |
|
117 |
if (f == NULL) { |
|
4200
e6ba94085b81
(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
|
118 |
strtolower(buf + strlen(_path.data_dir) - 1); |
961 | 119 |
f = fopen(buf, "rb"); |
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
120 |
} |
961 | 121 |
#endif |
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
122 |
|
862
9baf2b0cdb18
(svn r1343) -Fix: [Graphic] Autorail icon is now correct (Darkvater)
truelight
parents:
614
diff
changeset
|
123 |
if (f != NULL) { |
2028
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
124 |
md5_state_t filemd5state; |
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
125 |
md5_byte_t buffer[1024]; |
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
126 |
md5_byte_t digest[16]; |
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
127 |
size_t len; |
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
128 |
|
961 | 129 |
md5_init(&filemd5state); |
2028
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
130 |
while ((len = fread(buffer, 1, sizeof(buffer), f)) != 0) |
961 | 131 |
md5_append(&filemd5state, buffer, len); |
132 |
||
2028
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
133 |
if (ferror(f) && warn) fprintf(stderr, "Error Reading from %s \n", buf); |
961 | 134 |
fclose(f); |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
966
diff
changeset
|
135 |
|
961 | 136 |
md5_finish(&filemd5state, digest); |
2639 | 137 |
return CheckMD5Digest(file, digest, warn); |
961 | 138 |
} else { // file not found |
139 |
return false; |
|
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
966
diff
changeset
|
140 |
} |
961 | 141 |
} |
142 |
||
143 |
/* Checks, if either the Windows files exist (TRG1R.GRF) or the DOS files (TRG1.GRF) |
|
144 |
* by comparing the MD5 checksums of the files. _use_dos_palette is set accordingly. |
|
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
966
diff
changeset
|
145 |
* If neither are found, Windows palette is assumed. |
961 | 146 |
* |
147 |
* (Note: Also checks sample.cat for corruption) */ |
|
1093
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1070
diff
changeset
|
148 |
void CheckExternalFiles(void) |
961 | 149 |
{ |
1355 | 150 |
uint i; |
151 |
// count of files from this version |
|
152 |
uint dos = 0; |
|
153 |
uint win = 0; |
|
961 | 154 |
|
2028
fff064370a36
(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 < 2; i++) if (FileMD5(files_dos.basic[i], true)) dos++; |
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
156 |
for (i = 0; i < 3; i++) if (FileMD5(files_dos.landscape[i], true)) dos++; |
961 | 157 |
|
2028
fff064370a36
(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 < 2; i++) if (FileMD5(files_win.basic[i], true)) win++; |
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
159 |
for (i = 0; i < 3; i++) if (FileMD5(files_win.landscape[i], true)) win++; |
961 | 160 |
|
1355 | 161 |
if (!FileMD5(sample_cat_win, false) && !FileMD5(sample_cat_dos, false)) |
2028
fff064370a36
(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf
tron
parents:
2027
diff
changeset
|
162 |
fprintf(stderr, "Your sample.cat file is corrupted or missing!\n"); |
961 | 163 |
|
4934
e62da41b70e3
(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 |
for (i = 0; i < lengthof(files_openttd); i++) { |
e62da41b70e3
(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
|
165 |
if (!FileMD5(files_openttd[i], false)) { |
e62da41b70e3
(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 |
fprintf(stderr, "Your %s file is corrupted or missing!\n", files_openttd[i].filename); |
e62da41b70e3
(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 |
} |
e62da41b70e3
(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 |
} |
e62da41b70e3
(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
|
169 |
|
1380
72aa0a5df4db
(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
|
170 |
/* |
1389 | 171 |
* forced DOS palette via command line -> leave it that way |
1380
72aa0a5df4db
(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 Windows files present -> Windows palette |
72aa0a5df4db
(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 |
* all DOS files present -> DOS palette |
72aa0a5df4db
(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 |
* no Windows files present and any DOS file present -> DOS palette |
72aa0a5df4db
(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 |
* otherwise -> Windows palette |
72aa0a5df4db
(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
|
176 |
*/ |
1389 | 177 |
if (_use_dos_palette) { |
178 |
return; |
|
179 |
} else if (win == 5) { |
|
961 | 180 |
_use_dos_palette = false; |
1381 | 181 |
} else if (dos == 5 || (win == 0 && dos > 0)) { |
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
182 |
_use_dos_palette = true; |
1380
72aa0a5df4db
(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
|
183 |
} else { |
961 | 184 |
_use_dos_palette = false; |
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
185 |
} |
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
186 |
} |
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
187 |
|
2342
aae24c9661ba
(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
|
188 |
|
2353 | 189 |
static const SpriteID trg1idx[] = { |
2588
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
190 |
0, 1, // Mouse cursor, ZZZ |
2353 | 191 |
/* Medium font */ |
2588
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
192 |
2, 92, // ' ' till 'z' |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
193 |
SKIP, 36, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
194 |
160, 160, // Move ¾ to the correct position |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
195 |
98, 98, // Up arrow |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
196 |
131, 133, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
197 |
SKIP, 1, // skip currency sign |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
198 |
135, 135, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
199 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
200 |
137, 137, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
201 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
202 |
139, 139, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
203 |
140, 140, // TODO Down arrow |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
204 |
141, 141, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
205 |
142, 142, // TODO Check mark |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
206 |
143, 143, // TODO Cross |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
207 |
144, 144, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
208 |
145, 145, // TODO Right arrow |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
209 |
146, 149, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
210 |
118, 122, // Transport markers |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
211 |
SKIP, 2, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
212 |
157, 157, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
213 |
114, 115, // Small up/down arrows |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
214 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
215 |
161, 225, |
2353 | 216 |
/* Small font */ |
2588
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
217 |
226, 316, // ' ' till 'z' |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
218 |
SKIP, 36, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
219 |
384, 384, // Move ¾ to the correct position |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
220 |
322, 322, // Up arrow |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
221 |
355, 357, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
222 |
SKIP, 1, // skip currency sign |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
223 |
359, 359, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
224 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
225 |
361, 361, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
226 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
227 |
363, 363, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
228 |
364, 364, // TODO Down arrow |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
229 |
365, 366, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
230 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
231 |
368, 368, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
232 |
369, 369, // TODO Right arrow |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
233 |
370, 373, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
234 |
SKIP, 7, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
235 |
381, 381, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
236 |
SKIP, 3, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
237 |
385, 449, |
2353 | 238 |
/* Big font */ |
2588
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
239 |
450, 540, // ' ' till 'z' |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
240 |
SKIP, 36, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
241 |
608, 608, // Move ¾ to the correct position |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
242 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
243 |
579, 581, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
244 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
245 |
583, 583, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
246 |
SKIP, 5, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
247 |
589, 589, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
248 |
SKIP, 15, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
249 |
605, 605, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
250 |
SKIP, 3, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
251 |
609, 625, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
252 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
253 |
627, 632, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
254 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
255 |
634, 639, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
256 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
257 |
641, 657, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
258 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
259 |
659, 664, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
260 |
SKIP, 2, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
261 |
667, 671, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
262 |
SKIP, 1, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
263 |
673, 673, |
2353 | 264 |
/* Graphics */ |
2588
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
265 |
674, 4792, |
e719db837e8a
(svn r3125) Symbolic names for skiping sprites and the end of the sprite list
tron
parents:
2577
diff
changeset
|
266 |
END |
2353 | 267 |
}; |
268 |
||
2565
de04ba1d3a5c
(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 |
/* NOTE: When adding a normal sprite, increase OPENTTD_SPRITES_COUNT with the |
de04ba1d3a5c
(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 |
* amount of sprites and add them to the end of the list, with the index of |
de04ba1d3a5c
(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 |
* the old sprite-count offset from SPR_OPENTTD_BASE. With this there is no |
de04ba1d3a5c
(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 |
* correspondence of any kind with the ID's in the grf file, but results in |
de04ba1d3a5c
(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
|
273 |
* a maximum use of sprite slots. */ |
2353 | 274 |
static const SpriteID _openttd_grf_indexes[] = { |
2571
550a7d323ced
(svn r3108) Confine the use of SPR_OPENTTD_BASE to table/sprites.h by adding/using some sprite enums
tron
parents:
2565
diff
changeset
|
275 |
SPR_IMG_AUTORAIL, SPR_CURSOR_WAYPOINT, // icons etc |
2353 | 276 |
134, 134, // euro symbol medium size |
277 |
582, 582, // euro symbol large size |
|
278 |
358, 358, // euro symbol tiny |
|
2571
550a7d323ced
(svn r3108) Confine the use of SPR_OPENTTD_BASE to table/sprites.h by adding/using some sprite enums
tron
parents:
2565
diff
changeset
|
279 |
SPR_CURSOR_CANAL, SPR_IMG_FASTFORWARD, // more icons |
2353 | 280 |
648, 648, // nordic char: æ |
281 |
616, 616, // nordic char: Æ |
|
282 |
666, 666, // nordic char: ø |
|
283 |
634, 634, // nordic char: Ø |
|
4935
1eeda247f1ea
(svn r6922) -Feature: Add proper cloning sprites and cursors, different for each vehicle. Big thanks
Darkvater
parents:
4934
diff
changeset
|
284 |
SPR_PIN_UP, SPR_CURSOR_CLONE_TRAIN, // more icons |
2353 | 285 |
382, 383, // ¼ ½ tiny |
286 |
158, 159, // ¼ ½ medium |
|
287 |
606, 607, // ¼ ½ large |
|
288 |
360, 360, // ¦ tiny |
|
289 |
362, 362, // ¨ tiny |
|
290 |
136, 136, // ¦ medium |
|
291 |
138, 138, // ¨ medium |
|
292 |
584, 584, // ¦ large |
|
293 |
586, 586, // ¨ large |
|
294 |
626, 626, // Ð large |
|
295 |
658, 658, // ð large |
|
296 |
374, 374, // ´ tiny |
|
297 |
378, 378, // ¸ tiny |
|
298 |
150, 150, // ´ medium |
|
299 |
154, 154, // ¸ medium |
|
300 |
598, 598, // ´ large |
|
301 |
602, 602, // ¸ large |
|
302 |
640, 640, // Þ large |
|
303 |
672, 672, // þ large |
|
304 |
380, 380, // º tiny |
|
305 |
156, 156, // º medium |
|
306 |
604, 604, // º large |
|
2411 | 307 |
317, 320, // { | } ~ tiny |
308 |
93, 96, // { | } ~ medium |
|
309 |
541, 544, // { | } ~ large |
|
2571
550a7d323ced
(svn r3108) Confine the use of SPR_OPENTTD_BASE to table/sprites.h by adding/using some sprite enums
tron
parents:
2565
diff
changeset
|
310 |
SPR_HOUSE_ICON, SPR_HOUSE_ICON, |
3252
7e4633d205b4
(svn r3940) - FS#56 [Crash] Missing glyph(s) in big-font. Added several missing glyphs for the big font.
Darkvater
parents:
3113
diff
changeset
|
311 |
585, 585, // § large |
7e4633d205b4
(svn r3940) - FS#56 [Crash] Missing glyph(s) in big-font. Added several missing glyphs for the big font.
Darkvater
parents:
3113
diff
changeset
|
312 |
587, 587, // © large |
7e4633d205b4
(svn r3940) - FS#56 [Crash] Missing glyph(s) in big-font. Added several missing glyphs for the big font.
Darkvater
parents:
3113
diff
changeset
|
313 |
592, 592, // ® large |
7e4633d205b4
(svn r3940) - FS#56 [Crash] Missing glyph(s) in big-font. Added several missing glyphs for the big font.
Darkvater
parents:
3113
diff
changeset
|
314 |
594, 597, // ° ± ² ³ large |
7e4633d205b4
(svn r3940) - FS#56 [Crash] Missing glyph(s) in big-font. Added several missing glyphs for the big font.
Darkvater
parents:
3113
diff
changeset
|
315 |
633, 633, // × large |
7e4633d205b4
(svn r3940) - FS#56 [Crash] Missing glyph(s) in big-font. Added several missing glyphs for the big font.
Darkvater
parents:
3113
diff
changeset
|
316 |
665, 665, // ÷ large |
4935
1eeda247f1ea
(svn r6922) -Feature: Add proper cloning sprites and cursors, different for each vehicle. Big thanks
Darkvater
parents:
4934
diff
changeset
|
317 |
SPR_SELL_TRAIN, SPR_SHARED_ORDERS_ICON, |
5000
340be626096e
(svn r7013) Add glyphs for the interpunct. This is mainly useful for the catalan translation
tron
parents:
4936
diff
changeset
|
318 |
377, 377, // · small |
340be626096e
(svn r7013) Add glyphs for the interpunct. This is mainly useful for the catalan translation
tron
parents:
4936
diff
changeset
|
319 |
153, 153, // · medium |
340be626096e
(svn r7013) Add glyphs for the interpunct. This is mainly useful for the catalan translation
tron
parents:
4936
diff
changeset
|
320 |
601, 601, // · large |
2588
e719db837e8a
(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
aae24c9661ba
(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 |
static byte _sprite_page_to_load = 0xFF; |
aae24c9661ba
(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
|
325 |
|
1093
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1070
diff
changeset
|
326 |
static void LoadSpriteTables(void) |
0 | 327 |
{ |
2639 | 328 |
const FileList* files = _use_dos_palette ? &files_dos : &files_win; |
329 |
uint load_index; |
|
1355 | 330 |
uint i; |
614
b96f987dbf80
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
579
diff
changeset
|
331 |
|
2353 | 332 |
LoadGrfIndexed(files->basic[0].filename, trg1idx, 0); |
2407 | 333 |
DupSprite( 2, 130); // non-breaking space medium |
334 |
DupSprite(226, 354); // non-breaking space tiny |
|
335 |
DupSprite(450, 578); // non-breaking space large |
|
2353 | 336 |
load_index = 4793; |
337 |
||
338 |
for (i = 1; files->basic[i].filename != NULL; i++) { |
|
2309 | 339 |
load_index += LoadGrfFile(files->basic[i].filename, load_index, i); |
340 |
} |
|
0 | 341 |
|
2309 | 342 |
if (_sprite_page_to_load != 0) { |
343 |
LoadGrfIndexed( |
|
344 |
files->landscape[_sprite_page_to_load - 1].filename, |
|
345 |
_landscape_spriteindexes[_sprite_page_to_load - 1], |
|
346 |
i++ |
|
347 |
); |
|
348 |
} |
|
0 | 349 |
|
4936
ac3a8ba42785
(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); |
ac3a8ba42785
(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++); |
ac3a8ba42785
(svn r6923) -Codechange: Load nsignalsw.grf in the same way as other mandatory additional grfs
Darkvater
parents:
4935
diff
changeset
|
352 |
|
2512
a66b16c61a69
(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); |
a66b16c61a69
(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++); |
a66b16c61a69
(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 |
|
a66b16c61a69
(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
bd31ed783fd3
(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
e414a0b104a6
(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); |
e414a0b104a6
(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++); |
e414a0b104a6
(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
d79500c648da
(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); |
d79500c648da
(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++); |
d79500c648da
(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
a66b16c61a69
(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); |
a66b16c61a69
(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
e2321aed315f
(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
b1e1c1193f0a
(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); |
b1e1c1193f0a
(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++); |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
3355
diff
changeset
|
374 |
|
2342
aae24c9661ba
(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
|
375 |
LoadNewGRF(load_index, i); |
0 | 376 |
} |
377 |
||
378 |
||
1093
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1070
diff
changeset
|
379 |
void GfxLoadSprites(void) |
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1070
diff
changeset
|
380 |
{ |
0 | 381 |
// Need to reload the sprites only if the landscape changed |
382 |
if (_sprite_page_to_load != _opt.landscape) { |
|
383 |
_sprite_page_to_load = _opt.landscape; |
|
384 |
||
385 |
// Sprite cache |
|
386 |
DEBUG(spritecache, 1) ("Loading sprite set %d.", _sprite_page_to_load); |
|
387 |
||
2339
b03b1fb8ccfe
(svn r2865) Push the responsibility for allocating the sprite heap into GfxInitSpriteMem()
tron
parents:
2329
diff
changeset
|
388 |
GfxInitSpriteMem(); |
0 | 389 |
LoadSpriteTables(); |
390 |
GfxInitPalettes(); |
|
391 |
} |
|
392 |
} |