[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.121,1.122 script_v2.cpp,2.219,2.220 scummvm.cpp,2.505,2.506

[Travis Howell]

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

Modified Files:
	saveload.cpp script_v2.cpp scummvm.cpp 
Log Message:

Small color table correction for demo mode of v1 maniac


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- saveload.cpp	9 Dec 2003 08:55:32 -0000	1.121
+++ saveload.cpp	15 Dec 2003 11:06:41 -0000	1.122
@@ -178,9 +178,12 @@
 	// ever add options for using different 16-colour palettes.
 
 	if (_version == 1) {
-		if (_gameId == GID_MANIAC)
+		if (_gameId == GID_MANIAC) {
 			setupV1ManiacPalette();
-		else
+			if (_demoMode)
+				setPalColor(15, 252,  84, 252);
+
+		} else
 			setupV1ZakPalette();
 	} else if (_features & GF_16COLOR) {
 		if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.219
retrieving revision 2.220
diff -u -d -r2.219 -r2.220
--- script_v2.cpp	13 Dec 2003 15:41:32 -0000	2.219
+++ script_v2.cpp	15 Dec 2003 11:06:41 -0000	2.220
@@ -825,7 +825,7 @@
 		vs->verbid = verb;
 		if (_version == 1) {
 			if (_gameId == GID_MANIAC && _demoMode)
-				vs->color = 4;
+				vs->color = 15;
 			else
 				vs->color = 5;
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.505
retrieving revision 2.506
diff -u -d -r2.505 -r2.506
--- scummvm.cpp	15 Dec 2003 05:16:34 -0000	2.505
+++ scummvm.cpp	15 Dec 2003 11:06:41 -0000	2.506
@@ -1019,9 +1019,11 @@
 	for (i = 0; i < 256; i++)
 		_roomPalette[i] = i;
 	if (_version == 1) {
-		if (_gameId == GID_MANIAC)
+		if (_gameId == GID_MANIAC) {
 			setupV1ManiacPalette();
-		else
+			if (_demoMode)
+				setPalColor(15, 252,  84, 252);
+		} else
 			setupV1ZakPalette();
 	} else if (_features & GF_16COLOR) {
 		for (i = 0; i < 16; i++)