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

Restrict the remaining changes made in rev 28166 to chinese COMI

Browse source 
svn-id: r32181
This commit is contained in:
Max Horn 2008-05-19 17:34:29 +00:00
parent ecf9d72ab4
commit 460296f360
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/scumm/charset.cpp
View file

@ -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++];

12
engines/scumm/string.cpp
View file

@ -174,11 +174,10 @@ void ScummEngine_v6::drawBlastTexts() {
// Some localizations may override colors
// See credits in Chinese COMI
if (c == '^' && (buf == _blastTextQueue[i].text + 1)) {
int color;
switch (*buf) {
case 'c':
color = buf[3] - '0' + 10 *(buf[2] - '0');
if (_game.id == GID_CMI && _language == Common::ZH_TWN &&
c == '^' && (buf == _blastTextQueue[i].text + 1)) {
if (*buf == 'c') {
int color = buf[3] - '0' + 10 *(buf[2] - '0');
_charset->setColor(color);
buf += 4;
@ -1114,7 +1113,8 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
num += (_game.version == 8) ? 4 : 2;
}
} else {
if (!(chr == '@' && _game.heversion <= 71) || _language == Common::ZH_TWN) {
if (!(chr == '@' && _game.heversion <= 71) ||
(_game.id == GID_CMI && _language == Common::ZH_TWN)) {
*dst++ = chr;
}
}