diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-10-11 09:34:47 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-10-11 09:34:47 +0200 |
commit | 9dba2386bb90a4d2cd9c0f530a78bbf15aa17b7b (patch) | |
tree | ec7218e56bc1bfca1061d6cd45c1c897ecfb8e77 /src/text | |
parent | Merge branch 'miami' into VC/TextFinish (diff) | |
parent | Some unicode funcs belong to Font.cpp + small fix (diff) | |
download | re3-9dba2386bb90a4d2cd9c0f530a78bbf15aa17b7b.tar re3-9dba2386bb90a4d2cd9c0f530a78bbf15aa17b7b.tar.gz re3-9dba2386bb90a4d2cd9c0f530a78bbf15aa17b7b.tar.bz2 re3-9dba2386bb90a4d2cd9c0f530a78bbf15aa17b7b.tar.lz re3-9dba2386bb90a4d2cd9c0f530a78bbf15aa17b7b.tar.xz re3-9dba2386bb90a4d2cd9c0f530a78bbf15aa17b7b.tar.zst re3-9dba2386bb90a4d2cd9c0f530a78bbf15aa17b7b.zip |
Diffstat (limited to 'src/text')
-rw-r--r-- | src/text/Text.cpp | 28 | ||||
-rw-r--r-- | src/text/Text.h | 4 |
2 files changed, 1 insertions, 31 deletions
diff --git a/src/text/Text.cpp b/src/text/Text.cpp index a59516e3..a76bc404 100644 --- a/src/text/Text.cpp +++ b/src/text/Text.cpp @@ -431,7 +431,6 @@ CData::Unload(void) numChars = 0; } -void CMissionTextOffsets::Load(size_t table_size, int file, size_t *offset, int) { #if DUMB @@ -459,11 +458,6 @@ CMissionTextOffsets::Load(size_t table_size, int file, size_t *offset, int) } void -AsciiToUnicode(const char *src, wchar *dst) -{ - while((*dst++ = (unsigned char)*src++) != '\0'); -} - char* UnicodeToAscii(wchar *src) { @@ -522,7 +516,7 @@ UnicodeToAsciiForMemoryCard(wchar *src) { static char aStr[256]; int len; - for(len = 0; *src != '\0' && len < 256-1; len++, src++) + for(len = 0; *src != '\0' && len < 256; len++, src++) if(*src < 256) aStr[len] = *src; else @@ -546,26 +540,6 @@ UnicodeMakeUpperCase(wchar *dst, wchar *src) //idk what to do with it, seems to } void -UnicodeStrcpy(wchar *dst, const wchar *src) -{ - while((*dst++ = *src++) != '\0'); -} - -void -UnicodeStrcat(wchar *dst, wchar *append) -{ - UnicodeStrcpy(&dst[UnicodeStrlen(dst)], append); -} - -int -UnicodeStrlen(const wchar *str) -{ - int len; - for(len = 0; *str != '\0'; len++, str++); - return len; -} - -void TextCopy(wchar *dst, const wchar *src) { while((*dst++ = *src++) != '\0'); diff --git a/src/text/Text.h b/src/text/Text.h index 0bad9a83..d18c564b 100644 --- a/src/text/Text.h +++ b/src/text/Text.h @@ -1,12 +1,8 @@ #pragma once -void AsciiToUnicode(const char *src, wchar *dst); char *UnicodeToAscii(wchar *src); char *UnicodeToAsciiForSaveLoad(wchar *src); char *UnicodeToAsciiForMemoryCard(wchar *src); -void UnicodeStrcpy(wchar *dst, const wchar *src); -void UnicodeStrcat(wchar *dst, wchar *append); -int UnicodeStrlen(const wchar *str); void TextCopy(wchar *dst, const wchar *src); void UnicodeMakeUpperCase(wchar *dst, wchar *src); |