replace header preprocessor conditional with cpp function

This commit is contained in:
Marco Antonio Jaguaribe Costa
2023-01-30 09:25:01 -03:00
committed by majcosta
parent b5ec955324
commit f8f8461a65
4 changed files with 13 additions and 15 deletions
+8
View File
@@ -93,6 +93,14 @@ UINT16 CreateFontPaletteTables(HVOBJECT pObj );
extern UINT16 gzFontName[32];
auto GetHugeFont() -> INT32 {
#if defined(JA2EDITOR) && defined(ENGLISH)
return gpHugeFont;
#else
return gp16PointArial;
#endif
}
BOOLEAN InitializeFonts( )
{
//INT16 zWinFontName[128]; // unused (jonathanl)
+1 -11
View File
@@ -89,11 +89,6 @@ extern HVOBJECT gvoBlockFontNarrow;
extern INT32 gp14PointHumanist;
extern HVOBJECT gvo14PointHumanist;
#ifdef JA2EDITOR
extern INT32 gpHugeFont;
extern HVOBJECT gvoHugeFont;
#endif
//extern INT32 giSubTitleWinFont;
@@ -124,12 +119,7 @@ extern BOOLEAN gfFontsInit;
#define BLOCKFONTNARROW gpBlockFontNarrow
#define FONT14HUMANIST gp14PointHumanist
#if defined( JA2EDITOR ) && defined( ENGLISH )
#define HUGEFONT gpHugeFont
#else
#define HUGEFONT gp16PointArial
#endif
auto GetHugeFont() -> INT32;
#define FONT_SHADE_RED 6
#define FONT_SHADE_BLUE 1