[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.673,1.674 string.cpp,1.317,1.318

Gregory Montoir cyx at users.sourceforge.net
Tue Jan 10 13:14:01 CET 2006


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

Modified Files:
	scumm.cpp string.cpp 
Log Message:
Minor cleanup.

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.673
retrieving revision 1.674
diff -u -d -r1.673 -r1.674
--- scumm.cpp	6 Jan 2006 23:54:42 -0000	1.673
+++ scumm.cpp	10 Jan 2006 21:13:43 -0000	1.674
@@ -1404,15 +1404,7 @@
 		break;
 
 	case Common::kRenderCGA:
-		if (!(_features & GF_16COLOR))
-			_renderMode = Common::kRenderDefault;
-		break;
-
 	case Common::kRenderEGA:
-		if (!(_features & GF_16COLOR))
-			_renderMode = Common::kRenderDefault;
-		break;
-
 	case Common::kRenderAmiga:
 		if (!(_features & GF_16COLOR))
 			_renderMode = Common::kRenderDefault;

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -d -r1.317 -r1.318
--- string.cpp	10 Jan 2006 00:34:13 -0000	1.317
+++ string.cpp	10 Jan 2006 21:13:43 -0000	1.318
@@ -934,8 +934,6 @@
 #endif
 
 void ScummEngine::initCharset(int charsetno) {
-	int i;
-
 	if (_gameId == GID_FT) {
 		if (!res.isResourceLoaded(rtCharset, charsetno))
 			loadCharset(charsetno);
@@ -947,9 +945,7 @@
 	_string[0]._default.charset = charsetno;
 	_string[1]._default.charset = charsetno;
 
-	for (i = 0; i < 16; i++)
-		_charsetColorMap[i] = _charsetData[charsetno][i];
-
+	memcpy(_charsetColorMap, _charsetData[charsetno], sizeof(_charsetColorMap));
 }
 
 





More information about the Scummvm-git-logs mailing list