summaryrefslogtreecommitdiffstats
path: root/src/render/Font.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-05 11:47:27 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-05 11:47:27 +0200
commit9436b5a8a58307ed859dc7d8528c512316548979 (patch)
treef24bfc3d5c348029acb606a22080d4b45277e7a7 /src/render/Font.h
parentcranes init (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-9436b5a8a58307ed859dc7d8528c512316548979.tar
re3-9436b5a8a58307ed859dc7d8528c512316548979.tar.gz
re3-9436b5a8a58307ed859dc7d8528c512316548979.tar.bz2
re3-9436b5a8a58307ed859dc7d8528c512316548979.tar.lz
re3-9436b5a8a58307ed859dc7d8528c512316548979.tar.xz
re3-9436b5a8a58307ed859dc7d8528c512316548979.tar.zst
re3-9436b5a8a58307ed859dc7d8528c512316548979.zip
Diffstat (limited to '')
-rw-r--r--src/render/Font.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/render/Font.h b/src/render/Font.h
index 26309377..0659dda1 100644
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -64,18 +64,18 @@ public:
static void Initialise(void);
static void Shutdown(void);
static void InitPerFrame(void);
- static void PrintChar(float x, float y, uint16 c);
- static void PrintString(float x, float y, uint16 *s);
- static int GetNumberLines(float xstart, float ystart, uint16 *s);
- static void GetTextRect(CRect *rect, float xstart, float ystart, uint16 *s);
- static void PrintString(float x, float y, uint16 *start, uint16 *end, float spwidth);
- static float GetCharacterWidth(uint16 c);
- static float GetCharacterSize(uint16 c);
- static float GetStringWidth(uint16 *s, bool spaces = false);
- static uint16 *GetNextSpace(uint16 *s);
- static uint16 *ParseToken(uint16 *s, uint16*);
+ static void PrintChar(float x, float y, wchar c);
+ static void PrintString(float x, float y, wchar *s);
+ static int GetNumberLines(float xstart, float ystart, wchar *s);
+ static void GetTextRect(CRect *rect, float xstart, float ystart, wchar *s);
+ static void PrintString(float x, float y, wchar *start, wchar *end, float spwidth);
+ static float GetCharacterWidth(wchar c);
+ static float GetCharacterSize(wchar c);
+ static float GetStringWidth(wchar *s, bool spaces = false);
+ static wchar *GetNextSpace(wchar *s);
+ static wchar *ParseToken(wchar *s, wchar*);
static void DrawFonts(void);
- static uint16 character_code(uint8 c);
+ static wchar character_code(uint8 c);
static CFontDetails GetDetails() { return Details; }
static void SetScale(float x, float y) { Details.scaleX = x; Details.scaleY = y; }