diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-02-18 10:34:23 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-18 10:34:23 +0100 |
| commit | cba1f85026ab1992c4deff04e9cac5d4eb805165 (patch) | |
| tree | 72b89ee25e3347d5efe1b26e95f0239e1e477725 /src/render/Font.h | |
| parent | update librw; gl cleanup (diff) | |
| download | re3-cba1f85026ab1992c4deff04e9cac5d4eb805165.tar re3-cba1f85026ab1992c4deff04e9cac5d4eb805165.tar.gz re3-cba1f85026ab1992c4deff04e9cac5d4eb805165.tar.bz2 re3-cba1f85026ab1992c4deff04e9cac5d4eb805165.tar.lz re3-cba1f85026ab1992c4deff04e9cac5d4eb805165.tar.xz re3-cba1f85026ab1992c4deff04e9cac5d4eb805165.tar.zst re3-cba1f85026ab1992c4deff04e9cac5d4eb805165.zip | |
Diffstat (limited to 'src/render/Font.h')
| -rw-r--r-- | src/render/Font.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/render/Font.h b/src/render/Font.h index b0cd0a27..42eb7b4c 100644 --- a/src/render/Font.h +++ b/src/render/Font.h @@ -123,7 +123,7 @@ enum class CFont { #ifdef MORE_LANGUAGES - static int16 Size[LANGSET_MAX][MAX_FONTS][193]; + static int16 Size[LANGSET_MAX][MAX_FONTS][210]; static uint8 LanguageSet; static int32 Slot; #else @@ -156,11 +156,11 @@ public: #endif static int GetNumberLines(float xstart, float ystart, wchar *s); static void GetTextRect(CRect *rect, float xstart, float ystart, wchar *s); -#ifdef MORE_LANGUAGES - static bool PrintString(float x, float y, wchar *start, wchar* &end, float spwidth, float japX); -#else +//#ifdef MORE_LANGUAGES +// static bool PrintString(float x, float y, wchar *start, wchar* &end, float spwidth, float japX); +//#else static void PrintString(float x, float y, uint32, wchar *start, wchar *end, float spwidth); -#endif +//#endif static void PrintStringFromBottom(float x, float y, wchar *str); static float GetCharacterWidth(wchar c); static float GetCharacterSize(wchar c); @@ -169,12 +169,12 @@ public: static float GetStringWidth_Jap(wchar* s); #endif static uint16 *GetNextSpace(wchar *s); -#ifdef MORE_LANGUAGES - static uint16 *ParseToken(wchar *s, bool japShit = false); -#else +//#ifdef MORE_LANGUAGES +// static uint16 *ParseToken(wchar *s, bool japShit = false); +//#else static uint16 *ParseToken(wchar *s); static uint16 *ParseToken(wchar *s, CRGBA &color, bool &flash, bool &bold); -#endif +//#endif static void DrawFonts(void); static void RenderFontBuffer(void); static uint16 character_code(uint8 c); @@ -212,6 +212,6 @@ public: static bool IsAnsiCharacter(wchar* s); static bool IsJapanesePunctuation(wchar* str); static bool IsJapanese() { return LanguageSet == FONT_LANGSET_JAPANESE; } - static bool IsJapaneseFont() { return IsJapanese() && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER); } + static bool IsJapaneseFont() { return IsJapanese() && (Details.style == FONT_JAPANESE); } #endif }; |