cpp/openttd-patchpack/source Changeset - r11051:196d2e88e725

Changeset - r11051:196d2e88e725

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 15 years ago 2009-02-07 02:29:08
rubidium@openttd.org

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

1 file changed with 5 insertions and 2 deletions:

src/spritecache.cpp

0 comments (0 inline, 0 general)

src/spritecache.cpp

➞

Show inline comments

@@ @@ -246,7 +246,7 @@ static void *ReadSprite(SpriteCache *sc, @@
 		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 *HandleInvalidSpriteRe @@
 	};
 	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;

0 comments (0 inline, 0 general)