diff options
| author | Max Horn | 2008-05-19 17:34:29 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-19 17:34:29 +0000 |
| commit | 460296f3602d35779664f2776cce7365829ccca8 (patch) | |
| tree | 8d6261ea76b0b0fbbebd2a2ab42aae80688b8465 /engines/scumm/charset.cpp | |
| parent | ecf9d72ab4cc275ba0b4571407d1a50217152a38 (diff) | |
| download | scummvm-rg350-460296f3602d35779664f2776cce7365829ccca8.tar.gz scummvm-rg350-460296f3602d35779664f2776cce7365829ccca8.tar.bz2 scummvm-rg350-460296f3602d35779664f2776cce7365829ccca8.zip | |
Restrict the remaining changes made in rev 28166 to chinese COMI
svn-id: r32181
Diffstat (limited to 'engines/scumm/charset.cpp')
| -rw-r--r-- | engines/scumm/charset.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index bc10d73519..8f3175f098 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -371,7 +371,7 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text) { break; } } else { - if (chr == '@' && _vm->_language != Common::ZH_TWN) + if (chr == '@' && !(_vm->_game.id == GID_CMI && _vm->_language == Common::ZH_TWN)) continue; if (chr == 255 || (_vm->_game.version <= 6 && chr == 254)) { chr = text[pos++]; @@ -400,8 +400,8 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text) { // Some localizations may override colors // See credits in Chinese COMI - if (_vm->_game.id == GID_CMI && _vm->_language == Common::ZH_TWN - && chr == '^' && pos == 1) { + if (_vm->_game.id == GID_CMI && _vm->_language == Common::ZH_TWN && + chr == '^' && pos == 1) { if (text[pos] == 'c') { pos += 4; chr = text[pos++]; |