[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.136,2.137 script_v72he.cpp,2.179,2.180

[Travis Howell]

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

Modified Files:
	script_v6he.cpp script_v72he.cpp 
Log Message:

Color correction for HE70+ strings.


Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.136
retrieving revision 2.137
diff -u -d -r2.136 -r2.137
--- script_v6he.cpp	17 Oct 2004 05:54:56 -0000	2.136
+++ script_v6he.cpp	17 Oct 2004 13:14:21 -0000	2.137
@@ -1272,7 +1272,7 @@
 
 void ScummEngine_v60he::decodeParseString(int m, int n) {
 	byte b;
-	int i, color;
+	int i, colors;
 	int args[31];
 
 	b = fetchScriptByte();
@@ -1312,15 +1312,15 @@
 		_scriptPointer += resStrLen(_scriptPointer) + 1;
 		break;
 	case 0xF9:
-		color = pop();
-		if (color == 1) {
+		colors = pop();
+		if (colors == 1) {
 			_string[m].color = pop();
 		} else {	
-			push(color);
+			push(colors);
 			getStackList(args, ARRAYSIZE(args));
 			for (i = 0; i < 16; i++)
 				_charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
-			_string[m].color = color;
+			_string[m].color = _charsetColorMap[0];
 		}
 		break;
 	case 0xFE:

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.179
retrieving revision 2.180
diff -u -d -r2.179 -r2.180
--- script_v72he.cpp	17 Oct 2004 11:47:12 -0000	2.179
+++ script_v72he.cpp	17 Oct 2004 13:14:21 -0000	2.180
@@ -2528,7 +2528,7 @@
 }
 
 void ScummEngine_v72he::decodeParseString(int m, int n) {
-	int i, color, size;
+	int i, colors, size;
 	int args[31];
 	byte name[1024];
 
@@ -2582,15 +2582,15 @@
 		}
 		break;
 	case 0xF9:
-		color = pop();
-		if (color == 1) {
+		colors = pop();
+		if (colors == 1) {
 			_string[m].color = pop();
 		} else {	
-			push(color);
+			push(colors);
 			getStackList(args, ARRAYSIZE(args));
 			for (i = 0; i < 16; i++)
 				_charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
-			_string[m].color = color;
+			_string[m].color = _charsetColorMap[0];
 		}
 		break;
 	case 0xFE: