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

Fix dumbass font problems

Browse source 
The 320x240 font is still one pixel too high, but honestly I don't give
a shit. It looks better anyway since the vanilla way is off-centre.
This commit is contained in:
Clownacy 2019-02-01 11:07:47 +00:00
parent 9f353a993e
commit d52a69b0e6
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Draw.cpp
View file

@ -447,16 +447,18 @@ void InitTextObject(const char *font_name)
{ {
//Get font size //Get font size
unsigned int fontWidth, fontHeight; unsigned int fontWidth, fontHeight;
if (gWindowScale == 1)
// The original did this, but Windows would downscale it to 5/10 anyway.
/* if (gWindowScale == 1)
{ {
fontWidth = 6; fontWidth = 6;
fontHeight = 12; fontHeight = 12;
} }
else else
{ {*/
fontWidth = 5 * gWindowScale; fontWidth = 5 * gWindowScale;
fontHeight = 10 * gWindowScale; fontHeight = 10 * gWindowScale;
} // }
#ifdef WINDOWS #ifdef WINDOWS
// Actually use the font Config.dat specifies // Actually use the font Config.dat specifies

2
src/Font.cpp
View file

@ -228,7 +228,7 @@ void DrawText(FontObject *font_object, SDL_Surface *surface, int x, int y, unsig
FT_Bitmap_Convert(font_object->library, &face->glyph->bitmap, &converted, 1); FT_Bitmap_Convert(font_object->library, &face->glyph->bitmap, &converted, 1);
const int letter_x = x + pen_x + face->glyph->bitmap_left; const int letter_x = x + pen_x + face->glyph->bitmap_left;
const int letter_y = y + ((FT_MulFix(face->ascender, face->size->metrics.y_scale) + (64 - 1)) / 64) - (face->glyph->metrics.horiBearingY / 64); const int letter_y = y + ((FT_MulFix(face->ascender, face->size->metrics.y_scale) - face->glyph->metrics.horiBearingY + (64 / 2)) / 64);
for (int iy = MAX(-letter_y, 0); letter_y + iy < MIN(letter_y + converted.rows, surface->h); ++iy) for (int iy = MAX(-letter_y, 0); letter_y + iy < MIN(letter_y + converted.rows, surface->h); ++iy)
{ {