mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r15391) -Fix (r14997): loading font sprites should not trigger a palette conversion.

This commit is contained in:
rubidium 2009-02-07 02:29:08 +00:00
parent 322515e8d5
commit bab7367a59
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/spritecache.cpp
View File

@ -246,7 +246,7 @@ static void *ReadSprite(SpriteCache *sc, SpriteID id, SpriteType sprite_type)
return sc->ptr;
}
assert(sprite_type == ST_NORMAL);
assert(sprite_type == ST_NORMAL || sprite_type == ST_FONT);
SpriteLoaderGrf sprite_loader;
SpriteLoader::Sprite sprite;
@ -490,7 +490,10 @@ static const void *HandleInvalidSpriteRequest(SpriteID sprite, SpriteType reques
};
SpriteType available = sc->type;
if (requested == ST_FONT && available == ST_NORMAL) return GetRawSprite(sprite, ST_NORMAL);
if (requested == ST_FONT && available == ST_NORMAL) {
if (sc->ptr == NULL) sc->type = ST_FONT;
return GetRawSprite(sprite, sc->type);
}
byte warning_level = sc->warned ? 6 : 0;
sc->warned = true;