summaryrefslogtreecommitdiffstats
path: root/src/render/Font.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-04-03 11:49:33 +0200
committeraap <aap@papnet.eu>2020-04-03 11:49:33 +0200
commit3b315fec264d1200ab08aa76e93a07859ebb24c1 (patch)
tree5820b697cb24dc935d9d52f23babf36798319d97 /src/render/Font.h
parentCCamera fixes (diff)
parentMerge pull request #377 from Fire-Head/master (diff)
downloadre3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar
re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.gz
re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.bz2
re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.lz
re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.xz
re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.zst
re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.zip
Diffstat (limited to 'src/render/Font.h')
-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; }