TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Change LINE_SPACING to a static inline function

Browse source
This commit is contained in:
Kp 2018-05-19 23:21:42 +00:00
parent 08446f0ab6
commit 3049476e11
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/main/gamefont.h
View file

@ -55,10 +55,19 @@ constexpr std::integral_constant<unsigned, 5> MAX_FONTS{};
extern float FNTScaleX, FNTScaleY;
// add (scaled) spacing to given font coordinate
#define LINE_SPACING(CANVAS) (FNTScaleY * ((CANVAS).cv_font->ft_h + (GAME_FONT->ft_h / 5)))
extern array<grs_font_ptr, MAX_FONTS> Gamefonts;
static inline float LINE_SPACING(const grs_font &active_font, const grs_font &game_font)
{
return FNTScaleY * (active_font.ft_h + (game_font.ft_h / 5));
}
static inline float LINE_SPACING(const grs_canvas &canvas)
{
return LINE_SPACING(*canvas.cv_font, *GAME_FONT);
}
/* All the logic is in the base class */
class base_font_scaled_float
{