duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'portable' of https://github.com/Clownacy/Cave-Story-Engine-2 into portable

Browse source
This commit is contained in:
Clownacy 2020-04-29 16:13:08 +01:00
commit bdbebf9a35
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Font.cpp
View file

@ -1012,17 +1012,18 @@ static CachedGlyph* GetGlyphCached(FontObject *font_object, unsigned long unicod
break; break;
} }
glyph->backend = RenderBackend_LoadGlyph(bitmap.buffer, bitmap.width, bitmap.rows, bitmap.pitch); // Don't bother loading glyphs that don't have an image (causes `cute_spritebatch.h` to freak-out)
if (bitmap.width == 0 || bitmap.rows == 0)
glyph->backend = NULL;
else
glyph->backend = RenderBackend_LoadGlyph(bitmap.buffer, bitmap.width, bitmap.rows, bitmap.pitch);
FT_Bitmap_Done(font_object->library, &bitmap); FT_Bitmap_Done(font_object->library, &bitmap);
if (glyph->backend != NULL) glyph->next = font_object->glyph_list_head;
{ font_object->glyph_list_head = glyph;
glyph->next = font_object->glyph_list_head;
font_object->glyph_list_head = glyph;
return glyph; return glyph;
}
} }
FT_Bitmap_Done(font_object->library, &bitmap); FT_Bitmap_Done(font_object->library, &bitmap);
@ -1041,7 +1042,9 @@ static void UnloadCachedGlyphs(FontObject *font_object)
{ {
CachedGlyph *next_glyph = glyph->next; CachedGlyph *next_glyph = glyph->next;
RenderBackend_UnloadGlyph(glyph->backend); if (glyph->backend != NULL)
RenderBackend_UnloadGlyph(glyph->backend);
free(glyph); free(glyph);
glyph = next_glyph; glyph = next_glyph;