mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r15391) -Fix (r14997): loading font sprites should not trigger a palette conversion.
This commit is contained in:
parent
322515e8d5
commit
bab7367a59
|
@ -246,7 +246,7 @@ static void *ReadSprite(SpriteCache *sc, SpriteID id, SpriteType sprite_type)
|
||||||
return sc->ptr;
|
return sc->ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(sprite_type == ST_NORMAL);
|
assert(sprite_type == ST_NORMAL || sprite_type == ST_FONT);
|
||||||
|
|
||||||
SpriteLoaderGrf sprite_loader;
|
SpriteLoaderGrf sprite_loader;
|
||||||
SpriteLoader::Sprite sprite;
|
SpriteLoader::Sprite sprite;
|
||||||
|
@ -490,7 +490,10 @@ static const void *HandleInvalidSpriteRequest(SpriteID sprite, SpriteType reques
|
||||||
};
|
};
|
||||||
|
|
||||||
SpriteType available = sc->type;
|
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;
|
byte warning_level = sc->warned ? 6 : 0;
|
||||||
sc->warned = true;
|
sc->warned = true;
|
||||||
|
|
Loading…
Reference in New Issue