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

Change FSPACX/FSPACY macros to inline functions

Browse source
This commit is contained in:
Kp 2015-06-13 22:42:20 +00:00
parent 404e7e1d63
commit 49854c08dd
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/main/gamefont.h
View file

@ -55,12 +55,30 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
extern float FNTScaleX, FNTScaleY;
// add (scaled) spacing to given font coordinate
#define FSPACX(x) ((float)((x)*(FNTScaleX*(GAME_FONT->ft_w/7))))
#define FSPACY(y) ((float)((y)*(FNTScaleY*(GAME_FONT->ft_h/5))))
#define LINE_SPACING ((float)(FNTScaleY*(grd_curcanv->cv_font->ft_h+(GAME_FONT->ft_h/5))))
extern array<grs_font_ptr, MAX_FONTS> Gamefonts;
static inline float FSPACX()
{
return FNTScaleX * (GAME_FONT->ft_w / 7);
}
static inline float FSPACX(const int &x)
{
return FSPACX() * x;
}
static inline float FSPACY()
{
return FNTScaleY * (GAME_FONT->ft_h / 5);
}
static inline float FSPACY(const int &y)
{
return FSPACY() * y;
}
void gamefont_init();
void gamefont_close();
void gamefont_choose_game_font(int scrx,int scry);