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

[fingolfin at users.sourceforge.net]

Revision: 32177
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32177&view=rev
Author:   fingolfin
Date:     2008-05-18 15:33:41 -0700 (Sun, 18 May 2008)

Log Message:
-----------
Fix for bug #1940063 (MONKEY: Crash during the marriage lechuck/marley) -- regression was introduced by rev 28167 -- rule of thumb, if you add game specific code, make it game specifc ... ;)

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

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

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2008-05-18 21:11:19 UTC (rev 32176)
+++ scummvm/trunk/engines/scumm/charset.cpp	2008-05-18 22:33:41 UTC (rev 32177)
@@ -400,7 +400,8 @@
 
 			// Some localizations may override colors
 			// See credits in Chinese COMI
-			if (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++];


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