[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.191,2.192 script_v2.cpp,2.178,2.179 verbs.cpp,1.71,1.72

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19690/scumm

Modified Files:
	gfx.cpp script_v2.cpp verbs.cpp 
Log Message:

Revert color change for v1 maniac, which actually used in pool room.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.191
retrieving revision 2.192
diff -u -d -r2.191 -r2.192
--- gfx.cpp	19 Aug 2003 04:28:52 -0000	2.191
+++ gfx.cpp	19 Aug 2003 04:47:38 -0000	2.192
@@ -2587,7 +2587,7 @@
 	setPalColor(12, 168, 168, 168);
 	setPalColor(13,  84, 252,  84);
 	setPalColor(14,  84,  84, 252);
-	setPalColor(15, 252,  84, 252);
+	setPalColor(15,  84,  84,  84);
 }
 
 void Scumm::setupV1ZakPalette() {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.178
retrieving revision 2.179
diff -u -d -r2.178 -r2.179
--- script_v2.cpp	19 Aug 2003 04:34:41 -0000	2.178
+++ script_v2.cpp	19 Aug 2003 04:47:38 -0000	2.179
@@ -846,9 +846,9 @@
 		vs->verbid = verb;
 		if (_version == 1) {
 			if (_gameId == GID_MANIAC && _demo_mode)
-					vs->color = 15;
-				else
-					vs->color = 5;
+				vs->color = 4;
+			else
+				vs->color = 5;
 
 			vs->hicolor = 7;
 			vs->dimcolor = 11;
@@ -1010,14 +1010,10 @@
 	_string[2].charset = 1;
 	_string[2].ypos = virtscr[2].topline;
 	_string[2].xpos = 0;
-	if(_version == 1) {
-		if (_gameId == GID_MANIAC) 
-			_string[2].color = 15;
-		else
-			_string[2].color = 4;
-	} else {
+	if (_version == 1)
+		_string[2].color = 4;
+	else 
 		_string[2].color = 13;
-	}
 
 	char *ptr = sentence;
 	int n = 0;
@@ -1337,7 +1333,6 @@
 		VAR(VAR_CAMERA_MAX_X) = b;
 		break;
 	case 2:											/* room color */
-		warning("Remapping color %d to color %d", b, a);
 		_shadowPalette[b] = a;
 		_fullRedraw = true;
 		break;

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- verbs.cpp	19 Aug 2003 04:15:14 -0000	1.71
+++ verbs.cpp	19 Aug 2003 04:47:38 -0000	1.72
@@ -38,11 +38,7 @@
 	int arrow_color, color, hi_color;
 
 	if (_version == 1) {
-		 if (_gameId == GID_MANIAC)
-			color = 15;
-		else
-			color = 4;
-
+		color = 4;
 		hi_color = 7;
 		arrow_color = 6;
 	} else {