[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.173,2.174 script_v2.cpp,2.149,2.150 verbs.cpp,1.66,1.67

Travis Howell kirben at users.sourceforge.net
Sun Jul 13 23:15:25 CEST 2003


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

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

A few color fixes for v1/v2


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.173
retrieving revision 2.174
diff -u -d -r2.173 -r2.174
--- gfx.cpp	13 Jul 2003 15:13:43 -0000	2.173
+++ gfx.cpp	14 Jul 2003 06:14:49 -0000	2.174
@@ -2589,7 +2589,7 @@
 	setPalColor(12, 168, 168, 168);
 	setPalColor(13,  84, 252,  84);
 	setPalColor(14,  84,  84, 252);
-	setPalColor(15, 168, 168, 168);
+	setPalColor(15,  84,  84,  84);
 }
 
 /* Old palette used in Commodre 64 versions

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.149
retrieving revision 2.150
diff -u -d -r2.149 -r2.150
--- script_v2.cpp	14 Jul 2003 06:00:16 -0000	2.149
+++ script_v2.cpp	14 Jul 2003 06:14:49 -0000	2.150
@@ -982,7 +982,10 @@
 	_string[2].charset = 1;
 	_string[2].ypos = virtscr[2].topline;
 	_string[2].xpos = 0;
-	_string[2].color = 5;
+	if(_version == 1)
+		_string[2].color = 13;
+	else
+		_string[2].color = 4;
 
 	sentence[80] = 0;
 	_messagePtr = (byte*)sentence;

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- verbs.cpp	13 Jul 2003 17:16:05 -0000	1.66
+++ verbs.cpp	14 Jul 2003 06:14:49 -0000	1.67
@@ -84,7 +84,7 @@
 	v2_mouseover_boxes[kSentenceLine].rect.top = 0;
 	v2_mouseover_boxes[kSentenceLine].rect.bottom = 8;
 
-	v2_mouseover_boxes[kSentenceLine].color = 5;
+	v2_mouseover_boxes[kSentenceLine].color = 4;
 	v2_mouseover_boxes[kSentenceLine].hicolor = 7;
 }
 
@@ -101,7 +101,7 @@
 		v2_mouseover_boxes[2 * i].rect.top = 34 + 8 * i;
 		v2_mouseover_boxes[2 * i].rect.bottom = v2_mouseover_boxes[2 * i].rect.top + 8;
 
-		v2_mouseover_boxes[2 * i].color = 5;
+		v2_mouseover_boxes[2 * i].color = 13;
 		v2_mouseover_boxes[2 * i].hicolor = 14;
 
 
@@ -110,7 +110,7 @@
 		v2_mouseover_boxes[2 * i + 1].rect.top = v2_mouseover_boxes[2 * i].rect.top;
 		v2_mouseover_boxes[2 * i + 1].rect.bottom = v2_mouseover_boxes[2 * i].rect.bottom;
 
-		v2_mouseover_boxes[2 * i + 1].color = 5;
+		v2_mouseover_boxes[2 * i + 1].color = 13;
 		v2_mouseover_boxes[2 * i + 1].hicolor = 14;
 	}
 
@@ -139,7 +139,7 @@
 	v2_mouseover_boxes[kSentenceLine].rect.top = 0;
 	v2_mouseover_boxes[kSentenceLine].rect.bottom = 8;
 
-	v2_mouseover_boxes[kSentenceLine].color = 5;
+	v2_mouseover_boxes[kSentenceLine].color = 13;
 	v2_mouseover_boxes[kSentenceLine].hicolor = 14;
 }
 





More information about the Scummvm-git-logs mailing list