Merge pull request #8932 from unknownbrackets/font-minor

Font: Draw nothing for chars before first glyph
hrydgard · Aug 28, 2016 · 22cef33 · 22cef33
2 parents ef3f369 + eacebd4
commit 22cef33
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp
@@ -555,6 +555,10 @@ bool PGF::GetCharGlyph(int charCode, int glyphType, Glyph &glyph) const {
 void PGF::DrawCharacter(const GlyphImage *image, int clipX, int clipY, int clipWidth, int clipHeight, int charCode, int altCharCode, int glyphType) const {
 	Glyph glyph;
 	if (!GetCharGlyph(charCode, glyphType, glyph)) {
+		if (charCode < firstGlyph) {
+			// Don't draw anything if the character is before the first available glyph.
+			return;
+		}
 		// No Glyph available for this charCode, try to use the alternate char.
 		charCode = altCharCode;
 		if (!GetCharGlyph(charCode, glyphType, glyph)) {