gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-01 03:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r7246) -Codechange: Always reload sprite and NewGRF data when loading or starting a game, instead of only when the climate type is different.

Browse Source
This commit is contained in:
peter1138 2006-11-24 12:39:13 +00:00
parent 1ce4eda576
commit b13a6f0a9c
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gfxinit.c
View File

@ -321,7 +321,6 @@ static const SpriteID _openttd_grf_indexes[] = {
END END
}; };
static byte _sprite_page_to_load = 0xFF;
static void LoadSpriteTables(void) static void LoadSpriteTables(void)
{ {
@ -339,10 +338,11 @@ static void LoadSpriteTables(void)
load_index += LoadGrfFile(files->basic[i].filename, load_index, i); load_index += LoadGrfFile(files->basic[i].filename, load_index, i);
} }
if (_sprite_page_to_load != 0) { /* Load additional sprites for climates other than temperate */
if (_opt.landscape != LT_NORMAL) {
LoadGrfIndexed( LoadGrfIndexed(
files->landscape[_sprite_page_to_load - 1].filename, files->landscape[_opt.landscape - 1].filename,
_landscape_spriteindexes[_sprite_page_to_load - 1], _landscape_spriteindexes[_opt.landscape - 1],
i++ i++
); );
} }
@ -378,15 +378,9 @@ static void LoadSpriteTables(void)
void GfxLoadSprites(void) void GfxLoadSprites(void)
{ {
// Need to reload the sprites only if the landscape changed DEBUG(spritecache, 1) ("Loading sprite set %d.", _opt.landscape);
if (_sprite_page_to_load != _opt.landscape) {
_sprite_page_to_load = _opt.landscape;
// Sprite cache GfxInitSpriteMem();
DEBUG(spritecache, 1) ("Loading sprite set %d.", _sprite_page_to_load); LoadSpriteTables();
GfxInitPalettes();
GfxInitSpriteMem();
LoadSpriteTables();
GfxInitPalettes();
}
} }