[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.239,1.240

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4321

Modified Files:
	string.cpp 
Log Message:
Fix regression in The Dig (object desc shadows had wrong color)

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- string.cpp	14 Aug 2004 16:30:39 -0000	1.239
+++ string.cpp	14 Aug 2004 19:39:16 -0000	1.240
@@ -589,8 +589,13 @@
 void ScummEngine::initCharset(int charsetno) {
 	int i;
 
-	if ((_version >= 7 && !isResourceLoaded(rtCharset, charsetno)) || !getResourceAddress(rtCharset, charsetno))
-		loadCharset(charsetno);
+	if (_gameId == GID_FT) {
+		if (!isResourceLoaded(rtCharset, charsetno))
+			loadCharset(charsetno);
+	} else {
+		if (!getResourceAddress(rtCharset, charsetno))
+			loadCharset(charsetno);
+	}
 
 	_string[0]._default.charset = charsetno;
 	_string[1]._default.charset = charsetno;