Merge branch 'master' into VC/TextFinish

# Conflicts:
#	src/text/Text.cpp
This commit is contained in:
Sergeanur 2020-10-11 10:34:47 +03:00
commit 9dba2386bb
7 changed files with 35 additions and 31 deletions

View file

@ -1,5 +1,10 @@
#pragma once
void AsciiToUnicode(const char *src, wchar *dst);
void UnicodeStrcpy(wchar *dst, const wchar *src);
void UnicodeStrcat(wchar *dst, wchar *append);
int UnicodeStrlen(const wchar *str);
struct CFontDetails
{
CRGBA color;