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

Cleanup and fixes

Browse source
This commit is contained in:
Clownacy 2020-09-16 21:20:49 +01:00
parent aac1c9c844
commit a542a5c11d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Font.cpp
View file

@ -1177,8 +1177,6 @@ Font* LoadFont(const char *font_filename, size_t cell_width, size_t cell_height)
Font* LoadBitmapFont(const char *bitmap_path, const char *metadata_path) Font* LoadBitmapFont(const char *bitmap_path, const char *metadata_path)
{ {
Font *font = NULL;
size_t bitmap_width, bitmap_height; size_t bitmap_width, bitmap_height;
unsigned char *image_buffer = DecodeBitmapFromFile(bitmap_path, &bitmap_width, &bitmap_height, 1); unsigned char *image_buffer = DecodeBitmapFromFile(bitmap_path, &bitmap_width, &bitmap_height, 1);
@ -1189,7 +1187,7 @@ Font* LoadBitmapFont(const char *bitmap_path, const char *metadata_path)
if (metadata_buffer != NULL) if (metadata_buffer != NULL)
{ {
font = (Font*)malloc(sizeof(Font)); Font *font = (Font*)malloc(sizeof(Font));
if (font != NULL) if (font != NULL)
{ {
@ -1261,7 +1259,7 @@ Font* LoadBitmapFont(const char *bitmap_path, const char *metadata_path)
FreeBitmap(image_buffer); FreeBitmap(image_buffer);
} }
return font; return NULL;
} }
void DrawText(Font *font, RenderBackend_Surface *surface, int x, int y, unsigned long colour, const char *string) void DrawText(Font *font, RenderBackend_Surface *surface, int x, int y, unsigned long colour, const char *string)
@ -1305,12 +1303,13 @@ void UnloadFont(Font *font)
if (font != NULL) if (font != NULL)
{ {
RenderBackend_DestroyGlyphAtlas(font->atlas); RenderBackend_DestroyGlyphAtlas(font->atlas);
free(font->local_glyphs);
FreeBitmap(font->image_buffer); FreeBitmap(font->image_buffer);
// FT_Done_Face(font->face); // FT_Done_Face(font->face);
// free(font->data); // free(font->data);
// FT_Done_FreeType(font->library); // FT_Done_FreeType(font->library);
free(font); free(font);
} }
} }