mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-08-20 09:57:10 +00:00
Minecraft.Client: fix some unicode-related linux errors
This commit is contained in:
parent
b9c29c69d8
commit
6bfd396721
|
|
@ -121,7 +121,7 @@ byteArray ArchiveFile::getFile(const wstring &filename)
|
||||||
memcpy( out.data, m_cachedData + data->ptr, data->filesize );
|
memcpy( out.data, m_cachedData + data->ptr, data->filesize );
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#ifdef _UNICODE
|
#if defined(_UNICODE) && !defined(__linux__)
|
||||||
HANDLE hfile = CreateFile( m_sourcefile.getPath().c_str(),
|
HANDLE hfile = CreateFile( m_sourcefile.getPath().c_str(),
|
||||||
GENERIC_READ,
|
GENERIC_READ,
|
||||||
0,
|
0,
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ UITTFFont::UITTFFont(const string &path, S32 fallbackCharacter)
|
||||||
{
|
{
|
||||||
app.DebugPrintf("UITTFFont opening %s\n",path.c_str());
|
app.DebugPrintf("UITTFFont opening %s\n",path.c_str());
|
||||||
|
|
||||||
#ifdef _UNICODE
|
#if defined(_UNICODE) && !defined(__linux__)
|
||||||
wstring wPath = convStringToWstring(path);
|
wstring wPath = convStringToWstring(path);
|
||||||
HANDLE file = CreateFile(wPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
HANDLE file = CreateFile(wPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue