[Scummvm-cvs-logs] SF.net SVN: scummvm: [32181] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 32181
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32181&view=rev
Author:   fingolfin
Date:     2008-05-19 10:34:29 -0700 (Mon, 19 May 2008)

Log Message:
-----------
Restrict the remaining changes made in rev 28166 to chinese COMI

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=28166&view=rev

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/charset.cpp
    scummvm/trunk/engines/scumm/string.cpp

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2008-05-19 15:01:10 UTC (rev 32180)
+++ scummvm/trunk/engines/scumm/charset.cpp	2008-05-19 17:34:29 UTC (rev 32181)
@@ -371,7 +371,7 @@
 					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 @@
 
 			// 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++];

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2008-05-19 15:01:10 UTC (rev 32180)
+++ scummvm/trunk/engines/scumm/string.cpp	2008-05-19 17:34:29 UTC (rev 32181)
@@ -174,11 +174,10 @@
 
 				// 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 @@
 				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;
 			}
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.