Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-11-21 16:37:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the fix.

Browse Source
This commit is contained in:
Relintai 2024-11-14 01:24:40 +01:00
parent d75d3591ed
commit 48935e93b3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/string/ustring.cpp
View File

@ -331,6 +331,10 @@ void String::copy_from(const wchar_t *p_cstr, const int p_clip_to) {
#endif #endif
} }
void String::copy_from(const Char16String &p_str) {
parse_utf16(p_str.ptr());
}
void String::copy_from(const CharType &p_char) { void String::copy_from(const CharType &p_char) {
if (p_char == 0) { if (p_char == 0) {
#if PRINT_UNICODE_ERRORS #if PRINT_UNICODE_ERRORS
@ -5162,7 +5166,7 @@ String::String(const CharType *p_str) {
} }
String::String(const Char16String &p_str) { String::String(const Char16String &p_str) {
copy_from(p_str.ptr()); copy_from(p_str);
} }
String::String(const char *p_str, int p_clip_to_len) { String::String(const char *p_str, int p_clip_to_len) {

1
core/string/ustring.h
View File

@ -583,6 +583,7 @@ private:
void copy_from(const char *p_cstr, const int p_clip_to); void copy_from(const char *p_cstr, const int p_clip_to);
void copy_from(const wchar_t *p_cstr); void copy_from(const wchar_t *p_cstr);
void copy_from(const wchar_t *p_cstr, const int p_clip_to); void copy_from(const wchar_t *p_cstr, const int p_clip_to);
void copy_from(const Char16String &p_str);
void copy_from(const CharType *p_cstr); void copy_from(const CharType *p_cstr);
void copy_from(const CharType *p_cstr, const int p_clip_to); void copy_from(const CharType *p_cstr, const int p_clip_to);