thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ZVISION: Append chars to a Common::String object instead of using a static buffer

Browse source
This commit is contained in:
RichieSams 2013-09-17 11:05:49 -05:00
parent 6148a0a878
commit d06c64d076
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/zvision/string_manager.cpp
View file

@ -212,15 +212,13 @@ void StringManager::parseTag(const Common::String &tagString, uint lineNumber) {
}
Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
// NOTE: Hardcoded size. All strings I've checked are less than 290 chars
char asciiString[300];
Common::String asciiString;
// Don't spam the user with warnings about UTF-16 support.
// Just do one warning per String
bool charOverflowWarning = false;
uint16 value = stream.readUint16LE();
uint i = 0;
while (!stream.eos()) {
// Check for CRLF
if (value == 0x0A0D) {
@ -233,12 +231,11 @@ Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
// Crush each octet pair to a single octet with a simple cast
if (value > 255) {
charOverflowWarning = true;
value = 255;
value = '?';
}
char charValue = (char)value;
asciiString[i] = charValue;
i++;
asciiString += charValue;
value = stream.readUint16LE();
}
@ -247,7 +244,7 @@ Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
warning("UTF-16 is not supported. Characters greater than 255 are clamped to 255");
}
return Common::String(asciiString, i);
return asciiString;
}
StringManager::TextStyle StringManager::getTextStyle(uint stringNumber) {