From 10936be5f6f0ac23d767cff67af35641053ca804 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Tue, 10 Jan 2006 21:13:43 +0000
Subject: Minor cleanup.

svn-id: r19976
---
 scumm/scumm.cpp  | 8 --------
 scumm/string.cpp | 6 +-----
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'scumm')

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 0a6ebd28f5..e04399fb36 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1404,15 +1404,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 		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;
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 6dd02b4c23..85703a3d6b 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -934,8 +934,6 @@ void ScummEngine_v80he::initCharset(int charsetno) {
 #endif
 
 void ScummEngine::initCharset(int charsetno) {
-	int i;
-
 	if (_gameId == GID_FT) {
 		if (!res.isResourceLoaded(rtCharset, charsetno))
 			loadCharset(charsetno);
@@ -947,9 +945,7 @@ void ScummEngine::initCharset(int charsetno) {
 	_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));
 }
 
 
-- 
cgit v1.2.3