[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.25,2.26 scummvm.cpp,2.132,2.133 verbs.cpp,1.33,1.34

[Max Horn]

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

Modified Files:
	charset.cpp scummvm.cpp verbs.cpp 
Log Message:
super hackish mouse click support for Zak (doesn't do anything useful in MM yet; and in Zak, all clicks are for the scene, i.e. no verb clicks etc.)

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -d -r2.25 -r2.26
--- charset.cpp	8 May 2003 22:44:46 -0000	2.25
+++ charset.cpp	9 May 2003 22:25:59 -0000	2.26
@@ -324,8 +324,6 @@
 };
 
 void CharsetRendererV2::setCurID(byte id) {
-	printf("CharsetRendererV2::setCurID(%d)\n", id);
-
 	_nbChars = charsetDataV2[6];
 	_widthTable = charsetDataV2 + 8;
 	_fontPtr = charsetDataV2 + 8 + _nbChars;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.132
retrieving revision 2.133
diff -u -d -r2.132 -r2.133
--- scummvm.cpp	9 May 2003 21:46:34 -0000	2.132
+++ scummvm.cpp	9 May 2003 22:26:00 -0000	2.133
@@ -1029,6 +1029,14 @@
 			clearClickedStatus();
 		}
 
+#if 1
+		// FIXME - MM / Zak hack
+		if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) {
+			_scummVars[32] = 2;
+			printf("mouse click\n");
+		}
+#endif
+
 		if (!_verbRedraw && _cursor.state > 0) {
 			verbMouseOver(checkMouseOver(mouse.x, mouse.y));
 		}

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- verbs.cpp	30 Apr 2003 22:37:03 -0000	1.33
+++ verbs.cpp	9 May 2003 22:26:00 -0000	1.34
@@ -43,6 +43,14 @@
 	int i, over;
 	VerbSlot *vs;
 
+#if 1
+		// FIXME - MM / Zak hack
+		if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) {
+			printf("Running script 4\n");
+			runScript(4, 0, 0, 0);
+		}
+#endif
+
 	if (_userPut <= 0 || _mouseButStat == 0)
 		return;