[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.71,2.72 gfx.cpp,2.234,2.235 saveload.cpp,1.122,1.123 script_v2.cpp,2.220,2.221 scummvm.cpp,2.506,2.507 verbs.cpp,1.82,1.83

[Travis Howell]

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

Modified Files:
	charset.cpp gfx.cpp saveload.cpp script_v2.cpp scummvm.cpp 
	verbs.cpp 
Log Message:

Add extra color table entry for v1 games, for inventory/sentence color.



Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.71
retrieving revision 2.72
diff -u -d -r2.71 -r2.72
--- charset.cpp	18 Nov 2003 05:14:17 -0000	2.71
+++ charset.cpp	15 Dec 2003 14:54:35 -0000	2.72
@@ -931,7 +931,7 @@
 	_color = color;
 	_shadowColor = (_vm->_features & GF_FMTOWNS) ? 8 : 0;
 	// FM Towns version of Loom uses old colour method as well
-	if (_vm->_features & GF_16COLOR || _vm->_gameId == GID_LOOM) {
+	if ((_vm->_version >= 2) && (_vm->_features & GF_16COLOR || _vm->_gameId == GID_LOOM)) {
 		_dropShadow = ((_color & 0xF0) != 0);
 		_color &= 0x0f;
 	} else if (_vm->_features & GF_OLD256) {

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.234
retrieving revision 2.235
diff -u -d -r2.234 -r2.235
--- gfx.cpp	23 Nov 2003 09:56:19 -0000	2.234
+++ gfx.cpp	15 Dec 2003 14:54:35 -0000	2.235
@@ -2631,6 +2631,7 @@
 	setPalColor(13,  84, 252,  84);
 	setPalColor(14,  84,  84, 252);
 	setPalColor(15,  84,  84,  84);
+	setPalColor(16, 252,  84, 252);
 }
 
 void ScummEngine::setupV1ZakPalette() {
@@ -2650,6 +2651,7 @@
 	setPalColor(13,  84, 252,  84);
 	setPalColor(14,  84,  84, 252);
 	setPalColor(15, 168, 168, 168);
+	setPalColor(16, 252,  84, 252);
 }
 
 void ScummEngine::setPaletteFromPtr(const byte *ptr) {

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- saveload.cpp	15 Dec 2003 11:06:41 -0000	1.122
+++ saveload.cpp	15 Dec 2003 14:54:35 -0000	1.123
@@ -178,12 +178,9 @@
 	// ever add options for using different 16-colour palettes.
 
 	if (_version == 1) {
-		if (_gameId == GID_MANIAC) {
+		if (_gameId == GID_MANIAC)
 			setupV1ManiacPalette();
-			if (_demoMode)
-				setPalColor(15, 252,  84, 252);
-
-		} else
+		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.220
retrieving revision 2.221
diff -u -d -r2.220 -r2.221
--- script_v2.cpp	15 Dec 2003 11:06:41 -0000	2.220
+++ script_v2.cpp	15 Dec 2003 14:54:35 -0000	2.221
@@ -825,7 +825,7 @@
 		vs->verbid = verb;
 		if (_version == 1) {
 			if (_gameId == GID_MANIAC && _demoMode)
-				vs->color = 15;
+				vs->color = 16;
 			else
 				vs->color = 5;
 
@@ -1026,7 +1026,7 @@
 	_string[2].ypos = virtscr[2].topline;
 	_string[2].xpos = 0;
 	if (_version == 1)
-		_string[2].color = 4;
+		_string[2].color = 16;
 	else 
 		_string[2].color = 13;
 

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

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- verbs.cpp	16 Nov 2003 20:52:56 -0000	1.82
+++ verbs.cpp	15 Dec 2003 14:54:35 -0000	1.83
@@ -40,7 +40,7 @@
 	int arrow_color, color, hi_color;
 
 	if (_version == 1) {
-		color = 4;
+		color = 16;
 		hi_color = 7;
 		arrow_color = 6;
 	} else {