mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-15 15:28:28 +00:00
refactor: unglob std::wstring
This commit is contained in:
@@ -757,7 +757,7 @@ int StartMinecraftThreadProc( void* lpParameter )
|
||||
AABB::UseDefaultThreadStorage();
|
||||
Tesselator::CreateNewThreadStorage(1024*1024);
|
||||
RenderManager.InitialiseContext();
|
||||
Minecraft::start(wstring(),wstring());
|
||||
Minecraft::start(std::wstring(),std::wstring());
|
||||
delete Tesselator::getInstance();
|
||||
return 0;
|
||||
}
|
||||
@@ -1462,8 +1462,8 @@ int main(int argc, const char *argv[] )
|
||||
|
||||
vector<uint8_t *> vRichPresenceStrings;
|
||||
|
||||
// convert wstring to UTF-8 string
|
||||
std::string wstring_to_utf8 (const std::wstring& str)
|
||||
// convert std::wstring to UTF-8 string
|
||||
std::string std::wstring_to_utf8 (const std::wstring& str)
|
||||
{
|
||||
std::wstring_convert<std::codecvt_utf8<wchar_t>> myconv;
|
||||
return myconv.to_bytes(str);
|
||||
@@ -1475,7 +1475,7 @@ uint8_t *mallocAndCreateUTF8ArrayFromString(int iID)
|
||||
LPCWSTR wchString=app.GetString(iID);
|
||||
|
||||
std::wstring srcString = wchString;
|
||||
std::string dstString = wstring_to_utf8(srcString);
|
||||
std::string dstString = std::wstring_to_utf8(srcString);
|
||||
|
||||
int dst_len = dstString.size()+1;
|
||||
uint8_t *strUtf8=(uint8_t *)malloc(dst_len);
|
||||
|
||||
Reference in New Issue
Block a user