mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
replace header preprocessor conditional with cpp function
This commit is contained in:
committed by
majcosta
parent
b5ec955324
commit
f8f8461a65
@@ -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
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user