[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.236,1.237

[Travis Howell]

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

Modified Files:
	string.cpp 
Log Message:

Fix loadCharset failures for computer terminals in FT.
Later games use slightly different code.


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- string.cpp	13 Aug 2004 01:02:24 -0000	1.236
+++ string.cpp	14 Aug 2004 11:31:36 -0000	1.237
@@ -589,7 +589,7 @@
 void ScummEngine::initCharset(int charsetno) {
 	int i;
 
-	if (!getResourceAddress(rtCharset, charsetno))
+	if ((!getResourceAddress(rtCharset, charsetno)) || (_version >= 7 && !isResourceLoaded(rtCharset, charsetno)))
 		loadCharset(charsetno);
 
 	_string[0]._default.charset = charsetno;