summaryrefslogtreecommitdiffstats
path: root/src/render/Font.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-16 15:55:26 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-16 15:55:26 +0100
commit518bc555a6fcf0ae4c4a7d1f2a10c98505de5cfb (patch)
tree2b10f3df9b942731f4cd7a83103e6ac3268203aa /src/render/Font.h
parentMerge branch 'miami' into lcs (diff)
downloadre3-518bc555a6fcf0ae4c4a7d1f2a10c98505de5cfb.tar
re3-518bc555a6fcf0ae4c4a7d1f2a10c98505de5cfb.tar.gz
re3-518bc555a6fcf0ae4c4a7d1f2a10c98505de5cfb.tar.bz2
re3-518bc555a6fcf0ae4c4a7d1f2a10c98505de5cfb.tar.lz
re3-518bc555a6fcf0ae4c4a7d1f2a10c98505de5cfb.tar.xz
re3-518bc555a6fcf0ae4c4a7d1f2a10c98505de5cfb.tar.zst
re3-518bc555a6fcf0ae4c4a7d1f2a10c98505de5cfb.zip
Diffstat (limited to '')
-rw-r--r--src/render/Font.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/render/Font.h b/src/render/Font.h
index 36424bf5..071c0e45 100644
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -37,6 +37,10 @@ struct CFontDetails
int nFlashTimer;
bool anonymous_23;
uint32 anonymous_25;
+ uint32 anonymous_26;
+ CRGBA outlineColor;
+ int32 bOutlineOn;
+ uint32 line;
};
struct CFontRenderState
@@ -64,10 +68,7 @@ enum {
FONT_BANK,
FONT_STANDARD,
FONT_HEADING,
-#ifdef MORE_LANGUAGES
- FONT_JAPANESE,
-#endif
- MAX_FONTS = FONT_HEADING
+ MAX_FONTS
};
enum {
@@ -123,7 +124,7 @@ class CFont
static uint8 LanguageSet;
static int32 Slot;
#else
- static int16 Size[MAX_FONTS][210];
+ static int16 Size[MAX_FONTS][419];
#endif
static int16 NewLine;
public:
@@ -237,7 +238,12 @@ public:
static void SetBackgroundColor(CRGBA col);
static void SetColor(CRGBA col);
static void SetDropColor(CRGBA col);
- static wchar FindNewCharacter(wchar c);
+
+ static void SetOutlineColor(CRGBA col);
+ static void SetOutlineOn(int on) { Details.bOutlineOn = on; }
+ static void SetNewLineAdd(int line) { Details.line = line; }
+
+ static int16 FindNewCharacter(int16 c);
static void FilterOutTokensFromString(wchar*);
#ifdef MORE_LANGUAGES
static void ReloadFonts(uint8 set);