mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

modified esm reader/writer to use UTF8 when no encoder is given

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-11-19 13:46:24 +01:00
parent 903e867c24
commit 35bf98a940
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/esm/esmreader.cpp
View File

@ -303,7 +303,10 @@ std::string ESMReader::getString(int size)
getExact(ptr, size);
// Convert to UTF8 and return
return mEncoder->getUtf8(ptr, size);
if (mEncoder)
return mEncoder->getUtf8(ptr, size);
return std::string (ptr, size);
}
void ESMReader::fail(const std::string &msg)

6
components/esm/esmwriter.cpp
View File

@ -6,7 +6,7 @@
namespace ESM
{
ESMWriter::ESMWriter() : mRecordCount (0), mCounting (true) {}
ESMWriter::ESMWriter() : mEncoder (0), mRecordCount (0), mCounting (true) {}
unsigned int ESMWriter::getVersion() const
{
@ -152,9 +152,9 @@ namespace ESM
else
{
// Convert to UTF8 and return
std::string ascii = mEncoder->getLegacyEnc(data);
std::string string = mEncoder ? mEncoder->getLegacyEnc(data) : data;
write(ascii.c_str(), ascii.size());
write(string.c_str(), string.size());
}
}