[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.172,2.173 script_v2.cpp,2.147,2.148 scumm.h,1.266,1.267 scummvm.cpp,2.277,2.278 verbs.cpp,1.63,1.64

[Travis Howell]

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

Modified Files:
	gfx.cpp script_v2.cpp scumm.h scummvm.cpp verbs.cpp 
Log Message:

Add correct palette for pc versions of v1 games
Add some correct colors for v1 games


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.172
retrieving revision 2.173
diff -u -d -r2.172 -r2.173
--- gfx.cpp	13 Jul 2003 11:54:31 -0000	2.172
+++ gfx.cpp	13 Jul 2003 15:13:43 -0000	2.173
@@ -2574,6 +2574,27 @@
 }
 
 void Scumm::setupC64Palette() {
+	setPalColor( 0,   0,   0,   0); 
+	setPalColor( 1, 252, 252, 252); 
+	setPalColor( 2, 168,   0,   0);
+	setPalColor( 3,   0, 168, 168); 
+	setPalColor( 4, 168,   0, 168); 
+	setPalColor( 5,   0, 168,   0);
+	setPalColor( 6,   0,   0, 168);
+	setPalColor( 7, 252, 252,  84);
+	setPalColor( 8, 252,  84,  84);
+	setPalColor( 9, 168,  84,   0);
+	setPalColor(10, 252,  84,  84); 
+	setPalColor(11,  84,  84,  84); 
+	setPalColor(12, 168, 168, 168);
+	setPalColor(13,  84, 252,  84);
+	setPalColor(14,  84,  84, 252);
+	setPalColor(15, 168, 168, 168);
+}
+
+/* Old palette used in Commodre 64 versions
+
+void Scumm::setupC64Palette() {
 	setPalColor( 0,   0,   0,   0);
 	setPalColor( 1, 252, 252, 252);
 	setPalColor( 2, 204,   0,   0);
@@ -2591,6 +2612,7 @@
 	setPalColor(14, 136, 136, 252);
 	setPalColor(15, 204, 204, 204);
 }
+*/
 
 void Scumm::setPaletteFromPtr(const byte *ptr) {
 	int i;

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.147
retrieving revision 2.148
diff -u -d -r2.147 -r2.148
--- script_v2.cpp	12 Jul 2003 22:46:23 -0000	2.147
+++ script_v2.cpp	13 Jul 2003 15:13:43 -0000	2.148
@@ -827,9 +827,15 @@
 
 		vs = &_verbs[slot];
 		vs->verbid = verb;
-		vs->color = 2;
-		vs->hicolor = 14;
-		vs->dimcolor = 8;
+		if (_version == 1) {
+			vs->color = 5;
+			vs->hicolor = 7;
+			vs->dimcolor = 11;
+		} else {
+			vs->color = 2;
+			vs->hicolor = 14;
+			vs->dimcolor = 8;
+		}
 		vs->type = kTextVerbType;
 		vs->charset_nr = _string[0].t_charset;
 		vs->curmode = 1;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- scumm.h	12 Jul 2003 10:35:38 -0000	1.266
+++ scumm.h	13 Jul 2003 15:13:43 -0000	1.267
@@ -757,6 +757,7 @@
 	V2MouseoverBox v2_mouseover_boxes[7];
 	int8 v2_mouseover_box;
 
+	void initV1MouseOver();
 	void initV2MouseOver();
 	void checkV2MouseOver(ScummVM::Point pos);
 	void checkV2Inventory(int x, int y);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.277
retrieving revision 2.278
diff -u -d -r2.277 -r2.278
--- scummvm.cpp	13 Jul 2003 11:40:19 -0000	2.277
+++ scummvm.cpp	13 Jul 2003 15:13:43 -0000	2.278
@@ -802,7 +802,11 @@
 	}
 
 	if (_version <= 2) {
-		initV2MouseOver();
+		if (_version == 1)
+			initV1MouseOver();
+		else
+			initV2MouseOver();
+
 		// Seems in V2 there was only a single room effect (iris),
 		// so we set that here.
 		_switchRoomEffect2 = 1;

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- verbs.cpp	12 Jul 2003 21:28:04 -0000	1.63
+++ verbs.cpp	13 Jul 2003 15:13:43 -0000	1.64
@@ -33,6 +33,61 @@
 	kSentenceLine = 6
 };
 
+void Scumm::initV1MouseOver() {
+	int i;
+
+	v2_mouseover_box = -1;
+
+	// Inventory items
+
+	for (i = 0; i < 2; i++) {
+		v2_mouseover_boxes[2 * i].rect.left = 0;
+		v2_mouseover_boxes[2 * i].rect.right = 144;
+		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 = 4;
+		v2_mouseover_boxes[2 * i].hicolor = 7;
+
+
+		v2_mouseover_boxes[2 * i + 1].rect.left = 176;
+		v2_mouseover_boxes[2 * i + 1].rect.right = 320;
+		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 = 4;
+		v2_mouseover_boxes[2 * i + 1].hicolor = 7;
+	}
+
+	// Inventory arrows
+
+	v2_mouseover_boxes[kInventoryUpArrow].rect.left = 144;
+	v2_mouseover_boxes[kInventoryUpArrow].rect.right = 176;
+	v2_mouseover_boxes[kInventoryUpArrow].rect.top = 34;
+	v2_mouseover_boxes[kInventoryUpArrow].rect.bottom = 42;
+
+	v2_mouseover_boxes[kInventoryUpArrow].color = 6;
+	v2_mouseover_boxes[kInventoryUpArrow].hicolor = 7;
+
+	v2_mouseover_boxes[kInventoryDownArrow].rect.left = 144;
+	v2_mouseover_boxes[kInventoryDownArrow].rect.right = 176;
+	v2_mouseover_boxes[kInventoryDownArrow].rect.top = 42;
+	v2_mouseover_boxes[kInventoryDownArrow].rect.bottom = 50;
+
+	v2_mouseover_boxes[kInventoryDownArrow].color = 6;
+	v2_mouseover_boxes[kInventoryDownArrow].hicolor = 7;
+
+	// Sentence line
+
+	v2_mouseover_boxes[kSentenceLine].rect.left = 0;
+	v2_mouseover_boxes[kSentenceLine].rect.right = 320;
+	v2_mouseover_boxes[kSentenceLine].rect.top = 0;
+	v2_mouseover_boxes[kSentenceLine].rect.bottom = 6;
+
+	v2_mouseover_boxes[kSentenceLine].color = 4;
+	v2_mouseover_boxes[kSentenceLine].hicolor = 7;
+}
+
 void Scumm::initV2MouseOver() {
 	int i;