summaryrefslogtreecommitdiffstats
path: root/src/StringUtils.cpp
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2014-03-14 15:34:29 +0100
committerworktycho <work.tycho@gmail.com>2014-03-14 15:34:29 +0100
commitb8cffe569f8bf6e3379f1c45d9e32a986efac25e (patch)
tree4688783dbca9b7a6f0ef662926d07e4c5edc25d6 /src/StringUtils.cpp
parentcPlugin:BindConsoleCommand can be called statically. (diff)
parentMerge branch 'master' into warnings (diff)
downloadcuberite-b8cffe569f8bf6e3379f1c45d9e32a986efac25e.tar
cuberite-b8cffe569f8bf6e3379f1c45d9e32a986efac25e.tar.gz
cuberite-b8cffe569f8bf6e3379f1c45d9e32a986efac25e.tar.bz2
cuberite-b8cffe569f8bf6e3379f1c45d9e32a986efac25e.tar.lz
cuberite-b8cffe569f8bf6e3379f1c45d9e32a986efac25e.tar.xz
cuberite-b8cffe569f8bf6e3379f1c45d9e32a986efac25e.tar.zst
cuberite-b8cffe569f8bf6e3379f1c45d9e32a986efac25e.zip
Diffstat (limited to '')
-rw-r--r--src/StringUtils.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp
index 3fe75d611..3f9275798 100644
--- a/src/StringUtils.cpp
+++ b/src/StringUtils.cpp
@@ -288,13 +288,13 @@ void ReplaceString(AString & iHayStack, const AString & iNeedle, const AString &
// Converts a stream of BE shorts into UTF-8 string; returns a ref to a_UTF8
-AString & RawBEToUTF8(short * a_RawData, int a_NumShorts, AString & a_UTF8)
+AString & RawBEToUTF8(const char * a_RawData, int a_NumShorts, AString & a_UTF8)
{
a_UTF8.clear();
a_UTF8.reserve(3 * a_NumShorts / 2); // a quick guess of the resulting size
for (int i = 0; i < a_NumShorts; i++)
{
- int c = ntohs(*(a_RawData + i));
+ int c = GetBEShort(&a_RawData[i * 2]);
if (c < 0x80)
{
a_UTF8.push_back((char)c);
@@ -364,10 +364,7 @@ Notice from the original file:
#define UNI_MAX_BMP 0x0000FFFF
#define UNI_MAX_UTF16 0x0010FFFF
-#define UNI_MAX_UTF32 0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 0x0010FFFF
#define UNI_SUR_HIGH_START 0xD800
-#define UNI_SUR_HIGH_END 0xDBFF
#define UNI_SUR_LOW_START 0xDC00
#define UNI_SUR_LOW_END 0xDFFF