diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-10-11 09:39:04 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-10-11 09:39:04 +0200 |
commit | b0becb5a2d28550a089e6e0ef2d041956dc887e4 (patch) | |
tree | 05f850e59f0995fa98969279618b02719fb1bd1c /src | |
parent | Merge branch 'master' into VC/TextFinish (diff) | |
download | re3-b0becb5a2d28550a089e6e0ef2d041956dc887e4.tar re3-b0becb5a2d28550a089e6e0ef2d041956dc887e4.tar.gz re3-b0becb5a2d28550a089e6e0ef2d041956dc887e4.tar.bz2 re3-b0becb5a2d28550a089e6e0ef2d041956dc887e4.tar.lz re3-b0becb5a2d28550a089e6e0ef2d041956dc887e4.tar.xz re3-b0becb5a2d28550a089e6e0ef2d041956dc887e4.tar.zst re3-b0becb5a2d28550a089e6e0ef2d041956dc887e4.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/render/Font.cpp | 14 | ||||
-rw-r--r-- | src/render/Font.h | 1 | ||||
-rw-r--r-- | src/text/Text.cpp | 16 | ||||
-rw-r--r-- | src/text/Text.h | 1 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/render/Font.cpp b/src/render/Font.cpp index 7459c101..8deac7bf 100644 --- a/src/render/Font.cpp +++ b/src/render/Font.cpp @@ -31,6 +31,20 @@ UnicodeStrlen(const wchar *str) return len; } +void +UnicodeMakeUpperCase(wchar *dst, const wchar *src) //idk what to do with it, seems to be incorrect implementation by R* +{ + while (*src != '\0') { + if (*src < 'a' || *src > 'z') + *dst = *src; + else + *dst = *src - 32; + dst++; + src++; + } + *dst = '\0'; +} + CFontDetails CFont::Details; int16 CFont::NewLine; CSprite2d CFont::Sprite[MAX_FONTS]; diff --git a/src/render/Font.h b/src/render/Font.h index f0ca9760..47a39f73 100644 --- a/src/render/Font.h +++ b/src/render/Font.h @@ -4,6 +4,7 @@ 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); +void UnicodeMakeUpperCase(wchar *dst, const wchar *src); struct CFontDetails { diff --git a/src/text/Text.cpp b/src/text/Text.cpp index a76bc404..5adc576a 100644 --- a/src/text/Text.cpp +++ b/src/text/Text.cpp @@ -431,6 +431,7 @@ CData::Unload(void) numChars = 0; } +void CMissionTextOffsets::Load(size_t table_size, int file, size_t *offset, int) { #if DUMB @@ -457,7 +458,6 @@ CMissionTextOffsets::Load(size_t table_size, int file, size_t *offset, int) #endif } -void char* UnicodeToAscii(wchar *src) { @@ -526,20 +526,6 @@ UnicodeToAsciiForMemoryCard(wchar *src) } void -UnicodeMakeUpperCase(wchar *dst, wchar *src) //idk what to do with it, seems to be incorrect implementation by R* -{ - while (*src != '\0') { - if (*src < 'a' || *src > 'z') - *dst = *src; - else - *dst = *src - 32; - dst++; - src++; - } - *dst = '\0'; -} - -void TextCopy(wchar *dst, const wchar *src) { while((*dst++ = *src++) != '\0'); diff --git a/src/text/Text.h b/src/text/Text.h index d18c564b..33dc313e 100644 --- a/src/text/Text.h +++ b/src/text/Text.h @@ -4,7 +4,6 @@ char *UnicodeToAscii(wchar *src); char *UnicodeToAsciiForSaveLoad(wchar *src); char *UnicodeToAsciiForMemoryCard(wchar *src); void TextCopy(wchar *dst, const wchar *src); -void UnicodeMakeUpperCase(wchar *dst, wchar *src); struct CKeyEntry { |